From dbcf841720176f3c5ffb47b3b19c35e36126c644 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 25 Apr 2024 15:22:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=BF=E6=96=99=E8=AE=A1=E5=88=92=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProBPOrderWorkorderController.java     | 10 ++++++++++
 .../com/op/plan/mapper/ProOrderWorkorderMapper.java   |  2 ++
 .../op/plan/service/IProOrderWorkorderService.java    |  2 ++
 .../service/impl/ProOrderWorkorderServiceImpl.java    |  6 ++++++
 .../resources/mapper/plan/ProOrderWorkorderMapper.xml | 11 ++++++++++-
 .../service/impl/QcCheckTaskIncomeServiceImpl.java    |  2 +-
 6 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java
index 556a02437..9c7375a05 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProBPOrderWorkorderController.java
@@ -215,4 +215,14 @@ public class ProBPOrderWorkorderController extends BaseController {
     public AjaxResult downWorkorder(@PathVariable String[] workorderIds) {
         return toAjax(proOrderWorkorderService.downProOrderWorkorderByWorkorderIds(workorderIds));
     }
+
+    /**
+     * 删除湿料计划
+     */
+    @RequiresPermissions("mes:bppro:workorder:edit")
+    @Log(title = "生产工单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/deleteWetMaterial/{workorderIds}")
+    public AjaxResult deleteWetMaterial(@PathVariable String[] workorderIds) {
+        return toAjax(proOrderWorkorderService.deleteWetMaterial(workorderIds));
+    }
 }
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
index 0d7513d48..ea6059453 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
@@ -203,5 +203,7 @@ public interface ProOrderWorkorderMapper {
     ProOrderWorkorder selectSonOrder(String parentOrder);
 
     List<ProOrderWorkorder> getProductOrders(@Param("orderIds") String[] orderIds);
+
+    int deleteWetMaterial(@Param("orderIds")String[] workorderIds);
 }
 
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java
index b547d0983..5cb09d428 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java
@@ -133,4 +133,6 @@ public interface IProOrderWorkorderService {
     AjaxResult subChangeWorkOrderPro(SplitOrderDTO splitOrderDTO);
 
     List<String> getOrderNotW0(String[] workorderIds);
+
+    int deleteWetMaterial(String[] workorderIds);
 }
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 6ff815b1b..21d1f7451 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -1102,6 +1102,12 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         return proOrderWorkorderMapper.getOrderNotW0(workorderIds);
     }
 
+    @Override
+    @DS("#header.poolName")
+    public int deleteWetMaterial(String[] workorderIds) {
+        return proOrderWorkorderMapper.deleteWetMaterial(workorderIds);
+    }
+
     /**
      * 校验工单是否可以修改
      * 如果工单已生成湿料计划则不允许修改
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index fca2c89cf..b6bb77046 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -505,7 +505,7 @@
         select top 1 material_code materialCode,
                material_name materialName
         from pro_wet_material_plan_detail
-        where workorder_id = #{workorderId} and del_flag = '0'
+        where workorder_id = #{workorderId} order by create_time desc
     </select>
     <select id="getWorkOrderByOrders" resultType="com.op.plan.domain.ProOrderWorkorder">
         select workorder_id workorderId,
@@ -797,4 +797,13 @@
             #{workorder}
         </foreach>
     </delete>
+    <delete id="deleteWetMaterial">
+        update pro_wet_material_plan_detail
+        set del_flag = '1',
+            update_time = GETDATE()
+        where workorder_id in
+        <foreach item="orderId" collection="orderIds" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+    </delete>
 </mapper>
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index 1a7478e8b..a5a48c6af 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -777,7 +777,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 				unqualified.setQczg("660");
 				//申请人-朱继新
 				unqualified.setSqr("660");
-				unqualified.setUser("660");
+				unqualified.setUser("999999");
 				qcCheckUnqualifiedService.updateQcCheckUnqualified(unqualified);
 			}
 		}