From 9075639de65743f310d63a65700ce9a3b79247fe Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 07 十一月 2023 10:52:34 +0800
Subject: [PATCH] 调整品种信息
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index bcfea4f..f5de8d2 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -114,7 +114,6 @@
apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
//鑾峰彇鍚堝悓鍙�
- apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getCkywdh());
listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
if(null != listInoutNotice && listInoutNotice.size() >0){
if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
@@ -133,7 +132,10 @@
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
+ 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));
+ }
apiData.setLspzdm(mappingCode);
//绮绛夌骇
@@ -147,8 +149,11 @@
apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());
//浜у湴浠ｇ爜
- String cddm = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
- apiData.setCddm(cddm);
+ mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
+ if(StringUtils.isEmpty(mappingCode)){
+ mappingCode = apiData.getHwdm().substring(2,8);
+ }
+ apiData.setCddm(mappingCode);
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
@@ -200,6 +205,9 @@
int idNum = Integer.valueOf(sysData.getId().substring(12))*100 + 10001;
for (Fz40InoutRecordItem fz40InoutRecordItem : listInoutRecordItem) {
+ if(fz40InoutRecordItem.getSettleWeight() <= 0){
+ continue;
+ }
apiData.setCkywdh(Constant.INOUT_TYPE_15 + sysData.getId().substring(4,10) + String.valueOf(idNum).substring(1));
apiData.setMz(fz40InoutRecordItem.getFullWeight());
apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
--
Gitblit v1.9.3