From 1aac0b24b4b7f0e15bb4f7001ae8d1e313336caf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 07 一月 2025 15:46:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index 43e2902..4bc8cfb 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -87,7 +87,7 @@
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0,3));
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety().substring(0, 3));
apiData.setLspzdm(mappingCode);
//绮鎬ц川
@@ -101,35 +101,63 @@
apiData.setShnd(fz40DepotStore.getFoodYear());
//浜у湴浠ｇ爜
- String cd = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
- apiData.setCd(cd);
+ mappingCode = commonService.getFoodLocationIdFromCache(fz40DepotStore.getFoodLocation());
+ if (StringUtils.isEmpty(mappingCode)) {
+ mappingCode = apiData.getHwdm().substring(2, 8);
+ }
+ apiData.setCd(mappingCode);
apiData.setBgy(StringUtils.isEmpty(api1105.getBgy()) ? "淇濈鍛�" : api1105.getBgy());
//绮潈褰掑睘鍗曚綅
- apiData.setLqgsdwdm(api1102.getDwdm());
- //绮潈琛屾斂鍖哄垝浠ｇ爜
+ if (StringUtils.isEmpty(fz40DepotStore.getLqgsdwdm())) {
+ apiData.setLqgsdwdm(api1102.getDwdm());
+ } else {
+ apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
+ }
+
apiData.setLqxzqhdm(api1102.getXzqhdm());
+ if (apiData.getLsxzdm().equals("121")) {
+ //鐪佺骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓虹渷绾�
+ apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 2) + "0000");
+ }
+ if (apiData.getLsxzdm().equals("122")) {
+ //甯傜骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓哄競绾�
+ apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 4) + "00");
+ }
+
//绠＄悊鏂瑰紡-榛樿鐩村偍
- apiData.setGlfs("01");
+ if (StringUtils.isEmpty(fz40DepotStore.getManageType())) {
+ apiData.setGlfs("01");
+ } else {
+ apiData.setGlfs(fz40DepotStore.getManageType());
+ }
+
//鏀跺偍鍦扮偣-榛樿搴撳唴
apiData.setScdd("1");
//鍌ㄧ伯鏂瑰紡
apiData.setClfs(fz40DepotStore.getStoreType());
+ //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
+ if ("2".equals(apiData.getClfs())) {
+ apiData.setBclbs((int) (fz40DepotStore.getStorageReal() / 25));
+ }
//璐т綅鐘舵��
mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz40DepotStore.getDepotStatus());
apiData.setHwzt(mappingCode);
- if(null == fz40DepotStore.getStoreDate()){
+ if (null == fz40DepotStore.getStoreDate()) {
fz40DepotStore.setStoreDate(new Date());
}
//鍏ヤ粨鏃堕棿
apiData.setRcsj(fz40DepotStore.getStoreDate());
//灏佷粨鏃ユ湡
- if("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())){
- apiData.setFcrq(DateUtils.addDays(fz40DepotStore.getStoreDate(), 10));
+ if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) {
+ if (null == fz40DepotStore.getFullDate()) {
+ fz40DepotStore.setFullDate(DateUtils.addDays(fz40DepotStore.getStoreDate(), 30));
+ }
+ apiData.setFcrq(fz40DepotStore.getFullDate());
}
- if("1".equals(apiData.getHwzt())){
+ if ("1".equals(apiData.getHwzt())) {
//鍑轰粨瀹屾垚鏃堕棿
apiData.setCcwcsj(DateUtils.addDays(fz40DepotStore.getStoreDate(), 5));
//娓呬粨鏃堕棿
@@ -151,9 +179,9 @@
//搴撳瓨姣忔鏂板
api1208List = api1208Rep.getDataById(apiData.getId());
- if(null == api1208List || api1208List.isEmpty()){
+ if (null == api1208List || api1208List.isEmpty()) {
apiData.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
apiData.setCzbz(api1208List.get(0).getCzbz());
}
--
Gitblit v1.9.3