From b667644b1a9f93583b4bb2d508c570c65aa3497b Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期六, 27 五月 2023 19:01:47 +0800 Subject: [PATCH] 调整模块货位和库存 --- igds-core/src/main/java/com/ld/igds/view/DepotPR.java | 82 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 80 insertions(+), 2 deletions(-) diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotPR.java b/igds-core/src/main/java/com/ld/igds/view/DepotPR.java index e0752c8..5859990 100644 --- a/igds-core/src/main/java/com/ld/igds/view/DepotPR.java +++ b/igds-core/src/main/java/com/ld/igds/view/DepotPR.java @@ -10,11 +10,13 @@ import com.ld.igds.io.request.DepotStatusRequest; import com.ld.igds.io.response.BaseResponse; import com.ld.igds.models.*; + import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; + import com.bstek.bdf2.core.business.IUser; import com.bstek.dorado.annotation.DataProvider; import com.bstek.dorado.annotation.DataResolver; @@ -23,6 +25,9 @@ import com.ld.igds.common.CoreSerService; import com.ld.igds.constant.BizType; import com.ld.igds.constant.Constant; +import com.ld.igds.constant.DepotStatus; +import com.ld.igds.constant.DepotType; +import com.ld.igds.constant.FoodLevel; import com.ld.igds.order.ExeOrderService; import com.ld.igds.order.data.ExeRequest; import com.ld.igds.util.ContextUtil; @@ -45,6 +50,63 @@ private RemoteManager remoteManager; @Autowired private ExeOrderService exeOrderService; + + + /** + * 浠撴埧绫诲瀷-闈炲浗鏍囧畾涔� + * ${dorado.getDataProvider("depotPR#triggerDepotType").getResult()} + * + * @return + */ + @DataProvider + public List<DicTrigger> triggerDepotType() { + List<DicTrigger> list = new ArrayList<DicTrigger>(); + list.add(new DicTrigger(DepotType.TYPE_01.getCode(), DepotType.TYPE_01.getMsg())); + list.add(new DicTrigger(DepotType.TYPE_02.getCode(), DepotType.TYPE_02.getMsg())); + list.add(new DicTrigger(DepotType.TYPE_03.getCode(), DepotType.TYPE_03.getMsg())); + list.add(new DicTrigger(DepotType.TYPE_04.getCode(), DepotType.TYPE_04.getMsg())); + list.add(new DicTrigger(DepotType.TYPE_99.getCode(), DepotType.TYPE_99.getMsg())); + return list; + } + + /** + * 浠撴埧鐘舵�� + * ${dorado.getDataProvider("depotPR#triggerDepotStatus").getResult()} + * + * @return + */ + @DataProvider + public List<DicTrigger> triggerDepotStatus() { + List<DicTrigger> list = new ArrayList<DicTrigger>(); + list.add(new DicTrigger(DepotStatus.STATUS_1.getCode(), DepotStatus.STATUS_1.getMsg())); + list.add(new DicTrigger(DepotStatus.STATUS_2.getCode(), DepotStatus.STATUS_2.getMsg())); + list.add(new DicTrigger(DepotStatus.STATUS_3.getCode(), DepotStatus.STATUS_3.getMsg())); + list.add(new DicTrigger(DepotStatus.STATUS_4.getCode(), DepotStatus.STATUS_4.getMsg())); + list.add(new DicTrigger(DepotStatus.STATUS_31.getCode(), DepotStatus.STATUS_31.getMsg())); + list.add(new DicTrigger(DepotStatus.STATUS_32.getCode(), DepotStatus.STATUS_32.getMsg())); + list.add(new DicTrigger(DepotStatus.STATUS_33.getCode(), DepotStatus.STATUS_33.getMsg())); + list.add(new DicTrigger(DepotStatus.STATUS_34.getCode(), DepotStatus.STATUS_34.getMsg())); + list.add(new DicTrigger(DepotStatus.STATUS_9.getCode(), DepotStatus.STATUS_9.getMsg())); + return list; + } + + /** + * 绮绛夌骇 + * ${dorado.getDataProvider("depotPR#triggerFoodLevel").getResult()} + * + * @return + */ + @DataProvider + public List<DicTrigger> triggerFoodLevel() { + List<DicTrigger> list = new ArrayList<DicTrigger>(); + list.add(new DicTrigger(FoodLevel.LEVEL_01.getCode(), FoodLevel.LEVEL_01.getMsg())); + list.add(new DicTrigger(FoodLevel.LEVEL_02.getCode(), FoodLevel.LEVEL_02.getMsg())); + list.add(new DicTrigger(FoodLevel.LEVEL_03.getCode(), FoodLevel.LEVEL_03.getMsg())); + list.add(new DicTrigger(FoodLevel.LEVEL_04.getCode(), FoodLevel.LEVEL_04.getMsg())); + list.add(new DicTrigger(FoodLevel.LEVEL_05.getCode(), FoodLevel.LEVEL_05.getMsg())); + list.add(new DicTrigger(FoodLevel.LEVEL_06.getCode(), FoodLevel.LEVEL_06.getMsg())); + return list; + } /** * 鍌ㄧ伯鏂瑰紡 @@ -57,10 +119,26 @@ List<DicTrigger> list = new ArrayList<DicTrigger>(); list.add(new DicTrigger("1", "鏁h鍌ㄧ伯")); list.add(new DicTrigger("2", "鍖呰鍌ㄧ伯")); - list.add(new DicTrigger("3", "鍥村寘鏁e瓨")); + list.add(new DicTrigger("3", "鍥村寘瀛�")); list.add(new DicTrigger("9", "鍏朵粬")); return list; } + + /** + * 绠$悊鏂瑰紡 + * ${dorado.getDataProvider("depotPR#triggerManagerType").getResult()} + * + * @return + */ + @DataProvider + public List<DicTrigger> triggerManagerType() { + List<DicTrigger> list = new ArrayList<DicTrigger>(); + list.add(new DicTrigger("01", "鐩村偍")); + list.add(new DicTrigger("02", "浠e偍")); + list.add(new DicTrigger("03", "绉熶粨")); + list.add(new DicTrigger("04", "濮旀墭")); + return list; + } /** * 鐢电紗璧峰鏂逛綅 -- Gitblit v1.9.3