From 3b4b16061d0373e3eb5c6473586c6c6edd9393de Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 14 八月 2023 17:04:11 +0800
Subject: [PATCH] 优化4.0版本-出入库及合同同步
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 0b09017..696ffbc 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -65,6 +65,7 @@
apiLog.setInteId(Constant.API_CODE_1202);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
+ String sfzh = "";
try {
//鑾峰彇绮鍏ュ簱璁板綍淇℃伅锛屾牴鎹祦绋嬪畬鎴愭椂闂磋幏鍙�
List<Fz40InoutRecord> list = fzzySync1202Rep.listInoutRecord(deptId, INOUT_TYPE_IN, start, end);
@@ -94,7 +95,12 @@
}
apiData = new Api1202();
+
apiData.setRkywdh(Constant.INOUT_TYPE_14 + sysData.getId().substring(4));
+ //鍒ゆ柇涓氬姟鏃堕棿涓庡崟鎹彿鏄惁鍖归厤
+ if(!DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd").equals(sysData.getId().substring(4, 10))){
+ apiData.setRkywdh(Constant.INOUT_TYPE_14 + DateFormatUtils.format(sysData.getCompleteTime(),"yyMMdd") + sysData.getId().substring(10));
+ }
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
@@ -115,7 +121,7 @@
apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getRkywdh());
}
- apiData.setXxdz(sysData.getUserAddress());
+ apiData.setXxdz(StringUtils.isEmpty(sysData.getUserAddress()) ? "璇︾粏鍦板潃":sysData.getUserAddress());
//杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
@@ -183,11 +189,13 @@
}else {
apiData.setCzbz(api1202List.get(0).getCzbz());
}
+ sfzh = apiData.getSfzh();
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
log.info("1202---鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
+ System.out.println(sfzh);
log.error("---鍚屾澶辫触----{}", e);
apiLog.setResult("鍚屾澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
--
Gitblit v1.9.3