From 6671f69b4d24869f3f321a15f511c2ad61b64c04 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 19 五月 2025 15:12:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateOrderPlanManagerServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateOrderPlanManagerServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateOrderPlanManagerServiceImpl.java
index 056b72f..21c6be4 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateOrderPlanManagerServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateOrderPlanManagerServiceImpl.java
@@ -11,6 +11,7 @@
import com.aps.core.service.ApsPlate.IApsPlateOrderPlanManagerService;
import com.aps.core.service.ApsPlate.IApsPlateStandardRequireBatchService;
import com.aps.core.service.ApsPlate.IApsPlateStandardRequireService;
+import com.aps.core.service.ApsPlateStandardRequireOrderEndDayService;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,6 +36,9 @@
IApsPlateStandardRequireBatchService requireBatchService;
@Resource
ApsPlanTaskService planTaskService;
+ @Resource
+ ApsPlateStandardRequireOrderEndDayService orderEndDayService;
+
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝绠＄悊
*
@@ -69,15 +73,18 @@
apsPlateOrderPlanDate.setUpdateBy(SecurityUtils.getUsername());
apsPlateOrderPlanManagerMapper.updatePlanDateByCustom(apsPlateOrderPlanDate);
} else {
- List<ApsPlateOrderPlanRequireDate> planRequireDates = apsPlateOrderPlanManagerMapper.selectPlanRequireIds(apsPlateOrderPlanDate.getPlanIds());
+ List<Long> planIds = apsPlateOrderPlanDate.getPlanIds();
+ orderEndDayService.saveBatch(planIds);
+
+ /*List<ApsPlateOrderPlanRequireDate> planRequireDates = apsPlateOrderPlanManagerMapper.selectPlanRequireIds(planIds);
planRequireDates.forEach(planRequireDate -> {
planRequireDate.setUpdateBy(SecurityUtils.getUsername());
apsPlateOrderPlanManagerMapper.updatePlanDateByBatch(planRequireDate);
- });
+ });*/
}
- String batchNum= requireBatchService.getNewBatchNumber();
+/* String batchNum= requireBatchService.getNewBatchNumber();
planTaskService.savePlanTask(batchNum);
apsPlateStandardRequireService.generatorPlan(batchNum);
- planTaskService.updateTaskStatus(batchNum, PLAN_TASK_STATUS.FINISHED);
+ planTaskService.updateTaskStatus(batchNum, PLAN_TASK_STATUS.FINISHED);*/
}
}
--
Gitblit v1.9.3