Merge remote-tracking branch 'origin/master'

ws

2024-10-31 5408346178dd12b7ab78fb51c76f59c300a7e153

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

@@ -65,7 +65,7 @@

            Api1210 apiData;
            Api1105 api1105;

            List<Api1210> api1210List;
            for (Fz40InoutVarietyChange sysData : list) {
                //获取货位信息
                api1105 = commonService.getApi1105Cache(sysData.getDepotId());
@@ -78,14 +78,11 @@
                apiData.setLssl(sysData.getNumber());
                apiData.setHzsl(sysData.getChangeNumber());
                apiData.setBzwh(sysData.getApprovalId());
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety());
                if(StringUtils.isEmpty(mappingCode)){
                    mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                }
                String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
                apiData.setLspzdm(mappingCode);
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                apiData.setHzqlsxzdm(mappingCode);
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
                mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getNewFoodType());
                apiData.setHzhlsxzdm(mappingCode);
                apiData.setHzrq(sysData.getChangeTime());
                apiData.setCcshr(sysData.getCcshr());
@@ -94,13 +91,21 @@
                apiData.setKjshr(sysData.getKjshr());
                apiData.setLdshr(sysData.getLdshr());
                apiData.setBz(sysData.getRemark());
                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());
                api1210List = api1210Rep.getDataById(apiData.getLsxzzbdh());
                if(null == api1210List || api1210List.isEmpty()){
                    apiData.setCzbz(Constant.CZBZ_I);
                }else {
                    if(StringUtils.isNotEmpty(api1210List.get(0).getJhmxdh())){
                        apiData.setJhmxdh(api1210List.get(0).getJhmxdh());
                    }
                    apiData.setCzbz(api1210List.get(0).getCzbz());
                }
                //保存数据
                api1210Rep.save(apiData);