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 b7213e955..2472da046 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 @@ -316,7 +316,7 @@ public class ProOrderServiceImpl implements IProOrderService { // 遍历查询工单是否已下达-下达则不允许编辑更新 for (ProOrderWorkorder workOrder : workOrderList) { // 如果工单已经下达 - if (workOrder.getStatus().equals("w1")) { + if (!workOrder.getStatus().equals("w0")) { checkEdit = true; checkOnly = true; } @@ -330,7 +330,7 @@ public class ProOrderServiceImpl implements IProOrderService { // 组装工单已下达反馈信息 if (checkOnly) { - errMsg.append("第" + (i + 1) + "行:" + "订单号为:" + orderList.get(i).getOrderCode() + ",该订单下工单已下达,不允许更新;" + "
"); + errMsg.append("第" + (i + 1) + "行:" + "订单号为:" + orderList.get(i).getOrderCode() + ",该订单下工单已派工,不允许更新;" + "
"); } // 组装已有湿料计划反馈信息 if (checkPlan) { @@ -543,7 +543,7 @@ public class ProOrderServiceImpl implements IProOrderService { // 班次 proOrderWorkorder.setShiftId(shiftId); // TODO 产品类型(pro_type) - // 单据状态(1为已经下达0未下达) + // 单据状态(w0未派w1排队w2活动w3报工) proOrderWorkorder.setStatus("w0"); // 工艺编码 proOrderWorkorder.setRouteCode(routeCode);