From c78307e6820745ec8681c15b0f6cf441b7ac6416 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 07 六月 2023 15:04:28 +0800
Subject: [PATCH] 优化嘉定纪委接口5-调整出库货位名称
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index 43d445f..f383d4b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -13,6 +13,7 @@
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1203Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -86,13 +87,16 @@
String zkl;
List<Api1203> api1203List;
for (Fz35InoutRecord sysData : list) {
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ sysData.setRecordWeight(sysData.getSettleWeight());
+ }
//鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
- if(sysData.getRecordWeight() == 0){
+ if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
continue;
}
- fz35CheckItems = null;
+
//鑾峰彇鍏ュ簱璐ㄦ淇℃伅
- fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId());
+ fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId(), deptId.substring(0, 4));
if (null == fz35CheckItems || fz35CheckItems.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板綋鍓嶅叆搴撹川妫�淇℃伅--------------");
continue;
@@ -111,6 +115,9 @@
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
apiData.setRkywdh(apiData.getRkjydh());
+ if(null == sysData.getFullWeightTime()){
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
+ }
apiData.setQysj(sysData.getFullWeightTime());
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
@@ -127,16 +134,19 @@
if (gbCheckList == null || gbCheckList.isEmpty()) {
continue;
}
+ if (StringUtils.isEmpty(fz35CheckItem.getValue())) {
+ continue;
+ }
jyxm += gbCheckList.get(0).getCode() + ",";
jyz += fz35CheckItem.getValue() + ",";
- zkj += "0.0,";
- zkl += "0.0,";
+ zkj += ",0.0";
+ zkl += ",0.0";
}
apiData.setJyxm(jyxm);
apiData.setJyz(jyz);
- apiData.setZkj(zkj);
- apiData.setZkl(zkl);
+ apiData.setZkj(zkj.substring(1));
+ apiData.setZkl(zkl.substring(1));
if("UNPASS".equals(sysData.getCheckStatus())){
apiData.setJyjg("0");
}
@@ -165,6 +175,8 @@
api1203List = api1203Rep.getDataById(apiData.getRkjydh());
if(null == api1203List || api1203List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1203List.get(0).getCzbz());
}
//淇濆瓨鏁版嵁
--
Gitblit v1.9.3