优化上海接口批次号问题

CZT

2023-11-13 cd091408dcff794e3001e43b99a6d521cfff36dc

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

@@ -7,18 +7,10 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy30.repository.FzzySync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1107Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1204Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40SyncNoticeInRep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -40,11 +32,7 @@
    private final static String INOUT_TYPE_IN = "IN";

    @Autowired
    private Fzzy40Sync1202Rep fzzy40Sync1202Rep;
    @Autowired
    private Fzzy40Sync1204Rep fzzy40Sync1204Rep;
    @Autowired
    private Fzzy40SyncNoticeInRep fzzySyncNoticeInRep;
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
@@ -74,7 +62,7 @@
        apiLog.setId(ContextUtil.getUUID());
        try {
            //获取粮食入库结算信息
            List<Fz40InoutSettle> list = fzzy40Sync1204Rep.listInoutSettle(INOUT_TYPE_IN, start, end);
            List<Fz40InoutSettle> list = fzzy40Sync1204Rep.listInoutSettle(deptId, INOUT_TYPE_IN, start, end);

            if (null == list || list.isEmpty()) {
                log.info("-------------没有获取到粮食入库结算信息------------------");
@@ -83,32 +71,18 @@

            Api1204 apiData;
            Api1105 api1105;
            List<Fz40InoutRecord> fz40InoutRecords;
            Fz40InoutRecord fz40InoutRecord;
            List<Api1204> api1204List;
            for (Fz40InoutSettle sysData : list) {

                //获取粮食入库信息
                fz40InoutRecords = fzzy40Sync1202Rep.listInoutRecordById(sysData.getId());
                if (null == fz40InoutRecords || fz40InoutRecords.isEmpty()) {
                    continue;
                }
                fz40InoutRecord = fz40InoutRecords.get(0);
                if (!deptId.equals(fz40InoutRecord.getDeptId())) {
                    continue;
                }

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

                apiData = new Api1204();
                //入库结算单号:库区代码 + yyMMdd + 4为顺序号
                apiData.setRkjsdh(kqdm + sysData.getId().substring(2));
                //入库结算单号:库区代码 + yyyyMMdd + 4为顺序号
                apiData.setRkjsdh(kqdm + sysData.getId());

                //货位代码
                apiData.setHwdm(api1105.getHwdm());
                if(StringUtils.isNotEmpty(sysData.getDepotId())){
                    api1105 = commonService.getApi1105Cache(sysData.getDepotId());
                    //货位代码
                    apiData.setHwdm(api1105.getHwdm());
                }

                //结算重量、结算单价、结算金额、结算时间
                apiData.setJssl(sysData.getSettleWeight());
@@ -130,8 +104,7 @@
                apiData.setFkdw(sysData.getPayUnit());

                //操作标志及最后更新时间
                apiData.setCzbz(Constant.CZBZ_I);
                apiData.setZhgxsj(sysData.getUpdateTime());
                apiData.setZhgxsj(new Date());

                //业务id、库区编码、同步时间
                apiData.setBizId(sysData.getId());
@@ -139,6 +112,12 @@
                apiData.setSyncTime(new Date());
                log.info("1204---同步数据：{}", apiData.toString());
                //保存数据
                api1204List = api1204Rep.getDataById(apiData.getRkjsdh());
                if (null == api1204List || api1204List.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(api1204List.get(0).getCzbz());
                }
                api1204Rep.save(apiData);
            }
        } catch (Exception e) {