From bca371e7ecc906ec824630c32aefd29a7a4f68d0 Mon Sep 17 00:00:00 2001 From: 陈战涛 <chenzhantao7055@sina.com> Date: 星期三, 10 五月 2023 18:48:35 +0800 Subject: [PATCH] 提交库存同步 --- src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 74 +++++++++++++++++++++--------------- 1 files changed, 43 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java index 191cd34..2d0113b 100644 --- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java +++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java @@ -8,10 +8,11 @@ import com.fzzy.api.view.repository.Api1102Rep; import com.fzzy.api.view.repository.Api1208Rep; import com.fzzy.api.view.repository.ApiLogRep; -import com.fzzy.async.fzzy35.entity.Depot; +import com.fzzy.async.fzzy35.entity.Fz35Depot; import com.fzzy.async.fzzy35.repository.Fzzy35Sync1208Rep; 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; @@ -58,7 +59,7 @@ apiLog.setStatus(99); apiLog.setId(ContextUtil.getUUID()); try { - List<Depot> list = fzzySync1208Rep.listDepot(deptId); + List<Fz35Depot> list = fzzySync1208Rep.listDepot(deptId); if (null == list || list.isEmpty()) { @@ -73,68 +74,79 @@ Api1208 apiData; Api1105 api1105; // List<GbArea> gbAreaList; - for (Depot depot : list) { + List<Api1208> api1208List; + for (Fz35Depot fz35Depot : list) { //鑾峰彇璐т綅淇℃伅 - api1105 = commonService.getApi1105Cache(depot.getId()); + api1105 = commonService.getApi1105Cache(fz35Depot.getId()); if (null == api1105) { continue; } - apiData = api1208Rep.getOne(api1105.getHwdm()); - if (apiData == null){ - apiData = new Api1208(); - apiData.setCzbz(Constant.CZBZ_I); - }else{ - //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂� - } + apiData = new Api1208(); apiData.setHwdm(api1105.getHwdm()); //绮鍝佺 - String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, depot.getFoodVariety()); + String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz35Depot.getFoodVariety()); apiData.setLspzdm(mappingCode); //绮鎬ц川 - mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, depot.getFoodType()); + mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz35Depot.getFoodType()); apiData.setLsxzdm(mappingCode); //绮绛夌骇 - mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, depot.getFoodLevel()); + mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz35Depot.getFoodLevel()); apiData.setLsdjdm(mappingCode); - apiData.setShnd(depot.getFoodYear()); + apiData.setShnd(fz35Depot.getFoodYear()); //浜у湴浠g爜 - String cd = commonService.getFoodLocationIdFromCache(depot.getFoodLocation()); + String cd = commonService.getFoodLocationIdFromCache(fz35Depot.getFoodLocation()); apiData.setCd(cd); - apiData.setBgy(depot.getStoreKeeperName()); + apiData.setBgy(fz35Depot.getStoreKeeperName()); + //绮潈褰掑睘鍗曚綅 apiData.setLqgsdwdm(api1102.getDwdm()); + //绮潈琛屾斂鍖哄垝浠g爜 + apiData.setLqxzqhdm(api1102.getDwdm().substring(2, 8)); + //绠$悊鏂瑰紡-榛樿鐩村偍 + apiData.setGlfs("01"); + //鏀跺偍鍦扮偣-榛樿搴撳唴 + apiData.setScdd("1"); + //鍌ㄧ伯鏂瑰紡 + apiData.setClfs(fz35Depot.getStoreType()); //璐т綅鐘舵�� - mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, depot.getDepotStatus()); + mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz35Depot.getDepotStatus()); apiData.setHwzt(mappingCode); - - //鍥藉埆 - mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_GB, depot.getFoodLocation()); - if(StringUtils.isNotEmpty(mappingCode)){ - apiData.setGb(mappingCode); - }else{ - apiData.setGb("156"); + //鍏ヤ粨鏃堕棿 + apiData.setRcsj(fz35Depot.getStoreDate()); + //灏佷粨鏃ユ湡 + if("3".equals(apiData.getHwzt())){ + apiData.setFcrq(DateUtils.addDays(fz35Depot.getStoreDate(), 10)); } - - apiData.setRcsj(depot.getStoreDate()); - apiData.setSjsl(depot.getStorageReal()); - apiData.setJjsl(depot.getStorageReal()); + //鍑轰粨瀹屾垚鏃堕棿 + if("1".equals(apiData.getHwzt())){ + apiData.setCcwcsj(DateUtils.addDays(fz35Depot.getStoreDate(), 5)); + } + //鍥藉埆 + apiData.setGb("156"); + apiData.setSjsl(fz35Depot.getStorageReal()); + apiData.setJjsl(fz35Depot.getStorageReal()); + apiData.setSjzlxg(6); + apiData.setLdtj(10000); apiData.setZhgxsj(new Date()); //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂� - apiData.setBizId(depot.getId()); + apiData.setBizId(fz35Depot.getId()); apiData.setKqdm(kqdm); apiData.setSyncTime(new Date()); + api1208List = api1208Rep.getDataById(api1105.getHwdm()); + if(null == api1208List || api1208List.isEmpty()){ + apiData.setCzbz(Constant.CZBZ_I); + } apiData.setId(api1105.getHwdm()); - //淇濆瓨鏁版嵁 //淇濆瓨鏁版嵁 api1208Rep.save(apiData); } -- Gitblit v1.9.3