From a5ea6c16ddee126361a325ebd25d9136c0cc5b75 Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期四, 10 八月 2023 12:07:38 +0800 Subject: [PATCH] 优化3.5版本库存更新 --- src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 52 ++++++++++++++++++++++++---------------------------- 1 files changed, 24 insertions(+), 28 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 ba783be..4df4f97 100644 --- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java +++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java @@ -8,13 +8,12 @@ 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.Fz35Depot; +import com.fzzy.async.fzzy35.entity.Fz35DepotStore; import com.fzzy.async.fzzy35.repository.Fzzy35Sync1208Rep; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - import java.util.Date; import java.util.List; @@ -58,7 +57,7 @@ apiLog.setStatus(99); apiLog.setId(ContextUtil.getUUID()); try { - List<Fz35Depot> list = fzzySync1208Rep.listDepot(deptId); + List<Fz35DepotStore> list = fzzySync1208Rep.listDepot(deptId, start, end); if (null == list || list.isEmpty()) { @@ -72,12 +71,10 @@ Api1208 apiData; Api1105 api1105; - // List<GbArea> gbAreaList; - List<Api1208> api1208List; - for (Fz35Depot fz35Depot : list) { + for (Fz35DepotStore fz35DepotStore : list) { //鑾峰彇璐т綅淇℃伅 - api1105 = commonService.getApi1105Cache(fz35Depot.getId()); + api1105 = commonService.getApi1105Cache(fz35DepotStore.getDepotId()); if (null == api1105) { continue; } @@ -86,24 +83,24 @@ apiData.setHwdm(api1105.getHwdm()); //绮鍝佺 - String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz35Depot.getFoodVariety()); + String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz35DepotStore.getFoodVariety()); apiData.setLspzdm(mappingCode); //绮鎬ц川 - mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz35Depot.getFoodType()); + mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz35DepotStore.getFoodType()); apiData.setLsxzdm(mappingCode); //绮绛夌骇 - mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz35Depot.getFoodLevel()); + mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz35DepotStore.getFoodLevel()); apiData.setLsdjdm(mappingCode); - apiData.setShnd(fz35Depot.getFoodYear()); + apiData.setShnd(fz35DepotStore.getFoodYear()); //浜у湴浠g爜 - String cd = commonService.getFoodLocationIdFromCache(fz35Depot.getFoodLocation()); + String cd = commonService.getFoodLocationIdFromCache(fz35DepotStore.getFoodLocation()); apiData.setCd(cd); - apiData.setBgy(fz35Depot.getStoreKeeperName()); + apiData.setBgy(api1105.getBgy()); //绮潈褰掑睘鍗曚綅 apiData.setLqgsdwdm(api1102.getDwdm()); //绮潈琛屾斂鍖哄垝浠g爜 @@ -113,42 +110,41 @@ //鏀跺偍鍦扮偣-榛樿搴撳唴 apiData.setScdd("1"); //鍌ㄧ伯鏂瑰紡 - apiData.setClfs(fz35Depot.getStoreType()); + apiData.setClfs(fz35DepotStore.getStoreType()); //璐т綅鐘舵�� - mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz35Depot.getDepotStatus()); + mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz35DepotStore.getDepotStatus()); apiData.setHwzt(mappingCode); - if(null == fz35Depot.getStoreDate()){ - fz35Depot.setStoreDate(new Date()); + if(null == fz35DepotStore.getStoreDate()){ + fz35DepotStore.setStoreDate(new Date()); } //鍏ヤ粨鏃堕棿 - apiData.setRcsj(fz35Depot.getStoreDate()); + apiData.setRcsj(fz35DepotStore.getStoreDate()); //灏佷粨鏃ユ湡 if("3".equals(apiData.getHwzt())){ - apiData.setFcrq(DateUtils.addDays(fz35Depot.getStoreDate(), 10)); + apiData.setFcrq(DateUtils.addDays(fz35DepotStore.getStoreDate(), 10)); } //鍑轰粨瀹屾垚鏃堕棿 if("1".equals(apiData.getHwzt())){ - apiData.setCcwcsj(DateUtils.addDays(fz35Depot.getStoreDate(), 5)); + apiData.setCcwcsj(DateUtils.addDays(fz35DepotStore.getStoreDate(), 5)); } //鍥藉埆 apiData.setGb("156"); - apiData.setSjsl(fz35Depot.getStorageReal()); - apiData.setJjsl(fz35Depot.getStorageReal()); + apiData.setSjsl(fz35DepotStore.getStorageReal()); + apiData.setJjsl(fz35DepotStore.getStorageReal()); apiData.setSjzlxg(6); apiData.setLdtj(10000); apiData.setZhgxsj(new Date()); //涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂� - apiData.setBizId(fz35Depot.getId()); + apiData.setBizId(fz35DepotStore.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()); + + //搴撳瓨姣忔鏂板 + apiData.setCzbz(Constant.CZBZ_I); + apiData.setId(ContextUtil.getCurTimeMillis()); //淇濆瓨鏁版嵁 api1208Rep.save(apiData); } -- Gitblit v1.9.3