diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java index 02468a51..94e5102f 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java @@ -102,4 +102,11 @@ public interface ProWetMaterialPlanDetailMapper { * @param workorderId */ void deleteProWetMaterialPlanDetailByWorkId(String workorderId); + + /** + * 通过湿料详情信息wetMaterialPlanId查询湿料主计划 + * @param wetMaterialPlanId + * @return + */ + ProWetMaterialPlan selectProWetMaterialPlanById(String wetMaterialPlanId); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index c653477f..f19bdd3c 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -417,32 +417,21 @@ public class ProOrderServiceImpl implements IProOrderService { for (int i = 0; i < orderList.size(); i++) { // 当前行操作 boolean checkOnly = false; - boolean checkPlan = false; List workOrderList = proOrderWorkorderMapper.selectWorkOrderByOrderCode(orderList.get(i).getOrderCode()); // 遍历查询工单是否已下达-下达则不允许编辑更新 for (ProOrderWorkorder workOrder : workOrderList) { - // 如果工单已经下达 - if (!workOrder.getStatus().equals("w0")) { + // 如果工单已生产 + if (!(workOrder.getStatus().equals("w0") || workOrder.getStatus().equals("w1"))) { checkEdit = true; checkOnly = true; } - // 如果工单已有湿料计划 - ProWetMaterialPlanDetail detail = proWetMaterialPlanDetailMapper.selectProWetMaterialPlanDetailByWorkId(workOrder.getWorkorderId()); - if (detail != null){ - checkEdit = true; - checkPlan = true; - } } // 组装工单已下达反馈信息 if (checkOnly) { - errMsg.append("第" + (i + 1) + "行:" + "订单号为:" + orderList.get(i).getOrderCode() + ",该订单下工单已派工,不允许更新;" + "
"); - } - // 组装已有湿料计划反馈信息 - if (checkPlan) { - errMsg.append("第" + (i + 1) + "行:" + "订单号为:" + orderList.get(i).getOrderCode() + ",该订单下工单已有湿料计划,不允许更新;" + "
"); + errMsg.append("第" + (i + 1) + "行:" + "订单号为:" + orderList.get(i).getOrderCode() + ",该订单下工单已生产,不允许更新;" + "
"); } } diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml index 55bdf74b..aa9ec214 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml @@ -109,6 +109,13 @@ where workorder_id = #{id} + + insert into pro_wet_material_plan_detail