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/Fzzy40Sync1212.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
index adb09e6..ebfc1b8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
@@ -28,9 +28,9 @@
@Autowired
private Api1102Rep api1102Rep;
@Autowired
- private Api1101Rep api1101Rep;
- @Autowired
private Api1212Rep api1212Rep;
+ @Autowired
+ private Api1101Rep api1101Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -54,46 +54,48 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40InoutCustomer> list = fzzySync1212Rep.listInoutCustomer(deptId);
+ List<Fz40InoutCustomer> list = fzzySync1212Rep.listInoutCustomer(deptId, start, end);
if (null == list || list.isEmpty()) {
- log.debug("-------------娌℃湁鑾峰彇鍒板悎鍚屼俊鎭�------------------");
+ log.debug("-------------娌℃湁鑾峰彇鍒板鎴蜂俊鎭�------------------");
return;
}
- //鏍规嵁搴撳尯浠ｇ爜鑾峰彇搴撳尯浠ｇ爜
- Api1102 api1201 = api1102Rep.findById(kqdm).get();
- List<Api1101> list1 = api1101Rep.findPushData(kqdm);
- Api1101 api1101 = list1.get(0);
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇鍗曚綅浠ｇ爜
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
Api1212 apiData;
List<Api1212> api1212List;
for (Fz40InoutCustomer sysData : list) {
apiData = new Api1212();
-
- apiData.setId(sysData.getId());
- //鍗曚綅浠ｇ爜锛� 1101 鎺ュ彛鐨勫崟浣嶄唬 鐮侊級 +鑷畾涔夌紪鐮�
+ //鍗曚綅浠ｇ爜
+ apiData.setId(sysData.getKhbh());
apiData.setDwdm(api1101.getDwdm());
apiData.setDwmc(api1101.getDwmc());
- apiData.setKqmc(api1201.getKqmc());
- apiData.setKqdm(kqdm);
- apiData.setKhlx(StringUtils.isEmpty(sysData.getKhlx()) ? "1":sysData.getKhlx());
- apiData.setKhtyshxydmhsfzh(sysData.getCardId());
+ apiData.setKqdm(api1102.getKqdm());
+ apiData.setKqmc(api1102.getKqmc());
+ apiData.setKhlx(sysData.getKhlx());
+ apiData.setKhtyshxydmhsfzh(sysData.getKhbh());
apiData.setKhmc(sysData.getName());
+ apiData.setFddbr(StringUtils.isEmpty(sysData.getFddbr()) ? "娉曚汉" :sysData.getFddbr());
+ apiData.setTxdz(StringUtils.isEmpty(sysData.getAddress()) ? "鍗曚綅鍦板潃" :sysData.getAddress());
- apiData.setFddbr(StringUtils.isEmpty(sysData.getFddbr())? "娉曞畾浜�" : sysData.getFddbr());
-
- apiData.setTxdz(sysData.getAddress());
- apiData.setYzbm(sysData.getYzbm());
- apiData.setLxrdh(sysData.getContactUser());
- apiData.setKhfkhh(sysData.getBank());
- apiData.setKhfzh(sysData.getBankNum());
+ apiData.setLxrxm(StringUtils.isEmpty(sysData.getContactUser()) ? sysData.getFddbr() :sysData.getContactUser());
+ apiData.setLxrdh(StringUtils.isEmpty(sysData.getPhone()) ? "" :sysData.getPhone());
+ if(StringUtils.isNotEmpty(sysData.getCardId())){
+ apiData.setLxrsfzh(sysData.getCardId());
+ }
+ apiData.setYzbm(StringUtils.isEmpty(sysData.getYzbm()) ? "000000" :sysData.getYzbm());
+ apiData.setDzyx(StringUtils.isEmpty(sysData.getDzyx()) ? "" :sysData.getDzyx());
+ apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "999" :sysData.getBank());
+ apiData.setKhfzh(StringUtils.isEmpty(sysData.getBankNum()) ? "" :sysData.getBankNum());
+ apiData.setZhgxsj(sysData.getUpdateTime() == null ? new Date() : sysData.getUpdateTime());
apiData.setBizId(sysData.getId());
- apiData.setZhgxsj(new Date());
+
api1212List = api1212Rep.getDataById(apiData.getId());
-
if(null == api1212List || api1212List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
}else {
@@ -103,7 +105,7 @@
//淇濆瓨鏁版嵁
api1212Rep.save(apiData);
- log.info("1201---鍚屾鏁版嵁锛歿}", apiData.toString());
+ log.info("1212---鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
log.error("---鍚堝悓鍚屾鎵ц澶辫触----{}", e);
--
Gitblit v1.9.3