bug修复

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml

@@ -52,7 +52,6 @@
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
             <if test="recoil != null and recoil != ''">and recoil = #{recoil}</if>
             and del_flag = '0'
-            and quantity != '.00'
         </where>
     </select>
 

op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanMapper.java

@@ -4,10 +4,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.op.common.core.web.domain.AjaxResult;
-import com.op.plan.domain.BMS;
-import com.op.plan.domain.Bucket;
-import com.op.plan.domain.ProWetMaterialPlan;
-import com.op.plan.domain.Product;
+import com.op.plan.domain.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -138,4 +135,8 @@ public interface ProWetMaterialPlanMapper {
      * @return
      */
     ProWetMaterialPlan selectProWetMaterialPlanByWorkIdN(String workorderId);
+
+    void deletePrepare(@Param("works") List<ProOrderWorkorder> works);
+
+    void deletePrepareBatch(@Param("works") List<ProOrderWorkorder> workers);
 }

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -269,6 +269,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderIds(workorderIds0);
                 //删除批次pro_order_workorder_batch
                 proOrderWorkorderBatchMapper.deleteBatch(workorderIds0);
+//                //删除mes_prepare
+//                proWetMaterialPlanMapper.deletePrepare(workers);
+//                //删除mes_prepare_detail
+//                proWetMaterialPlanMapper.deletePrepareBatch(workers);
             }
 
             if (!CollectionUtils.isEmpty(workers)) {

op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml

@@ -204,4 +204,23 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="deletePrepare">
+        update mes_prepare
+        set del_flag = '1'
+        where workorder_code in
+        <foreach item="work" collection="works" open="(" separator="," close=")">
+            #{workorderCode}
+        </foreach>
+    </delete>
+    <delete id="deletePrepareBatch">
+        update mes_prepare_detail
+        set del_flag = '1'
+        where prepare_id in(
+            select prepare_id from mes_prepare
+            where workorder_code in
+            <foreach item="work" collection="works" open="(" separator="," close=")">
+                #{workorderCode}
+            </foreach>
+        )
+    </delete>
 </mapper>