优化上海接口批次号问题

CZT

2023-11-13 cd091408dcff794e3001e43b99a6d521cfff36dc

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

@@ -11,6 +11,7 @@
import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1204Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -58,7 +59,7 @@
        apiLog.setId(ContextUtil.getUUID());
        try {
            //获取粮食入库结算信息
            List<Fz40InoutSettle> list = fzzySync1204Rep.listInoutSettle(INOUT_TYPE_OUT, start, end);
            List<Fz40InoutSettle> list = fzzySync1204Rep.listInoutSettle(deptId, INOUT_TYPE_OUT, start, end);

            if (null == list || list.isEmpty()) {
                log.info("-------------没有获取到粮食入库结算信息------------------");
@@ -69,14 +70,17 @@
            Api1102 api1201 = api1102Rep.findById(kqdm).get();

            Api1206 apiData;
            List<Api1206> api1206List;
            for (Fz40InoutSettle sysData : list) {

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

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

                //结算重量、结算单价、结算金额、结算时间
                apiData.setJssl(sysData.getSettleWeight());
@@ -90,18 +94,25 @@
                apiData.setKhhh(sysData.getBankCode());
                apiData.setKhhmc(sysData.getBank());
                apiData.setYhzh(sysData.getBankNum());
                apiData.setFkr(StringUtils.isEmpty(sysData.getPayUser())? "付款人":sysData.getPayUser());
                apiData.setFphm("");
                apiData.setFpzt("");

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

                //业务id、库区编码、同步时间
                apiData.setBizId(sysData.getId());
                apiData.setKqdm(kqdm);
                apiData.setSyncTime(new Date());
                log.info("1206---同步数据：{}", apiData.toString());

                api1206List = api1206Rep.getDataById(apiData.getCkjsdh());
                if (null == api1206List || api1206List.isEmpty()) {
                    apiData.setCzbz(Constant.CZBZ_I);
                } else {
                    apiData.setCzbz(api1206List.get(0).getCzbz());
                }
                //保存数据
                api1206Rep.save(apiData);
            }