diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
index e15dee81..55379f8b 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
@@ -52,7 +52,6 @@
and factory_code = #{factoryCode}
and recoil = #{recoil}
and del_flag = '0'
- and quantity != '.00'
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanMapper.java
index 96c971f2..c3fed144 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanMapper.java
+++ b/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 works);
+
+ void deletePrepareBatch(@Param("works") List workers);
}
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 522729da..9c0d18dc 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/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)) {
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml
index 3b42d449..c23962eb 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanMapper.xml
@@ -204,4 +204,23 @@
#{id}
+
+ update mes_prepare
+ set del_flag = '1'
+ where workorder_code in
+
+ #{workorderCode}
+
+
+
+ update mes_prepare_detail
+ set del_flag = '1'
+ where prepare_id in(
+ select prepare_id from mes_prepare
+ where workorder_code in
+
+ #{workorderCode}
+
+ )
+