From 0efbf246a22f7331cf2e16bd659caea22a494102 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期一, 29 五月 2023 12:05:48 +0800 Subject: [PATCH] 调整模块货位和库存2 --- igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 3 deletions(-) diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java b/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java index 7bde68b..7b0f58e 100644 --- a/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java +++ b/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java @@ -4,6 +4,7 @@ import com.bstek.dorado.annotation.DataResolver; import com.bstek.dorado.annotation.Expose; import com.bstek.dorado.data.provider.Page; +import com.ld.igds.constant.DepotStatus; import com.ld.igds.models.DepotStore; import com.ld.igds.view.service.HDepotStoreService; import org.springframework.stereotype.Component; @@ -49,9 +50,43 @@ * @param data */ @DataResolver - public void saveDepotStore(DepotStore data) { - - //TODO 鏍规嵁椤甸潰璇存槑澧炲姞淇濆瓨鍓嶉獙璇� 2023骞�5鏈�27鏃� 18:53:56 + public String saveDepotStore(DepotStore data) throws Exception { + + //濡傛灉浠撳簱鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓� + if (DepotStatus.STATUS_2.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_3.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_4.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_31.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_32.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_33.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_34.getCode().equals(data.getDepotStatus())) { + + if (null == data.getFoodYear()) return "璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝鏀惰揣骞村害涓嶈兘涓虹┖"; + + if (null == data.getCountry()) return "璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝鍥藉埆涓嶈兘涓虹┖"; + + if (null == data.getFoodLocation()) return "璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝绮浜у湴涓嶈兘涓虹┖"; + + if (null == data.getFoodLocation()) return "璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝绮浜у湴涓嶈兘涓虹┖"; + + if (null == data.getStoreDate()) return "璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝鍏ュ簱鏃堕棿涓嶅彲涓虹┖"; + } + + //璐т綅鐘舵��=灏佷粨/鍑哄簱涓紝蹇呭~ + if (DepotStatus.STATUS_3.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_4.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_31.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_32.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_33.getCode().equals(data.getDepotStatus()) || + DepotStatus.STATUS_34.getCode().equals(data.getDepotStatus())) { + + if (null == data.getFullDate()) return "璐т綅鐘舵��=灏佷粨/鍑哄簱涓紝灏佷粨鏃堕棿涓嶅彲涓虹┖"; + } + + //璐т綅鐘舵��=绌轰粨锛屽繀濉�傛渶鍚庝竴杞︾伯椋熷嚭浠撴椂闂� + if (DepotStatus.STATUS_1.getCode().equals(data.getDepotStatus())) { + if (null == data.getOutDate()) return "璐т綅鐘舵��=绌轰粨锛屽嚭浠撳畬鎴愭椂闂翠笉鍙负绌�"; + } depotStoreService.saveDepotStore(data); @@ -60,6 +95,8 @@ //杩滅▼鍚屾鐘舵�� depotPR.pullDepotStatus(data.getCompanyId(), data.getDepotId(), data.getDepotStatus()); + + return null; } /** -- Gitblit v1.9.3