From 8bbe2bb92ddfeb1766eb7324a6c39acd5e2b1c5c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 10:21:17 +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 | 21 ++++++++++++++++++---
1 files changed, 18 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..fde2037 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
@@ -7,6 +7,7 @@
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlateOrderPlanManagerMapper;
import com.aps.core.service.IApsPlateOrderPlanManagerService;
+import com.aps.core.service.IApsPlateStandardRequireService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +25,9 @@
@Autowired
private ApsPlateOrderPlanManagerMapper apsPlateOrderPlanManagerMapper;
+ @Autowired
+ private IApsPlateStandardRequireService apsPlateStandardRequireService;
+
/**
* 鏌ヨ閽ｉ噾宸ュ崟璁″垝绠＄悊
*
@@ -35,23 +39,34 @@
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()) {
apsPlateOrderPlanManagerMapper.updatePlanDateByCustom(apsPlateOrderPlanDate);
- }else{
+ } else {
List<ApsPlateOrderPlanRequireDate> planRequireDates = apsPlateOrderPlanManagerMapper.selectPlanRequireIds(apsPlateOrderPlanDate.getPlanIds());
planRequireDates.forEach(planRequireDate -> {
planRequireDate.setUpdateBy(SecurityUtils.getUsername());
apsPlateOrderPlanManagerMapper.updatePlanDateByBatch(planRequireDate);
});
}
-
+// apsPlateStandardRequireService.generatorPlan();
}
}
--
Gitblit v1.9.3