From 11833b63b8737892370ddde9bae0b415a7aee733 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 04 三月 2024 21:26:43 +0800
Subject: [PATCH] 入库信息默认值
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 64 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
index 407c8d8..0e1375a 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -20,6 +20,7 @@
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.text.SimpleDateFormat;
import java.util.*;
@@ -83,11 +84,11 @@
if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
continue;
}
- if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
sysData.setRecordWeight(sysData.getSettleWeight());
}
//鍒ゆ柇鍑�閲嶆槸鍚﹀ぇ浜�0锛岀瓑浜�0琛ㄧず涓嶅悎鏍硷紝涓嶈繘琛屽悓姝ヤ笂浼�
- if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
+ if (null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0) {
continue;
}
//鑾峰彇璐т綅淇℃伅
@@ -103,7 +104,7 @@
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
Date time = dateFormat.parse(sysData.getId().substring(2, 10));
int numDay = DateUtil.difDay(DateUtil.getCurZero(sysData.getCompleteTime()), DateUtil.getCurZero(time));
- if(numDay != 0){
+ if (numDay != 0) {
sysData.setFullWeightTime(DateUtils.addDays(sysData.getFullWeightTime(), numDay));
sysData.setEmptyWeightTime(DateUtils.addDays(sysData.getEmptyWeightTime(), numDay));
sysData.setCompleteTime(DateUtils.addDays(sysData.getCompleteTime(), numDay));
@@ -114,6 +115,29 @@
apiData.setYwlx(Constant.INOUT_TYPE_2);
apiData.setYwrq(sysData.getRegisterTime());
apiData.setCyr(sysData.getUserName());
+ apiData.setBz(null == sysData.getRemarks() ? "澶囨敞" : sysData.getRemarks());
+ apiData.setKlyy("鎵ｉ噺鍘熷洜");
+
+ apiData.setCmqrmgryxm(sysData.getRegisterUser());
+ apiData.setDjmgryxm(sysData.getRegisterUser());
+ //01:琛ㄧず澶у瀷姹借溅鍙风墝,榛勫簳榛戝瓧锛� 02:琛ㄧず灏忓瀷姹借溅鍙风墝,钃濆簳鐧藉瓧锛� 03:琛ㄧず鏂拌兘婧愭苯杞﹀彿鐗�,缁垮簳榛� 瀛楋紱
+ //04:琛ㄧず鍐滅敤杞﹁溅鐗屽彿锛岀豢搴曠櫧瀛楋紱 LS:琛ㄧず涓存椂铏氭嫙鍙风墝锛屼粎闄愪簬鍞� 绮溅鏃犲浐瀹氬彿鐗屾椂浣跨敤
+ apiData.setCchlx("01");
+ apiData.setLdd("瑁呯伯鍦扮偣");
+ apiData.setQzbwslkl(0.0);
+ apiData.setQzzzzkl(0.0);
+ apiData.setQzgwcmkl(0.0);
+ apiData.setQzhhkl(0.0);
+ apiData.setQzbwslkl(0.0);
+ apiData.setQzhlmkl(0.0);
+ apiData.setQzsmlkl(0.0);
+ apiData.setQzzjmlkl(0.0);
+ apiData.setQzqtkl(0.0);
+ apiData.setZxzydw(api1105.getBgdw());
+ if (sysData.getCompanyId().equals("5329")) {
+ apiData.setLqgsdwdm("91440604MA56D2AM1X");
+ }
+
//榛樿涓�涓殢渚垮��
apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact());
@@ -122,30 +146,30 @@
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzy35SyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
- if(null != listInoutNotice && listInoutNotice.size() >0){
- apiData.setHth(api1105.getHwdm().substring(0,18) + listInoutNotice.get(0).getContractId());
- }else {
- apiData.setHth(api1105.getHwdm().substring(0,18) + apiData.getRkywdh());
+ if (null != listInoutNotice && listInoutNotice.size() > 0) {
+ apiData.setHth(api1105.getHwdm().substring(0, 18) + listInoutNotice.get(0).getContractId());
+ } else {
+ apiData.setHth(api1105.getHwdm().substring(0, 18) + apiData.getRkywdh());
}
apiData.setXxdz(sysData.getUserAddress());
//杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
- apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1" : sysData.getTransType());
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
apiData.setDjsj(sysData.getRegisterTime());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0,3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, sysData.getFoodVariety().substring(0, 3));
apiData.setLspzdm(mappingCode);
//绮鎬ц川
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, sysData.getFoodType());
apiData.setLsxzdm(mappingCode);
- apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear())? DateFormatUtils.format(new Date(), "yyyy") :sysData.getFoodYear());
+ apiData.setShnd(StringUtils.isEmpty(sysData.getFoodYear()) ? DateFormatUtils.format(new Date(), "yyyy") : sysData.getFoodYear());
//浜у湴浠ｇ爜
String cddm = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
@@ -156,18 +180,18 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
- if(!sysData.getFullWeightTime().after(sysData.getRegisterTime())){
+ if (!sysData.getFullWeightTime().after(sysData.getRegisterTime())) {
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
apiData.setMzjby(sysData.getFullWeightUser());
apiData.setMzjly(sysData.getFullWeightUser());
- apiData.setZcy(sysData.getHandleUser());
+ apiData.setZcy(null == sysData.getHandleUser() ? sysData.getFullWeightUser() : sysData.getHandleUser());
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
- if(!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())){
+ if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
@@ -175,20 +199,20 @@
apiData.setPzjly(sysData.getEmptyWeightUser());
//鎵ｉ噸 鍖栭獙鎬绘墸閲�
- apiData.setZjklxj( 0 - (sysData.getDeImpurity()+sysData.getDeWet()));
+ apiData.setZjklxj(0 - (sysData.getDeImpurity() + sysData.getDeWet()));
apiData.setQzsfzkl(0 - sysData.getDeWet());
apiData.setQzzzzkl(0 - sysData.getDeImpurity());
//鍏跺畠
- if(null == sysData.getDeOther()){
+ if (null == sysData.getDeOther()) {
sysData.setDeOther(0.0);
}
- apiData.setQtkl( 0 - sysData.getDeOther());
+ apiData.setQtkl(0 - sysData.getDeOther());
//鍊间粨 鐜板満鎵ｉ噸
- apiData.setXckl( 0 - sysData.getDeHandle());
+ apiData.setXckl(0 - sysData.getDeHandle());
apiData.setJz(sysData.getRecordWeight());
- if(!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())){
+ if (!sysData.getCompleteTime().after(sysData.getEmptyWeightTime())) {
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
@@ -204,9 +228,9 @@
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
api1202List = api1202Rep.getDataById(apiData.getRkywdh());
- if(null == api1202List || api1202List.isEmpty()){
+ if (null == api1202List || api1202List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
apiData.setCzbz(api1202List.get(0).getCzbz());
}
//淇濆瓨鏁版嵁
--
Gitblit v1.9.3