From cde82abd673fc4c5249f5a98ea5bc58feb3d1bc0 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 28 Jul 2023 09:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AE=A1=E5=88=92=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86(=E6=9B=B4=E6=94=B9=E8=AE=A2=E5=8D=95=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E7=8A=B6=E6=80=81=E9=80=BB=E8=BE=91)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/mes/mapper/ProOrderWorkorderMapper.java   |  1 +
 .../op/mes/service/impl/ProOrderServiceImpl.java | 10 ++--------
 .../mapper/mes/ProOrderWorkorderMapper.xml       | 16 ++++++++--------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
index 044fe229..2865c1ae 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProOrderWorkorderMapper.java
@@ -1,6 +1,7 @@
 package com.op.mes.mapper;
 
 import com.op.mes.domain.ProOrderWorkorder;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
index 5aa080ae..8f27245f 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
@@ -372,14 +372,8 @@ public class ProOrderServiceImpl implements IProOrderService {
         // 订单表更新时间/更新者
         proOrder.setUpdateBy(SecurityContextHolder.getUserName());
         proOrder.setUpdateTime(date);
-        // 设置订单状态
-        if (proOrder.getQuantitySplit() == null && proOrder.getQuantity() == Long.valueOf(proOrder.getAtrr1())){
-            proOrder.setStatus("o1");
-        }else if (proOrder.getQuantitySplit() != null && (proOrder.getQuantitySplit()+Long.valueOf(proOrder.getAtrr1()) == proOrder.getQuantity())){
-            proOrder.setStatus("o1");
-        }else {
-            proOrder.setStatus("o0");
-        }
+        // 设置订单状态(只要拆了就属于已拆分)
+        proOrder.setStatus("o1");
         // 更新订单表
         proOrderMapper.updateOrder(proOrder);
         // 生成对应的工单表
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderWorkorderMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderWorkorderMapper.xml
index 527da2d4..041596f6 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProOrderWorkorderMapper.xml
@@ -85,14 +85,6 @@
         <include refid="selectProOrderWorkorderVo"/>
         WHERE parent_order = #{workorderCode}
     </select>
-    <select id="selectWorkOrderByTime" resultMap="ProOrderWorkorderResult">
-        <include refid="selectProOrderWorkorderVo"/>
-        WHERE CONVERT(date, product_date) = #{productDate} AND is_end = '1' AND workorder_id NOT IN (
-            SELECT workorder_id
-            FROM pro_wet_material_plan_detail
-            WHERE CONVERT(date, create_time) = #{productDate}
-            )
-    </select>
 
     <select id="selectEndWorkOrder" resultType="java.lang.String">
         select TOP 1 workorder_code
@@ -101,6 +93,14 @@
         ORDER BY workorder_code DESC
     </select>
 
+    <select id="selectWorkOrderByTime" resultMap="ProOrderWorkorderResult">
+        <include refid="selectProOrderWorkorderVo"/>
+        where workorder_id not in (
+            select workorder_id
+            from pro_wet_material_plan_detail
+            where CONVERT(date, plan_time) = #{productDate})
+    </select>
+
     <insert id="insertProOrderWorkorder" parameterType="ProOrderWorkorder">
         insert into pro_order_workorder
         <trim prefix="(" suffix=")" suffixOverrides=",">