From 4c6b38c84b14e90bd0844046645c61796746696c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 09 三月 2024 14:18:03 +0800
Subject: [PATCH] 出库结算信息加入货位字段，上传不使用
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 77c0db5..2372af9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -211,8 +211,13 @@
apiData.setRkjsdh(kqdm + sysData.getSettleId());
}
if(StringUtils.isNotEmpty(apiData.getHth())){
- api1204List = api1204Rep.getDataByHth(apiData.getHth());
- if(null != api1204List && api1204List.size() > 0){
+ api1204List = api1204Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
+ if(null == api1204List || api1204List.isEmpty()){
+ api1204List = api1204Rep.getDataByHth(apiData.getHth());
+ if(null != api1204List && api1204List.size() > 0){
+ apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
+ }
+ }else {
apiData.setRkjsdh(api1204List.get(0).getRkjsdh());
}
}
@@ -237,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");
--
Gitblit v1.9.3