From 069c3ea2792899256f46c44ff2bd497d91f91a4d Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 08 三月 2024 16:03:30 +0800
Subject: [PATCH] 优化出入库数据同步的必填项
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 4 ++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 27 +++++++++++++++------------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 595c078..2372af9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -242,8 +242,8 @@
apiData.setBz(null == sysData.getRemarks() ? "澶囨敞" : sysData.getRemarks());
apiData.setKlyy("鎵ｉ噺鍘熷洜");
- apiData.setCmqrmgryxm(sysData.getRegisterUser());
- apiData.setDjmgryxm(sysData.getRegisterUser());
+ apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
+ apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
//01:琛ㄧず澶у瀷姹借溅鍙风墝,榛勫簳榛戝瓧锛� 02:琛ㄧず灏忓瀷姹借溅鍙风墝,钃濆簳鐧藉瓧锛� 03:琛ㄧず鏂拌兘婧愭苯杞﹀彿鐗�,缁垮簳榛� 瀛楋紱
//04:琛ㄧず鍐滅敤杞﹁溅鐗屽彿锛岀豢搴曠櫧瀛楋紱 LS:琛ㄧず涓存椂铏氭嫙鍙风墝锛屼粎闄愪簬鍞� 绮溅鏃犲浐瀹氬彿鐗屾椂浣跨敤
apiData.setCchlx("01");
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 7ffa409..c9295df 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -147,6 +147,7 @@
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
+ apiData.setGch(sysData.getPlateNum());
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
@@ -179,8 +180,8 @@
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
- apiData.setPzjby(sysData.getEmptyWeightUser());
- apiData.setPzjly(sysData.getEmptyWeightUser());
+ apiData.setPzjby(StringUtils.isEmpty(sysData.getEmptyWeightUser())?"鐩戠鍛�":sysData.getEmptyWeightUser());
+ apiData.setPzjly(StringUtils.isEmpty(sysData.getEmptyWeightUser())?"璁￠噺鍛�":sysData.getEmptyWeightUser());
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
@@ -191,8 +192,8 @@
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
- apiData.setMzjby(sysData.getFullWeightUser());
- apiData.setMzjly(sysData.getFullWeightUser());
+ apiData.setMzjby(StringUtils.isEmpty(sysData.getFullWeightUser())?"鐩戠鍛�":sysData.getFullWeightUser());
+ apiData.setMzjly(StringUtils.isEmpty(sysData.getFullWeightUser())?"璁￠噺鍛�":sysData.getFullWeightUser());
//鍑�閲�
apiData.setJz(sysData.getRecordWeight());
@@ -205,16 +206,18 @@
apiData.setCkjsdh(kqdm + sysData.getSettleId());
}
if(StringUtils.isNotEmpty(apiData.getHth())){
- api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
- if(null == api1206List || api1206List.isEmpty()){
- api1206List = api1206Rep.getDataByHth(apiData.getHth());
- if(null != api1206List && api1206List.size() > 0){
- apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
- }
- }else {
+ api1206List = api1206Rep.getDataByHth(apiData.getHth());
+ if(null != api1206List && api1206List.size() > 0){
apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
}
}
+
+ apiData.setCchlx("01");
+ apiData.setXldd("搴撳唴");
+ apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
+ apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser())?"鍊间粨鍛�":sysData.getHandleUser());
+ apiData.setZxzydw("澶栬仒鍗曚綅");
+
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(sysData.getUpdateTime());
@@ -222,7 +225,7 @@
apiData.setBizId(sysData.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
- log.info("1201---鍚屾鏁版嵁锛歿}",apiData.toString());
+ log.info("1205---鍚屾鏁版嵁锛歿}",apiData.toString());
//鍒ゆ柇鏄惁涓鸿埞杩�
if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
--
Gitblit v1.9.3