From 40776beb224799d5dd51ca1d92ea2f5e883ff4f5 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 02 八月 2024 11:30:18 +0800
Subject: [PATCH] 增加增城东部粮油中心库配置信息
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 61 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 3af09f4..782b2de 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -44,6 +44,8 @@
@Autowired
private Api1205Rep api1205Rep;
@Autowired
+ private Api1206Rep api1206Rep;
+ @Autowired
private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@@ -82,6 +84,7 @@
Api1105 api1105;
List<Fz40InoutNoticeOut> listInoutNotice;
List<Api1205> api1205List;
+ List<Api1206> api1206List;
List<Fz40InoutRecordItem> listInoutRecordItem;
for (Fz40InoutRecord sysData : list) {
if(sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")){
@@ -105,12 +108,19 @@
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
apiData.setYwlx(Constant.INOUT_TYPE_1);
+ apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
+ apiData.setCyr(sysData.getUserName().trim());
+
+ //榛樿涓�涓殢渚垮��
+ apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
+
+ if(StringUtils.isEmpty(sysData.getUserId()) || sysData.getUserId().length() != 18){
+ sysData.setUserId("410183199003187055");
+ }
+ apiData.setSfzh(sysData.getUserId());
//閫氱煡鍗曞彿
apiData.setCktzdh(sysData.getNoticeId());
-
- apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
-
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
if (null != listInoutNotice && listInoutNotice.size() > 0) {
@@ -122,9 +132,12 @@
}
}
if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
- List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
+ List<Api1404> api1404List = api1404Rep.getDataByBizIdAndKqdm(listInoutNotice.get(0).getPlanId(), kqdm);
if(null != api1404List && api1404List.size() > 0){
apiData.setJhmxh(api1404List.get(0).getJhmxdh());
+ if(StringUtils.isEmpty(sysData.getFoodYear())){
+ sysData.setFoodYear(api1404List.get(0).getShnd());
+ }
}
}
}
@@ -148,7 +161,7 @@
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(sysData.getRegisterTime(), "yyyy") :sysData.getFoodYear());
//浜у湴浠ｇ爜
mappingCode = commonService.getFoodLocationIdFromCache(sysData.getFoodLocation());
@@ -166,11 +179,12 @@
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
apiData.setPzjlsj(sysData.getEmptyWeightTime());
- apiData.setPzjby(sysData.getEmptyWeightUser());
- apiData.setPzjly(sysData.getEmptyWeightUser());
+ apiData.setPzjby(StringUtils.isEmpty(sysData.getEmptyWeightUser())?"鐩戠鍛�":sysData.getEmptyWeightUser());
+ apiData.setPzjly(StringUtils.isEmpty(sysData.getEmptyWeightUser())?"璁￠噺鍛�":sysData.getEmptyWeightUser());
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ apiData.setKzl(0-sysData.getDeCheck()+sysData.getAddCheck()-sysData.getDeHandle()-sysData.getDePackage()-sysData.getDeOther());
if (null == sysData.getFullWeightTime()) {
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
}
@@ -178,8 +192,8 @@
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
}
apiData.setMzjlsj(sysData.getFullWeightTime());
- apiData.setMzjby(sysData.getFullWeightUser());
- apiData.setMzjly(sysData.getFullWeightUser());
+ apiData.setMzjby(StringUtils.isEmpty(sysData.getFullWeightUser())?"鐩戠鍛�":sysData.getFullWeightUser());
+ apiData.setMzjly(StringUtils.isEmpty(sysData.getFullWeightUser())?"璁￠噺鍛�":sysData.getFullWeightUser());
//鍑�閲�
apiData.setJz(sysData.getRecordWeight());
@@ -187,19 +201,52 @@
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
+ //缁撶畻鍗曞彿
if(StringUtils.isNotEmpty(sysData.getSettleId())){
apiData.setCkjsdh(kqdm + sysData.getSettleId());
}
+ if(StringUtils.isNotEmpty(apiData.getHth())){
+ api1206List = api1206Rep.getDataByHthAndHwdm(apiData.getHth(), apiData.getHwdm());
+ if(null == api1206List || api1206List.isEmpty()){
+ api1206List = api1206Rep.getDataByHth(apiData.getHth());
+ if(null != api1206List && api1206List.size() > 0){
+ apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
+ }
+ }else {
+ apiData.setCkjsdh(api1206List.get(0).getCkjsdh());
+ }
+ }
+
+ apiData.setCchlx("01");
+ apiData.setXldd("搴撳唴");
+ apiData.setBz(StringUtils.isEmpty(sysData.getRemarks())?"鏆傛棤澶囨敞淇℃伅":sysData.getRemarks());
+ apiData.setBzbdbz(25);
+ apiData.setBzbjs(0);
+ apiData.setCmqrmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"闂ㄥ矖浜�":sysData.getRegisterUser());
+ apiData.setDjmgryxm(StringUtils.isEmpty(sysData.getRegisterUser())?"鐧昏浜�":sysData.getRegisterUser());
+ apiData.setZcbgyxm(StringUtils.isEmpty(sysData.getHandleUser())?"鍊间粨鍛�":sysData.getHandleUser());
+ apiData.setZxzydw("澶栬仒鍗曚綅");
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(sysData.getUpdateTime());
+
+ //鎵胯繍浜� 韬唤璇佸彿 鐢佃瘽
+ apiData.setSfzh(sysData.getUserId());
+ apiData.setCyr(sysData.getUserName());
+ apiData.setLxdh(sysData.getUserContact());
+
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setBizId(sysData.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
- log.info("1201---鍚屾鏁版嵁锛歿}",apiData.toString());
-
+ log.info("1205---鍚屾鏁版嵁锛歿}",apiData.toString());
+ api1205List = api1205Rep.getDataById(apiData.getCkywdh());
+ if(null == api1205List || api1205List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1205List.get(0).getCzbz());
+ }
//鍒ゆ柇鏄惁涓鸿埞杩�
if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
@@ -220,7 +267,9 @@
apiData.setMz(fz40InoutRecordItem.getFullWeight());
apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
-
+ apiData.setMzjlsj(fz40InoutRecordItem.getFullWeightTime());
+ apiData.setPzjlsj(fz40InoutRecordItem.getEmptyWeightTime());
+ apiData.setKzl(0 - fz40InoutRecordItem.getDe());
api1205List = api1205Rep.getDataById(apiData.getCkywdh());
if(null == api1205List || api1205List.isEmpty()){
apiData.setCzbz(Constant.CZBZ_I);
@@ -231,12 +280,6 @@
idNum ++;
}
}else {
- api1205List = api1205Rep.getDataById(apiData.getCkywdh());
- if(null == api1205List || api1205List.isEmpty()){
- apiData.setCzbz(Constant.CZBZ_I);
- }else {
- apiData.setCzbz(api1205List.get(0).getCzbz());
- }
//淇濆瓨鏁版嵁
api1205Rep.save(apiData);
}
--
Gitblit v1.9.3