Merge remote-tracking branch 'origin/master'

YYC

2023-08-22 4be521d7e3135ac0a8e4a15e395f44448e23e09e

Merge remote-tracking branch 'origin/master'

 src/main/java/com/fzzy/api/view/repository/Api1202Rep.java

@@ -33,4 +33,12 @@

    @Query("from Api1202 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1202> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);

    /**
     * 根据bizId查询数据
     * @param bizId
     * @return
     */
    @Query("from Api1202 where bizId =:bizId")
    List<Api1202> getDataByBizId(@Param("bizId") String bizId);
}

 src/main/java/com/fzzy/api/view/repository/Api1205Rep.java

@@ -26,4 +26,12 @@

    @Query("from Api1205 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
    List<Api1205> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);

    /**
     * 根据bizId查询数据
     * @param bizId
     * @return
     */
    @Query("from Api1205 where bizId =:bizId")
    List<Api1205> getDataByBizId(@Param("bizId") String bizId);
}

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

@@ -2,15 +2,17 @@

import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1109;
import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1205;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtil;
import com.fzzy.api.view.repository.Api1109Rep;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy35.entity.Fz35FileInfo;
import com.fzzy.async.fzzy35.entity.Fz35InoutRecord;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1109Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,9 +49,11 @@
    @Autowired
    private Fzzy35Sync1109Rep fzzySync1109Rep;
    @Autowired
    private Fzzy35Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
    private Api1202Rep api1202Rep;
    @Autowired
    private Api1205Rep api1205Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
@@ -87,24 +91,29 @@
            String wjlx;
            String wjmc;
            List<Api1109> api1109List;
            List<Fz35InoutRecord> listInout;
            List<Api1202> api1202List;
            List<Api1205> api1205List;
            String str = "";
            for (Fz35FileInfo sysData : list) {
                if (StringUtils.isEmpty(sysData.getBizId())) {
                    continue;
                }
                //根据图片id查询对应出入库信息
                listInout = fzzySync1202Rep.listInoutRecordById(sysData.getBizId());
                if(null == listInout || listInout.isEmpty()){
                    continue;
                if(sysData.getBizId().startsWith(IMG_START_R)){
                    api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
                    if (null == api1202List || api1202List.isEmpty()) {
                        continue;
                    }
                    str = api1202List.get(0).getRkywdh();
                }
                //若出入库信息为删除或者错误状态，则不同步
                if("DEL".equals(listInout.get(0).getRecordStatus()) || "ERROR".equals(listInout.get(0).getRecordStatus())){
                    continue;
                if(sysData.getBizId().startsWith(IMG_START_C)){
                    api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
                    if (null == api1205List || api1205List.isEmpty()) {
                        continue;
                    }
                    str = api1205List.get(0).getCkywdh();
                }
                //若出入库信息中入库重量为空或为0，则不同步
                if(null == listInout.get(0).getRecordWeight() || listInout.get(0).getRecordWeight() == 0){
                    continue;
                }

                //只同步称重
                if(BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())){
                    wjlx = "";
@@ -132,7 +141,7 @@
                    apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());

                    //文件名称
                    wjmc = getImgNameType(wjmc, sysData.getBizTag(), sysData.getBizId(), sysData.getFileName(), map);
                    wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
                    apiData.setWjmc(wjmc);
                    //文件类型
                    apiData.setWjlx(wjlx);

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

@@ -20,9 +20,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * 粮食入库信息
@@ -81,6 +79,9 @@
            List<Fz35InoutNoticeIn> listInoutNotice;
            List<Api1202> api1202List;
            Calendar c = Calendar.getInstance();
            String ywsj = "";
            String num = "";
            Map<String, Integer> map = new HashMap<>();
            for (Fz35InoutRecord sysData : list) {
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    sysData.setRecordWeight(sysData.getSettleWeight());
@@ -97,6 +98,16 @@
                apiData = new Api1202();

                apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
                //判断业务时间与单据号是否匹配
                ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
                if(!ywsj.equals(sysData.getId().substring(4, 10))){
                    if(null == map.get(ywsj)){
                        map.put(ywsj, 10201);
                    }
                    num = String.valueOf(map.get(ywsj)).substring(1);
                    apiData.setRkywdh(Constant.INOUT_TYPE_14 + ywsj + num);
                    map.put(ywsj, map.get(ywsj) + 1);
                }

                //货位代码
                apiData.setHwdm(api1105.getHwdm());
@@ -107,7 +118,7 @@
                //默认一个随便值
                apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());

                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId());
                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());

                //获取合同号
                listInoutNotice = fzzy35SyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());

 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.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1203Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.api.view.repository.GbCheckItemRep;
@@ -14,6 +15,7 @@
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,9 +39,10 @@
    private Fzzy35Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Fzzy35Sync1203Rep fzzySync1203Rep;

    @Autowired
    private ApiTriggerService apiTriggerService;
    @Autowired
    private Api1202Rep api1202Rep;
    @Autowired
    private Api1203Rep api1203Rep;
    @Autowired
@@ -86,12 +89,11 @@
            String zkj;
            String zkl;
            List<Api1203> api1203List;
            List<Api1202> api1102List;
            for (Fz35InoutRecord sysData : list) {
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    sysData.setRecordWeight(sysData.getSettleWeight());
                }
                //判断净重是否大于0，等于0表示不合格，不进行同步上传
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                //查询粮食入库信息，若为空则不进行同步上传
                api1102List = api1202Rep.getDataByBizId(sysData.getId());
                if(null == api1102List || api1102List.isEmpty()){
                    continue;
                }

@@ -102,19 +104,12 @@
                    continue;
                }

                //获取货位信息
                api1105 = commonService.getApi1105Cache(sysData.getDepotId());
                if (null == api1105) {
                    continue;
                }

                apiData = new Api1203();

                apiData.setRkjydh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));

                apiData.setRkjydh(api1102List.get(0).getRkywdh());
                //货位代码
                apiData.setHwdm(api1105.getHwdm());
                apiData.setRkywdh(apiData.getRkjydh());
                apiData.setHwdm(api1102List.get(0).getHwdm());
                apiData.setRkywdh(api1102List.get(0).getRkywdh());
                if(null == sysData.getFullWeightTime()){
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
                }
@@ -160,6 +155,9 @@
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                apiData.setLspzdm(mappingCode);

                //保管员复核
                apiData.setBgyfh(apiData.getJyjg());

                //粮食等级
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());
                apiData.setLsdd(mappingCode);

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

@@ -18,9 +18,8 @@
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

import java.util.*;

/**
 * 粮食出库信息
@@ -78,8 +77,10 @@
        Api1105 api1105;
        List<Fz35InoutNoticeOut> listInoutNotice;
        List<Api1205> api1205List;
        // List<GbArea> gbAreaList;
        Calendar c = Calendar.getInstance();
            String ywsj = "";
            String num = "";
            Map<String, Integer> map = new HashMap<>();
        for (Fz35InoutRecord sysData : list) {
            if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,7 +96,16 @@
            }
            apiData = new Api1205();
            apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));

            //判断业务时间与单据号是否匹配
            ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
            if(!ywsj.equals(sysData.getId().substring(4, 10))){
                if(null == map.get(ywsj)){
                    map.put(ywsj, 10201);
                }
                num = String.valueOf(map.get(ywsj)).substring(1);
                apiData.setCkywdh(Constant.INOUT_TYPE_15 + ywsj + num);
                map.put(ywsj, map.get(ywsj) + 1);
            }

            //货位代码
            apiData.setHwdm(api1105.getHwdm());

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

@@ -71,6 +71,7 @@

            Api1208 apiData;
            Api1105 api1105;
            List<Api1208> api1208List;
            for (Fz35DepotStore fz35DepotStore : list) {

                //获取货位信息
@@ -80,6 +81,7 @@
                }

                apiData = new Api1208();
                apiData.setId(fz35DepotStore.getId());
                apiData.setHwdm(api1105.getHwdm());

                //粮食品种
@@ -135,7 +137,7 @@
                apiData.setSjzlxg(6);
                apiData.setLdtj(10000);

                apiData.setZhgxsj(new Date());
                apiData.setZhgxsj(fz35DepotStore.getUpdateDate());

                //业务id、库区编码、同步时间
                apiData.setBizId(fz35DepotStore.getId());
@@ -143,8 +145,13 @@
                apiData.setSyncTime(new Date());

                //库存每次新增
                apiData.setCzbz(Constant.CZBZ_I);
                apiData.setId(ContextUtil.getCurTimeMillis());
                api1208List = api1208Rep.getDataById(apiData.getId());
                if(null == api1208List || api1208List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1208List.get(0).getCzbz());
                }

                //保存数据
                api1208Rep.save(apiData);
            }

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

@@ -58,40 +58,40 @@
        Date end = param.getEnd();

        //客户同步
        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);

        //粮食入库质检
//
//        //粮食入库质检
        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);

        //粮食库存同步
//
//        //粮食入库结算
//        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
//
//        //粮食性质转变信息同步
//        fzzySync1210.syncData(kqdm, deptId, start, end);
//
//
//        //账面库存信息同步  TODO

    }


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

@@ -2,15 +2,17 @@

import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1109;
import com.fzzy.api.entity.Api1202;
import com.fzzy.api.entity.Api1205;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtil;
import com.fzzy.api.view.repository.Api1109Rep;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1205Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40FileInfo;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1109Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,9 +50,11 @@
    @Autowired
    private Fzzy40Sync1109Rep fzzySync1109Rep;
    @Autowired
    private Fzzy40Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Api1109Rep api1109Rep;
    @Autowired
    private Api1202Rep api1202Rep;
    @Autowired
    private Api1205Rep api1205Rep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
@@ -88,24 +92,29 @@
            String wjlx;
            String wjmc;
            List<Api1109> api1109List;
            List<Fz40InoutRecord> listInout;
            List<Api1202> api1202List;
            List<Api1205> api1205List;
            String str = "";
            for (Fz40FileInfo sysData : list) {
                if (StringUtils.isEmpty(sysData.getBizId())) {
                    continue;
                }
                //根据图片id查询对应出入库信息
                listInout = fzzySync1202Rep.listInoutRecordById(sysData.getBizId());
                if (null == listInout || listInout.isEmpty()) {
                    continue;
                if(sysData.getBizId().startsWith(IMG_START_R)){
                    api1202List = api1202Rep.getDataByBizId(sysData.getBizId());
                    if (null == api1202List || api1202List.isEmpty()) {
                        continue;
                    }
                    str = api1202List.get(0).getRkywdh();
                }
                //若出入库信息为删除或者错误状态，则不同步
                if ("DEL".equals(listInout.get(0).getRecordStatus()) || "ERROR".equals(listInout.get(0).getRecordStatus())) {
                    continue;
                if(sysData.getBizId().startsWith(IMG_START_C)){
                    api1205List = api1205Rep.getDataByBizId(sysData.getBizId());
                    if (null == api1205List || api1205List.isEmpty()) {
                        continue;
                    }
                    str = api1205List.get(0).getCkywdh();
                }
                //若出入库信息中入库重量为空或为0，则不同步
                if (null == listInout.get(0).getRecordWeight() || listInout.get(0).getRecordWeight() == 0) {
                    continue;
                }

                //只同步称重
                if (BIZ_TAG_WEIGHT_FULL.equals(sysData.getBizTag()) || BIZ_TAG_WEIGHT_EMPTY.equals(sysData.getBizTag())) {
                    wjlx = "";
@@ -133,7 +142,7 @@
                    apiData.setWjdz(fileUtil.getInoutFilePath(sysData.getCreateTime()) + sysData.getFileName());

                    //文件名称
                    wjmc = getImgNameType(wjmc, sysData.getBizTag(), sysData.getBizId(), sysData.getFileName(), map);
                    wjmc = getImgNameType(wjmc, sysData.getBizTag(), str, sysData.getFileName(), map);
                    apiData.setWjmc(wjmc);
                    //文件类型
                    apiData.setWjlx(wjlx);

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

@@ -18,9 +18,8 @@
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

import java.util.*;

/**
 * 粮食入库信息
@@ -65,7 +64,6 @@
        apiLog.setInteId(Constant.API_CODE_1202);
        apiLog.setStatus(99);
        apiLog.setId(ContextUtil.getUUID());
        String sfzh = "";
        try {
            //获取粮食入库记录信息，根据流程完成时间获取
            List<Fz40InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
@@ -80,6 +78,9 @@
            List<Fz40InoutNoticeIn> listInoutNotice;
            List<Api1202> api1202List;
            Calendar c = Calendar.getInstance();
            String ywsj = "";
            String num = "";
            Map<String, Integer> map = new HashMap<>();
            for (Fz40InoutRecord sysData : list) {
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,11 +96,16 @@
                }
                apiData = new Api1202();


                apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
                //判断业务时间与单据号是否匹配
                if(!DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd").equals(sysData.getId().substring(4, 10))){
                    apiData.setRkywdh(Constant.INOUT_TYPE_14 + DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd") + sysData.getId().substring(10));
                ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
                if(!ywsj.equals(sysData.getId().substring(4, 10))){
                    if(null == map.get(ywsj)){
                        map.put(ywsj, 10201);
                    }
                    num = String.valueOf(map.get(ywsj)).substring(1);
                    apiData.setRkywdh(Constant.INOUT_TYPE_14 + ywsj + num);
                    map.put(ywsj, map.get(ywsj) + 1);
                }

                //货位代码
@@ -111,7 +117,7 @@
                //默认一个随便值
                apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());

                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId());
                apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());

                //获取合同号
                listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
@@ -189,13 +195,13 @@
                }else {
                    apiData.setCzbz(api1202List.get(0).getCzbz());
                }
                sfzh = apiData.getSfzh();

                //保存数据
                api1202Rep.save(apiData);
                log.info("1202---同步数据：{}", apiData.toString());
            }
        } catch (Exception e) {
            System.out.println(sfzh);

            log.error("---同步失败----{}", e);
            apiLog.setResult("同步失败：" + e.getMessage());
            apiLogRep.save(apiLog);

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

@@ -1,13 +1,10 @@
package com.fzzy.async.fzzy40.impl;

import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1203;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.entity.GbCheckItem;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1203Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.api.view.repository.GbCheckItemRep;
@@ -20,9 +17,7 @@
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * 粮食入库检验信息
@@ -40,15 +35,14 @@
    private Fzzy40Sync1202Rep fzzySync1202Rep;
    @Autowired
    private Fzzy40Sync1203Rep fzzySync1203Rep;

    @Autowired
    private ApiTriggerService apiTriggerService;
    @Autowired
    private Api1202Rep api1202Rep;
    @Autowired
    private Api1203Rep api1203Rep;
    @Autowired
    private GbCheckItemRep gbCheckItemRep;
    @Autowired
    private ApiCommonService commonService;
    @Autowired
    private ApiLogRep apiLogRep;

@@ -81,7 +75,6 @@
            }

            Api1203 apiData;
            Api1105 api1105;
            List<Fz40CheckItem> fz40CheckItems;
            List<GbCheckItem> gbCheckList;
            String jyxm;
@@ -89,12 +82,11 @@
            String zkj;
            String zkl;
            List<Api1203> api1203List;
            List<Api1202> api1102List;
            for (Fz40InoutRecord sysData : list) {
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    sysData.setRecordWeight(sysData.getSettleWeight());
                }
                //判断净重是否大于0，等于0表示不合格，不进行同步上传
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                //查询粮食入库信息，若为空则不进行同步上传
                api1102List = api1202Rep.getDataByBizId(sysData.getId());
                if(null == api1102List || api1102List.isEmpty()){
                    continue;
                }

@@ -105,19 +97,12 @@
                    continue;
                }

                //获取货位信息
                api1105 = commonService.getApi1105Cache(sysData.getDepotId());
                if (null == api1105) {
                    continue;
                }

                apiData = new Api1203();

                apiData.setRkjydh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));

                apiData.setRkjydh(api1102List.get(0).getRkywdh());
                //货位代码
                apiData.setHwdm(api1105.getHwdm());
                apiData.setRkywdh(apiData.getRkjydh());
                apiData.setHwdm(api1102List.get(0).getHwdm());
                apiData.setRkywdh(api1102List.get(0).getRkywdh());
                if(null == sysData.getFullWeightTime()){
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
                }
@@ -163,10 +148,8 @@
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                apiData.setLspzdm(mappingCode);

                //粮食定等

                //保管员复核

                apiData.setBgyfh(apiData.getJyjg());

                //粮食等级
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, sysData.getFoodLevel());

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

@@ -19,9 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * 粮食出库信息
@@ -80,6 +78,9 @@
        List<Fz40InoutNoticeOut> listInoutNotice;
        List<Api1205> api1205List;
        Calendar c = Calendar.getInstance();
        String ywsj = "";
        String num = "";
        Map<String, Integer> map = new HashMap<>();
        for (Fz40InoutRecord sysData : list) {
            if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                sysData.setRecordWeight(sysData.getSettleWeight());
@@ -95,7 +96,16 @@
            }
            apiData = new Api1205();
            apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4));

            //判断业务时间与单据号是否匹配
            ywsj = DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd");
            if(!ywsj.equals(sysData.getId().substring(4, 10))){
                if(null == map.get(ywsj)){
                    map.put(ywsj, 10201);
                }
                num = String.valueOf(map.get(ywsj)).substring(1);
                apiData.setCkywdh(Constant.INOUT_TYPE_15 + ywsj + num);
                map.put(ywsj, map.get(ywsj) + 1);
            }

            //货位代码
            apiData.setHwdm(api1105.getHwdm());

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

@@ -1,10 +1,7 @@
package com.fzzy.async.fzzy40.impl;

import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1102;
import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1208;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
@@ -75,6 +72,7 @@

            Api1208 apiData;
            Api1105 api1105;
            List<Api1208> api1208List;
            for (Fz40DepotStore fz40DepotStore : list) {

                //获取货位信息
@@ -84,6 +82,7 @@
                }

                apiData = new Api1208();
                apiData.setId(fz40DepotStore.getId());
                apiData.setHwdm(api1105.getHwdm());

                //粮食品种
@@ -139,7 +138,7 @@
                apiData.setSjzlxg(6);
                apiData.setLdtj(10000);

                apiData.setZhgxsj(new Date());
                apiData.setZhgxsj(fz40DepotStore.getUpdateDate());

                //业务id、库区编码、同步时间
                apiData.setBizId(fz40DepotStore.getId());
@@ -147,8 +146,13 @@
                apiData.setSyncTime(new Date());

                //库存每次新增
                apiData.setCzbz(Constant.CZBZ_I);
                apiData.setId(ContextUtil.getCurTimeMillis());
                api1208List = api1208Rep.getDataById(apiData.getId());
                if(null == api1208List || api1208List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    apiData.setCzbz(api1208List.get(0).getCzbz());
                }

                //保存数据
                api1208Rep.save(apiData);
            }

 src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1202Rep.java

@@ -23,7 +23,7 @@
     * @param end
     * @return
     */
    @Query("from Fz40InoutRecord where deptId=:deptId and type=:type and updateTime >=:start and updateTime <:end order by updateTime ")
    @Query("from Fz40InoutRecord where deptId=:deptId and type=:type and updateTime >=:start and updateTime <:end order by id ")
    List<Fz40InoutRecord> listInoutRecord(@Param("deptId") String deptId, @Param("type") String type, @Param("start") Date start, @Param("end") Date end);

    /**