订单计划管理(更改订单拆分状态逻辑)

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;

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);
         // 生成对应的工单表

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=",">