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/Fzzy40Sync1208.java | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 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 0f26f6b..46e3fef 100644 --- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java +++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java @@ -87,10 +87,7 @@ apiData.setHwdm(api1105.getHwdm()); //绮鍝佺 - String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz40DepotStore.getFoodVariety()); - if(StringUtils.isEmpty(mappingCode)){ - 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); //绮鎬ц川 @@ -115,16 +112,25 @@ if (StringUtils.isEmpty(fz40DepotStore.getLqgsdwdm())) { apiData.setLqgsdwdm(api1102.getDwdm()); } else { - apiData.setLqxzqhdm(fz40DepotStore.getLqgsdwdm()); + apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm()); } //绮潈琛屾斂鍖哄垝浠g爜 apiData.setLqxzqhdm(api1102.getXzqhdm()); //绠$悊鏂瑰紡-榛樿鐩村偍 - 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()); @@ -136,7 +142,10 @@ apiData.setRcsj(fz40DepotStore.getStoreDate()); //灏佷粨鏃ユ湡 if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) { - apiData.setFcrq(DateUtils.addDays(fz40DepotStore.getStoreDate(), 10)); + if(null == fz40DepotStore.getFullDate()){ + fz40DepotStore.setFullDate(DateUtils.addDays(fz40DepotStore.getStoreDate(), 30)); + } + apiData.setFcrq(fz40DepotStore.getFullDate()); } if ("1".equals(apiData.getHwzt())) { -- Gitblit v1.9.3