CZT
2024-03-01 67bd40a70ffd00ecc8dee1b3a8017bd9e7758de8
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -111,7 +111,10 @@
            //默认一个随便值
            apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
            apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());
            if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
                sysData.setUserId("410183199003187055");
            }
            apiData.setSfzh(sysData.getUserId());
            //通知单号
            apiData.setCktzdh(sysData.getNoticeId());
@@ -126,9 +129,12 @@
                    }
                }
                if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
                    List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
                    List<Api1404> api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
                    if(null != api1404List && api1404List.size() > 0){
                        apiData.setJhmxh(api1404List.get(0).getJhmxdh());
                        if(StringUtils.isEmpty(sysData.getFoodYear())){
                            sysData.setFoodYear(api1404List.get(0).getShnd());
                        }
                    }
                }
            }
@@ -152,7 +158,7 @@
            mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
            apiData.setLsxzdm(mappingCode);
            apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());
            apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(sysData.getRegisterTime(), "yyyy") :sysData.getFoodYear());
            //产地代码
            mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
@@ -224,8 +230,8 @@
                    apiData.setMz(fz40InoutRecordItem.getFullWeight());
                    apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
                    apiData.setJz(fz40InoutRecordItem.getSettleWeight());
                    sysData.setEmptyWeightTime(fz40InoutRecordItem.getEmptyWeightTime());
                    sysData.setFullWeightTime(fz40InoutRecordItem.getFullWeightTime());
                    apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
                    apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
                    api1205List = api1205Rep.getDataById(apiData.getCkywdh());
                    if(null == api1205List || api1205List.isEmpty()){