61版本13,14同步

YYC

2025-09-24 715af00851145d97afa322c211dcc44f78238ef1

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

@@ -1,6 +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.Api1204;
import com.fzzy.api.entity.ApiLog;
@@ -36,6 +37,8 @@
    @Autowired
    private ApiLogRep apiLogRep;
    @Autowired
    private Api1102Rep api1102Rep;
    @Autowired
    private Api1204Rep api1204Rep;
    @Autowired
    private ApiCommonService commonService;
@@ -62,20 +65,28 @@
        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("-------------没有获取到粮食入库结算信息------------------");
                return;
            }
            //根据库区代码获取库区信息
            Api1102 api1102 = api1102Rep.findById(kqdm).get();

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

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

                //合同号
                if(StringUtils.isNotEmpty(sysData.getContractId())){
                    apiData.setHth(api1102.getDwdm() + sysData.getContractId());
                }

                if(StringUtils.isNotEmpty(sysData.getDepotId())){
                    api1105 = commonService.getApi1105Cache(sysData.getDepotId());
@@ -103,8 +114,7 @@
                apiData.setFkdw(sysData.getPayUnit());

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

                //业务id、库区编码、同步时间
                apiData.setBizId(sysData.getId());
@@ -112,6 +122,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) {