diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java index 89612ab9..9001d67a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java @@ -127,6 +127,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService { json.put("create_time", now); json.put("sysdeptid", deptId); json.put("syscompanyid", deptId); + json.put("is_out",ObjectUtil.isNotEmpty(json.get("send_date"))?"1":"0"); String planstart_time = json.getString("planstart_time"); Date date = DateUtil.parse(planstart_time); int days = this.getDays(json.getString("material_id")); @@ -169,6 +170,7 @@ public class WorkOrderServiceImpl implements WorkOrdereService { if (StrUtil.isEmpty(product_series_id)) { throw new BadRequestException("工令对应产品系列不能为空!"); } + whereJson.put("is_out",ObjectUtil.isNotEmpty(whereJson.get("send_date"))?"1":"0"); whereJson.put("update_optid", currentUserId); whereJson.put("update_optname", nickName); whereJson.put("update_time", now); diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue b/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue index 8776fc6b..ce40a991 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue @@ -106,11 +106,11 @@ :value="item.id" /> - - - - - + + + + + diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue index 281e2b13..ab65b86f 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue @@ -277,6 +277,13 @@ + + + +