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/service/impl/ApsPlateOrderPlanManagerServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
index db7202a..d2b7f23 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
@@ -5,8 +5,13 @@
import com.aps.core.domain.ApsPlateOrderPlanManager;
import com.aps.core.domain.ApsPlateOrderPlanRequireDate;
import com.aps.core.domain.ApsPlateStandardRequire;
+import com.aps.core.enums.PLAN_TASK_STATUS;
import com.aps.core.mapper.ApsPlateOrderPlanManagerMapper;
+import com.aps.core.service.ApsPlanTaskService;
import com.aps.core.service.IApsPlateOrderPlanManagerService;
+import com.aps.core.service.IApsPlateStandardRequireBatchService;
+import com.aps.core.service.IApsPlateStandardRequireService;
+import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +29,12 @@
@Autowired
private ApsPlateOrderPlanManagerMapper apsPlateOrderPlanManagerMapper;
+ @Autowired
+ private IApsPlateStandardRequireService apsPlateStandardRequireService;
+ @Resource
+ IApsPlateStandardRequireBatchService requireBatchService;
+ @Resource
+ ApsPlanTaskService planTaskService;
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝绠＄悊
*
@@ -35,23 +46,38 @@
return apsPlateOrderPlanManagerMapper.selectApsPlanOrderManager(apsPlateOrderPlanManager);
}
+ /**
+ * 鏌ヨ閽ｉ噾宸ュ崟璁″垝鏍囧噯闇�姹�
+ *
+ * @param workOrderNo 宸ュ崟鍙�
+ * @return
+ */
@Override
public List<ApsPlateStandardRequire> selectApsPlanStandardRequire(String workOrderNo) {
return apsPlateOrderPlanManagerMapper.selectApsPlanStandardRequire(workOrderNo);
}
+ /**
+ * 鎵归噺鏇存柊璁″垝鏃堕棿
+ *
+ * @param apsPlateOrderPlanDate
+ */
@Transactional(rollbackFor = Exception.class)
@Override
public void updatePlanDate(ApsPlateOrderPlanDate apsPlateOrderPlanDate) {
- if (apsPlateOrderPlanDate.getIsCustom()){
+ if (apsPlateOrderPlanDate.getIsCustom()) {
+ apsPlateOrderPlanDate.setUpdateBy(SecurityUtils.getUsername());
apsPlateOrderPlanManagerMapper.updatePlanDateByCustom(apsPlateOrderPlanDate);
- }else{
+ } else {
List<ApsPlateOrderPlanRequireDate> planRequireDates = apsPlateOrderPlanManagerMapper.selectPlanRequireIds(apsPlateOrderPlanDate.getPlanIds());
planRequireDates.forEach(planRequireDate -> {
planRequireDate.setUpdateBy(SecurityUtils.getUsername());
apsPlateOrderPlanManagerMapper.updatePlanDateByBatch(planRequireDate);
});
}
-
+ String batchNum= requireBatchService.getNewBatchNumber();
+ planTaskService.savePlanTask(batchNum);
+ apsPlateStandardRequireService.generatorPlan(batchNum);
+ planTaskService.updateTaskStatus(batchNum, PLAN_TASK_STATUS.FINISHED);
}
}
--
Gitblit v1.9.3