From a64043c4ced8a42af0db760ddb2abe08331ba2bc Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 28 Jul 2023 17:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=BF=E6=96=99=E8=AE=A1=E5=88=92=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86(=E4=BF=AE=E6=94=B9init)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProWetMaterialPlanController.java         | 12 ++++++++
 .../service/IProWetMaterialPlanService.java   |  9 ++++++
 .../impl/ProWetMaterialPlanServiceImpl.java   | 29 ++++++++++++++++++-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProWetMaterialPlanController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProWetMaterialPlanController.java
index 926cc48c..57de3c29 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProWetMaterialPlanController.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProWetMaterialPlanController.java
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.op.mes.domain.ProOrderWorkorder;
+import com.op.mes.domain.ProWetMaterialPlanDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.op.common.log.annotation.Log;
@@ -29,6 +30,17 @@ public class ProWetMaterialPlanController extends BaseController {
     @Autowired
     private IProWetMaterialPlanService proWetMaterialPlanService;
 
+    /**
+     * 修改湿料计划-提交接口
+     *
+     * @param detailList
+     * @return
+     */
+    @PutMapping("/updatePlanDetail")
+    public AjaxResult updateWetMaterialPlanDetail(@RequestBody List<ProWetMaterialPlanDetail> detailList) {
+        return proWetMaterialPlanService.updateWetMaterialPlanDetail(detailList);
+    }
+
     /**
      * 通过主计划id查询湿料计划详情list
      *
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IProWetMaterialPlanService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IProWetMaterialPlanService.java
index 01c92a67..f2031331 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/IProWetMaterialPlanService.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IProWetMaterialPlanService.java
@@ -6,6 +6,7 @@ import java.util.List;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.mes.domain.ProOrderWorkorder;
 import com.op.mes.domain.ProWetMaterialPlan;
+import com.op.mes.domain.ProWetMaterialPlanDetail;
 
 /**
  * 湿料计划管理Service接口
@@ -107,4 +108,12 @@ public interface IProWetMaterialPlanService {
      * @return
      */
     AjaxResult getWetMaterialPlanDetailListById(String id);
+
+    /**
+     * 修改湿料计划-提交接口
+     *
+     * @param detailList
+     * @return
+     */
+    AjaxResult updateWetMaterialPlanDetail(List<ProWetMaterialPlanDetail> detailList);
 }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java
index eb48daca..ea06ca46 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProWetMaterialPlanServiceImpl.java
@@ -220,13 +220,40 @@ public class ProWetMaterialPlanServiceImpl implements IProWetMaterialPlanService
     public AjaxResult getWetMaterialPlanDetailListById(String id) {
         List<ProWetMaterialPlanDetail> detailList = proWetMaterialPlanDetailMapper.selectProWetMaterialPlanDetailListById(id);
         // 获取班次名称和料罐名称
-        for (int i = 0;i < detailList.size();i++){
+        for (int i = 0; i < detailList.size(); i++) {
             detailList.get(i).setShiftDesc(proWetMaterialPlanMapper.selectShiftById(String.valueOf(detailList.get(i).getShiftId())));
             detailList.get(i).setBucketName(proWetMaterialPlanMapper.selectBucketNameById(detailList.get(i).getBucketId()));
         }
         return success(detailList);
     }
 
+    /**
+     * 修改湿料计划-提交接口
+     *
+     * @param detailList
+     * @return
+     */
+    @Override
+    @DS("#header.poolName")
+    @Transactional
+    public AjaxResult updateWetMaterialPlanDetail(List<ProWetMaterialPlanDetail> detailList) {
+        // 获取该计划详情下的主计划信息
+        ProWetMaterialPlan proWetMaterialPlan = proWetMaterialPlanMapper.selectProWetMaterialPlanById(detailList.get(0).getWetMaterialPlanId());
+        // 更新主计划信息
+        // 更新人
+        proWetMaterialPlan.setUpdateBy(SecurityContextHolder.getUserName());
+        // 更新时间
+        proWetMaterialPlan.setUpdateTime(DateUtils.getNowDate());
+        // 更新至数据库
+        proWetMaterialPlanMapper.updateProWetMaterialPlan(proWetMaterialPlan);
+
+        // 循环将详情信息更新至数据库
+        for (int i = 0; i < detailList.size(); i++) {
+            proWetMaterialPlanDetailMapper.updateProWetMaterialPlanDetail(detailList.get(i));
+        }
+        return success();
+    }
+
     /**
      * 创建湿料（主）计划
      *