From 2d6950544f1a25bb8fff9650f9425dd8ab0ae610 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 12 Sep 2023 13:55:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97(=E6=88=90?=
 =?UTF-8?q?=E5=93=81=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=85=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ProWetMaterialPlanDetailMapper.java  |  7 +++++++
 .../plan/service/impl/ProOrderServiceImpl.java  | 17 +++--------------
 .../plan/ProWetMaterialPlanDetailMapper.xml     |  7 +++++++
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java
index 02468a51..94e5102f 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java
@@ -102,4 +102,11 @@ public interface ProWetMaterialPlanDetailMapper {
      * @param workorderId
      */
     void deleteProWetMaterialPlanDetailByWorkId(String workorderId);
+
+    /**
+     * 通过湿料详情信息wetMaterialPlanId查询湿料主计划
+     * @param wetMaterialPlanId
+     * @return
+     */
+    ProWetMaterialPlan selectProWetMaterialPlanById(String wetMaterialPlanId);
 }
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
index c653477f..f19bdd3c 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
@@ -417,32 +417,21 @@ public class ProOrderServiceImpl implements IProOrderService {
             for (int i = 0; i < orderList.size(); i++) {
                 // 当前行操作
                 boolean checkOnly = false;
-                boolean checkPlan = false;
 
                 List<ProOrderWorkorder> workOrderList = proOrderWorkorderMapper.selectWorkOrderByOrderCode(orderList.get(i).getOrderCode());
 
                 // 遍历查询工单是否已下达-下达则不允许编辑更新
                 for (ProOrderWorkorder workOrder : workOrderList) {
-                    // 如果工单已经下达
-                    if (!workOrder.getStatus().equals("w0")) {
+                    // 如果工单已生产
+                    if (!(workOrder.getStatus().equals("w0") || workOrder.getStatus().equals("w1"))) {
                         checkEdit = true;
                         checkOnly = true;
                     }
-                    // 如果工单已有湿料计划
-                    ProWetMaterialPlanDetail detail = proWetMaterialPlanDetailMapper.selectProWetMaterialPlanDetailByWorkId(workOrder.getWorkorderId());
-                    if (detail != null){
-                        checkEdit = true;
-                        checkPlan = true;
-                    }
                 }
 
                 // 组装工单已下达反馈信息
                 if (checkOnly) {
-                    errMsg.append("第" + (i + 1) + "行:" + "订单号为:" + orderList.get(i).getOrderCode() + ",该订单下工单已派工,不允许更新;" + "<br/>");
-                }
-                // 组装已有湿料计划反馈信息
-                if (checkPlan) {
-                    errMsg.append("第" + (i + 1) + "行:" + "订单号为:" + orderList.get(i).getOrderCode() + ",该订单下工单已有湿料计划，不允许更新;" + "<br/>");
+                    errMsg.append("第" + (i + 1) + "行:" + "订单号为:" + orderList.get(i).getOrderCode() + ",该订单下工单已生产,不允许更新;" + "<br/>");
                 }
             }
 
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml
index 55bdf74b..aa9ec214 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml
@@ -109,6 +109,13 @@
         where workorder_id = #{id}
     </select>
 
+    <select id="selectProWetMaterialPlanById" resultType="com.op.plan.domain.ProWetMaterialPlan">
+        select id, factory_code, plan_time, sync_flag, create_by, create_time, update_by, update_time,
+               order_type, prod_code, prod_desc, prod_source, quantity, unit, atrr1, atrr2, atrr3, status,
+               prod_type, plan_code, shift_id, shift_desc from pro_wet_material_plan
+        where wet_material_plan_id = #{wetMaterialPlanId}
+    </select>
+
     <insert id="insertProWetMaterialPlanDetail" parameterType="ProWetMaterialPlanDetail">
         insert into pro_wet_material_plan_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">