生产管理修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml

@@ -107,6 +107,28 @@
         </where>
         ORDER BY MTN_CODE DESC) WHERE ROWNUM = 1
     </select>
+    <select id="getTcDataByWoId" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
+        SELECT * FROM (SELECT a.*
+        FROM MES_MAC_TOOL_USE a
+                 INNER JOIN mes_work_plan wp ON a.wp_id = wp.id
+                 INNER JOIN mes_work_order wo ON wp.wo_id = wo.id
+                 INNER JOIN BS_PROCESS_SET ps ON wp.pps_id = ps.id
+                 LEFT JOIN BS_CRAFT_ABILITY ca ON wp.ca_id = ca.id
+        WHERE
+            wo.id = #{woId}
+          AND (
+            (ps.name = '清洗' AND ca.ca_name = '喷漆')
+                OR
+            (ps.name = '局部防护' AND ca.ca_name = '喷漆')
+                OR
+            ps.name = '玻璃封接电镀上挂'
+                OR
+            ps.name = '光亮腐蚀'
+                OR
+            (ps.name = '上挂' AND ca.ca_name != '喷漆')
+            )
+        ORDER BY a.create_time DESC) WHERE ROWNUM = 1
+    </select>
 
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -232,6 +232,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         oldWo.setMakeQty(oldWo.getMakeQty() - newWo.getMakeQty());
 
         this.addWorkOrder(newWo);
+        this.updateById(oldWo);
         return newWo;
     }