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 | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 7fbc451..ebfc1b8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1212.java
@@ -3,6 +3,7 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1101Rep;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1212Rep;
import com.fzzy.api.view.repository.ApiLogRep;
@@ -29,6 +30,8 @@
@Autowired
private Api1212Rep api1212Rep;
@Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
private ApiLogRep apiLogRep;
/**
@@ -51,15 +54,16 @@
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();
+ //鏍规嵁搴撳尯浠ｇ爜鑾峰彇鍗曚綅浠ｇ爜
+ Api1102 api1102 = api1102Rep.findById(kqdm).get();
+ Api1101 api1101 = api1101Rep.findById(api1102.getDwdm()).get();
Api1212 apiData;
List<Api1212> api1212List;
@@ -68,25 +72,30 @@
apiData = new Api1212();
//鍗曚綅浠ｇ爜
apiData.setId(sysData.getKhbh());
- apiData.setDwdm(api1201.getDwdm());
- apiData.setKqdm(kqdm);
+ apiData.setDwdm(api1101.getDwdm());
+ apiData.setDwmc(api1101.getDwmc());
+ apiData.setKqdm(api1102.getKqdm());
+ apiData.setKqmc(api1102.getKqmc());
apiData.setKhlx(sysData.getKhlx());
apiData.setKhtyshxydmhsfzh(sysData.getKhbh());
apiData.setKhmc(sysData.getName());
- apiData.setFddbr(sysData.getFddbr());
+ apiData.setFddbr(StringUtils.isEmpty(sysData.getFddbr()) ? "娉曚汉" :sysData.getFddbr());
apiData.setTxdz(StringUtils.isEmpty(sysData.getAddress()) ? "鍗曚綅鍦板潃" :sysData.getAddress());
- apiData.setYzbm(StringUtils.isEmpty(sysData.getYzbm()) ? "" :sysData.getYzbm());
+
apiData.setLxrxm(StringUtils.isEmpty(sysData.getContactUser()) ? sysData.getFddbr() :sysData.getContactUser());
apiData.setLxrdh(StringUtils.isEmpty(sysData.getPhone()) ? "" :sysData.getPhone());
- apiData.setLxrsfzh(StringUtils.isEmpty(sysData.getCardId()) ? "100000000000000000" :sysData.getCardId());
+ 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()) ? "" :sysData.getBank());
+ apiData.setKhfkhh(StringUtils.isEmpty(sysData.getBank()) ? "999" :sysData.getBank());
apiData.setKhfzh(StringUtils.isEmpty(sysData.getBankNum()) ? "" :sysData.getBankNum());
- apiData.setZhgxsj(sysData.getUpdateTime());
+ apiData.setZhgxsj(sysData.getUpdateTime() == null ? new Date() : sysData.getUpdateTime());
apiData.setBizId(sysData.getId());
- api1212List = api1212Rep.getDataById(sysData.getKhbh());
+ api1212List = api1212Rep.getDataById(apiData.getId());
if(null == api1212List || api1212List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
}else {
--
Gitblit v1.9.3