From fbb90c31d56348ec3fcc49af49c66b19992f58df Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 16 五月 2025 17:15:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
index d084b25..34371a6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateStandardRequireController.java
@@ -8,7 +8,11 @@
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsPlateStandardRequire;
+import com.aps.core.enums.PLAN_TASK_STATUS;
+import com.aps.core.service.ApsPlanTaskService;
+import com.aps.core.service.IApsPlateStandardRequireBatchService;
import com.aps.core.service.IApsPlateStandardRequireService;
+import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,6 +33,10 @@
{
@Autowired
private IApsPlateStandardRequireService apsPlateStandardRequireService;
+ @Resource
+ IApsPlateStandardRequireBatchService requireBatchService;
+ @Resource
+ ApsPlanTaskService planTaskService;
/**
* 鏌ヨ閽ｉ噾宸ュ崟鏍囧噯闇�姹傚垪琛�
@@ -107,7 +115,7 @@
/**
* 閽ｉ噾渚涘簲缂哄彛鎶ヨ〃
*/
- @RequiresPermissions("Aps:ApsPlateStandardRequire:supplyGapList")
+ //@RequiresPermissions("Aps:ApsPlateStandardRequire:supplyGapList")
@GetMapping("/supplyGapList")
public TableDataInfo selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire)
{
@@ -133,7 +141,10 @@
@PostMapping("/generatorPlan")
public AjaxResult generatorPlan()
{
- apsPlateStandardRequireService.generatorPlan();
+ String batchNum= requireBatchService.getNewBatchNumber();
+ planTaskService.savePlanTask(batchNum);
+ apsPlateStandardRequireService.generatorPlan(batchNum);
+ planTaskService.updateTaskStatus(batchNum, PLAN_TASK_STATUS.FINISHED);
return success();
}
--
Gitblit v1.9.3