优化药品接口中保质期类型

CZT

2024-03-01 67bd40a70ffd00ecc8dee1b3a8017bd9e7758de8

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

@@ -105,12 +105,19 @@
            //货位代码
            apiData.setHwdm(api1105.getHwdm());
            apiData.setYwlx(Constant.INOUT_TYPE_1);
            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
            apiData.setCyr(sysData.getUserName());

            //默认一个随便值
            apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());

            if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
                sysData.setUserId("410183199003187055");
            }
            apiData.setSfzh(sysData.getUserId());

            //通知单号
            apiData.setCktzdh(sysData.getNoticeId());

            apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));

            //获取合同号
            listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
            if (null != listInoutNotice && listInoutNotice.size() > 0) {
@@ -122,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());
                        }
                    }
                }
            }
@@ -148,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());
@@ -210,6 +220,9 @@

                int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
                for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
                    if ("DEL".equals(fz40InoutRecordItem.getRecordStatus())) {
                        continue;
                    }
                    if(fz40InoutRecordItem.getSettleWeight() <= 0){
                        continue;
                    }
@@ -217,6 +230,8 @@
                    apiData.setMz(fz40InoutRecordItem.getFullWeight());
                    apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
                    apiData.setJz(fz40InoutRecordItem.getSettleWeight());
                    apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
                    apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());

                    api1205List = api1205Rep.getDataById(apiData.getCkywdh());
                    if(null == api1205List || api1205List.isEmpty()){