优化出入库检验数据的时间顺序

CZT

2023-09-23 a1f0690d10288f9aa82b7fe96a9c4e33d9ad7661

优化出入库检验数据的时间顺序

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java

@@ -153,7 +153,7 @@

                //毛重信息
                apiData.setMz(sysData.getFullWeight());
                if(sysData.getFullWeightTime().before(sysData.getRegisterTime())){
                if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
                }
                apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -164,7 +164,7 @@

                //皮重信息
                apiData.setPz(sysData.getEmptyWeight());
                if(sysData.getEmptyWeightTime().before(sysData.getFullWeightTime())){
                if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
                    sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
                }
                apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -184,7 +184,7 @@
                apiData.setXckl( 0 - sysData.getDeHandle());

                apiData.setJz(sysData.getRecordWeight());
                if(sysData.getCompleteTime().before(sysData.getEmptyWeightTime())){
                if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
                    sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
                }
                apiData.setCmsj(sysData.getCompleteTime());

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java

@@ -5,6 +5,7 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.DateUtil;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1203Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -20,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@@ -113,7 +115,16 @@
                if(null == sysData.getFullWeightTime()){
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
                }
                apiData.setQysj(DateUtils.addMinutes(sysData.getRegisterTime(), 10));

                //判断业务时间与单据号是否匹配，若不匹配，则更改业务时间为单据号所在的时间
                SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
                Date time = dateFormat.parse(apiData.getRkjydh().substring(2, 8));
                int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getRegisterTime()), DateUtil.getCurZero(time));
                if(numDay != 0){
                    sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
                }

                apiData.setQysj(sysData.getRegisterTime());
                apiData.setQyrxm(sysData.getCheckUser());
                //扦样方式 2-智能随机
                apiData.setQyfs("2");

 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java

@@ -151,7 +151,7 @@

            //皮重信息
            apiData.setPz(sysData.getEmptyWeight());
            if(sysData.getEmptyWeightTime().before(sysData.getRegisterTime())){
            if(!sysData.getEmptyWeightTime().after(sysData.getRegisterTime())){
                sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
            }
            apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -160,7 +160,7 @@

            //毛重信息
            apiData.setMz(sysData.getFullWeight());
            if(sysData.getFullWeightTime().before(sysData.getEmptyWeightTime())){
            if(!sysData.getFullWeightTime().after(sysData.getEmptyWeightTime())){
                sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
            }
            apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -169,7 +169,7 @@

            //净重
            apiData.setJz(sysData.getRecordWeight());
            if(sysData.getCompleteTime().before(sysData.getFullWeightTime())){
            if(!sysData.getCompleteTime().after(sysData.getFullWeightTime())){
                sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
            }
            apiData.setCmsj(sysData.getCompleteTime());

 src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService12.java

@@ -73,10 +73,10 @@
        }

        //客户同步
//        fzzySync1212.syncData(kqdm, deptId, start, end);
        fzzySync1212.syncData(kqdm, deptId, start, end);

        //合同同步
//        fzzySync1201.syncData(kqdm, deptId, start, end);
        fzzySync1201.syncData(kqdm, deptId, start, end);

        //粮食入库同步
        fzzySync1202.syncData(kqdm, deptId, start, end);
@@ -84,26 +84,26 @@
        //粮食入库质检
        fzzySync1203.syncData(kqdm, deptId, start, end);

//        //粮食入库结算
//        fzzySync1204.syncData(kqdm, deptId, start, end);
//        //粮食出库同步
//        fzzySync1205.syncData(kqdm, deptId, start, end);
//
//        //粮食出库结算
//        fzzySync1206.syncData(kqdm, deptId, start, end);
//        //粮食损益
//        fzzySync1209.syncData(kqdm, deptId, start, end);
//        //倒仓信息同步
//        fzzySync1207.syncData(kqdm, deptId, start, end);
//
//        //出入库文件信息同步
//        fzzySync1109.syncData(kqdm, deptId, start, end);
//
//        //粮食库存同步
//        fzzySync1208.syncData(kqdm, deptId, start, end);
//
//        //粮食性质转变信息同步
//        fzzySync1210.syncData(kqdm, deptId, start, end);
        //粮食入库结算
        fzzySync1204.syncData(kqdm, deptId, start, end);
        //粮食出库同步
        fzzySync1205.syncData(kqdm, deptId, start, end);

        //粮食出库结算
        fzzySync1206.syncData(kqdm, deptId, start, end);
        //粮食损益
        fzzySync1209.syncData(kqdm, deptId, start, end);
        //倒仓信息同步
        fzzySync1207.syncData(kqdm, deptId, start, end);

        //出入库文件信息同步
        fzzySync1109.syncData(kqdm, deptId, start, end);

        //粮食库存同步
        fzzySync1208.syncData(kqdm, deptId, start, end);

        //粮食性质转变信息同步
        fzzySync1210.syncData(kqdm, deptId, start, end);


        //账面库存信息同步  TODO

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java

@@ -155,7 +155,7 @@

                //毛重信息
                apiData.setMz(sysData.getFullWeight());
                if(sysData.getFullWeightTime().before(sysData.getRegisterTime())){
                if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
                }
                apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -166,7 +166,7 @@

                //皮重信息
                apiData.setPz(sysData.getEmptyWeight());
                if(sysData.getEmptyWeightTime().before(sysData.getFullWeightTime())){
                if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
                    sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
                }
                apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -182,7 +182,7 @@
                apiData.setXckl( 0 - sysData.getDeHandle());

                apiData.setJz(sysData.getRecordWeight());
                if(sysData.getCompleteTime().before(sysData.getEmptyWeightTime())){
                if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
                    sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
                }
                apiData.setCmsj(sysData.getCompleteTime());

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java

@@ -4,6 +4,7 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.DateUtil;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1203Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -17,6 +18,8 @@
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.text.SimpleDateFormat;
import java.util.*;

/**
@@ -106,7 +109,16 @@
                if(null == sysData.getFullWeightTime()){
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
                }
                apiData.setQysj(DateUtils.addMinutes(sysData.getRegisterTime(), 10));

                //判断业务时间与单据号是否匹配，若不匹配，则更改业务时间为单据号所在的时间
                SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
                Date time = dateFormat.parse(apiData.getRkjydh().substring(2, 8));
                int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getRegisterTime()), DateUtil.getCurZero(time));
                if(numDay != 0){
                    sysData.setRegisterTime(DateUtils.addDays(sysData.getRegisterTime(), numDay));
                }

                apiData.setQysj(sysData.getRegisterTime());
                apiData.setQyrxm(sysData.getCheckUser());
                //扦样方式 2-智能随机
                apiData.setQyfs("2");

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java

@@ -150,7 +150,7 @@

            //皮重信息
            apiData.setPz(sysData.getEmptyWeight());
            if(sysData.getEmptyWeightTime().before(sysData.getRegisterTime())){
            if(!sysData.getEmptyWeightTime().after(sysData.getRegisterTime())){
                sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
            }
            apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -159,7 +159,7 @@

            //毛重信息
            apiData.setMz(sysData.getFullWeight());
            if(sysData.getFullWeightTime().before(sysData.getEmptyWeightTime())){
            if(!sysData.getFullWeightTime().after(sysData.getEmptyWeightTime())){
                sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
            }
            apiData.setMzjlsj(sysData.getFullWeightTime());
@@ -168,7 +168,7 @@

            //净重
            apiData.setJz(sysData.getRecordWeight());
            if(sysData.getCompleteTime().before(sysData.getFullWeightTime())){
            if(!sysData.getCompleteTime().after(sysData.getFullWeightTime())){
                sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
            }
            apiData.setCmsj(sysData.getCompleteTime());