From c357f8844e03627d0c3bea4bf2058e7c69ff3518 Mon Sep 17 00:00:00 2001 From: hongjli <3117313295@qq.com> Date: 星期三, 14 五月 2025 14:18:36 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj --- aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 10 +++++++--- aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateOrderPlanManagerController.java | 2 +- aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java | 2 +- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateOrderPlanManagerController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateOrderPlanManagerController.java index f99af31..9fe3134 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateOrderPlanManagerController.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateOrderPlanManagerController.java @@ -34,7 +34,7 @@ /** * 鏌ヨ閽i噾宸ュ崟璁″垝 */ - @RequiresPermissions("ApsPlatOrderPlanManager:list") + /*@RequiresPermissions("ApsPlatOrderPlanManager:list")*/ @GetMapping("/list") public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager) { diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java index e190310..28b0904 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java @@ -27,6 +27,7 @@ /** 闇�姹侷D */ @Excel(name = "闇�姹侷D") + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long requireId; /** 闇�姹傝拷婧疘D */ diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java index 51b05ea..5806541 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java @@ -68,6 +68,6 @@ */ public List<ApsPlateStandardRequire> selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire); - @Transactional + void generatorPlan(); } diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java index 437569f..2ab9146 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java @@ -175,7 +175,7 @@ String batchNum= requireBatchService.getNewBatchNumber(); /*鑾峰彇閽i噾涓诲崟淇℃伅*/ List<ApsPlatePlan> mainPlans = platePlanMapper.selectPlatePlanByPlantMajor(plantCode,mainOrderType); - Hashtable<String, ApsMaterialStorageManagement> usedStorage = new Hashtable<>(); + Hashtable<String, BigDecimal> usedStorage = new Hashtable<>(); log.info("寮�濮嬬敓鎴愰渶姹傦細"); for (ApsPlatePlan mainPlan : mainPlans) { String itemNumber = mainPlan.getItemNumber(); @@ -228,6 +228,10 @@ }*/ } + usedStorage.forEach((key,value)->{ + log.info("鏂欏彿锛�"+key+"锛屽簱瀛橈細"+value); + }); + } /** @@ -251,7 +255,7 @@ List<ApsPlateStandardRequire> allRequires, Long level,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList, - Hashtable<String, ApsMaterialStorageManagement> usedStorage + Hashtable<String, BigDecimal> usedStorage ) { /*鏋勫缓闇�姹備俊鎭�*/ ApsPlateStandardRequire require = new ApsPlateStandardRequire(); @@ -316,7 +320,7 @@ , afterStockAmount, require.getId(), stockDetailsList ); /*鏇存柊鍐呭瓨涓殑搴撳瓨浣跨敤淇℃伅*/ - // usedStorage.put(itemCode, storage); + usedStorage.put(itemCode, afterStockAmount); } } /*鏈尮閰嶆暟閲忥紝榛樿涓哄噣闇�姹�*/ -- Gitblit v1.9.3