Merge remote-tracking branch 'origin/master'

CZT

2023-09-27 2eb1ee7ee94cb0769009e1ce6a15dbd7eea792c9

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

@@ -83,7 +83,7 @@
                bjw = ShAreaBjw.getBjw(api1102List.get(0).getXzqhdm());
            }
            for (Fz40InoutRecord sysData : list) {
                List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, sysData.getId().substring(2));
                List<ApiInfoData> apiInfoData = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, sysData.getId().substring(2),kqdm);
                if (null != apiInfoData && apiInfoData.size() > 0) {
                    continue;
                }
@@ -102,7 +102,7 @@
                sh2023Api2104.setLldm(kqdm);

                sh2023Api2104.setJz(sysData.getNetWeight());
                sh2023Api2104.setZhgxsh(sysData.getUpdateTime());
                sh2023Api2104.setZhgxsj(sysData.getUpdateTime());

                //获取货位信息
                api1105 = commonService.getApi1105Cache(sysData.getDepotId());
@@ -121,7 +121,7 @@
                infoData.setRemarks("市储驳运单");

                //设置操作标志
                apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, infoData.getDataId());
                apiInfoDataList = apiInfoDataRep.getDataByInteAndData(SH2023Constant.SH_2023_API_CODE_2104, infoData.getDataId(),kqdm);
                if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
                    infoData.setCzbz(Constant.CZBZ_I);
                    sh2023Api2104.setCzbz(Constant.CZBZ_I);