diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureServiceImpl.java index 46b5002d..941b85a5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WorkProcedureServiceImpl.java @@ -136,19 +136,9 @@ public class WorkProcedureServiceImpl implements WorkProcedureService { @Override @Transactional(rollbackFor = Exception.class) public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - WQLObject wo = WQLObject.getWQLObject("pdm_bi_workProcedure"); for (Long workProcedure_id : ids) { - JSONObject param = new JSONObject(); - param.put("workprocedure_id", String.valueOf(workProcedure_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", DateUtil.now()); - wo.delete(param); + wo.delete("workProcedure_id = '" + workProcedure_id + "'"); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index 322c3c56..79fb8b7d 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java index c66093ae..3a7df4d0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java @@ -68,6 +68,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { String parent_id = MapUtil.getStr(whereJson, "product_series"); String sale_id = MapUtil.getStr(whereJson, "sale_id"); String is_error = MapUtil.getStr(whereJson, "is_error"); + String product_area = MapUtil.getStr(whereJson, "product_area"); String product_series = ""; JSONObject map = new JSONObject(); map.put("flag", "1"); @@ -75,6 +76,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService { map.put("shift_type_scode", shift_type_scode); map.put("begin_time", begin_time); map.put("end_time", end_time); + map.put("product_area", product_area); if (StrUtil.isNotEmpty(order_status)) { order_status = order_status.replace("[\"", "").replace("\"]", "").replace("\"", ""); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql index 3b06dc29..0f72af8a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql @@ -20,6 +20,7 @@ 输入.workprocedure_code TYPEAS s_string 输入.order_status TYPEAS s_string 输入.shift_type_scode TYPEAS s_string + 输入.product_area TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string 输入.produceorder_code TYPEAS s_string @@ -83,6 +84,9 @@ OPTION 输入.is_error <> "" ShiftOrder.is_error = 输入.is_error ENDOPTION + OPTION 输入.product_area <> "" + ShiftOrder.product_area = 输入.product_area + ENDOPTION OPTION 输入.product_series <> "" material.product_series in 输入.product_series ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java index 5e12f3f4..6cb25761 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java @@ -140,7 +140,7 @@ public class DeviceServiceImpl implements DeviceService { @Override public JSONArray getWorkprocedure() { WQLObject wo = WQLObject.getWQLObject("pdm_bi_workprocedure"); - final JSONArray resultJSONArray = wo.query("is_delete = '0'").getResultJSONArray(0); + final JSONArray resultJSONArray = wo.query("is_used = '0'").getResultJSONArray(0); return resultJSONArray; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskStatusEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskStatusEnum.java index a432fa1b..110167b9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskStatusEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskStatusEnum.java @@ -4,13 +4,13 @@ package org.nl.wms.sch.manage; * Task状态:00生成 ,01：下发，02、执行中，03、完成 */ public enum TaskStatusEnum { - CREATED("01", "生成"), - SURE_START("02", "确定起点"), - SURE_END("03", "确定终点"), - START_AND_POINT("04", "起点终点确认"), - ISSUE("05", "下发"), - EXECUTING("06", "执行中"), - FINISHED("07", "完成"); + CREATED("1", "生成"), + SURE_START("2", "确定起点"), + SURE_END("3", "确定终点"), + START_AND_POINT("4", "起点终点确认"), + ISSUE("5", "下发"), + EXECUTING("6", "执行中"), + FINISHED("7", "完成"); private String name; private String code; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 205ff642..c47de2c5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -55,14 +55,12 @@ public class PointServiceImpl implements PointService { map.put("col_num", whereJson.get("col_num")); map.put("layer_num", whereJson.get("layer_num")); map.put("name", whereJson.get("name")); + map.put("product_area", whereJson.get("product_area")); JSONObject json = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc"); JSONArray content = json.getJSONArray("content"); JSONArray res = new JSONArray(); for (int i = 0; i < content.size(); i++) { JSONObject object = content.getJSONObject(i); - // 可以存放的载具类型 - String[] can_vehicle_types = object.getString("can_vehicle_type").split(","); - object.put("can_vehicle_types", can_vehicle_types); String region_code = object.getString("region_code"); String point_status = object.getString("point_status"); String point_type = object.getString("point_type"); @@ -133,14 +131,8 @@ public class PointServiceImpl implements PointService { if (ObjectUtil.isNotEmpty(byCode)) { throw new BadRequestException("存在相同的点位编码"); } - - String can_vehicle_type = String.join(",", dto.getCan_vehicle_types()); - dto.setCan_vehicle_type(can_vehicle_type); - String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); - - dto.setPoint_id(IdUtil.getSnowflake(1, 1).nextIdStr()); dto.setCreate_id(currentUserId); dto.setCreate_name(nickName); @@ -168,9 +160,6 @@ public class PointServiceImpl implements PointService { String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); - String can_vehicle_type = String.join(",", dto.getCan_vehicle_types()); - dto.setCan_vehicle_type(can_vehicle_type); - String now = DateUtil.now(); dto.setUpdate_time(now); dto.setUpdate_id(currentUserId); @@ -182,9 +171,9 @@ public class PointServiceImpl implements PointService { dto.setVehicle_type(""); dto.setVehicle_code(""); dto.setVehicle_qty(0); - } else if (pointStatus.equals("2")) { // 空载具 + } else if (pointStatus.equals("3")) { // 空载具 dto.setMaterial_id(null); - } else if (pointStatus.equals("3")) { // 有料 + } else if (pointStatus.equals("2")) { // 有料 if (ObjectUtil.isEmpty(dto.getMaterial_id())) throw new BadRequestException("物料不能为空"); JSONObject materialObj = materialBaseTab.query("material_id = '" + dto.getMaterial_id() + "'").uniqueResult(0); if (ObjectUtil.isEmpty(materialObj)) throw new BadRequestException("未找到该物料"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java index 1602e268..895f894c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java @@ -36,10 +36,12 @@ public class RegionServiceImpl implements RegionService { @Override public Map queryAll(Map whereJson, Pageable page) { String region_code = MapUtil.getStr(whereJson, "region_code"); + String product_area = MapUtil.getStr(whereJson, "product_area"); HashMap map = new HashMap<>(); map.put("flag", "1"); if (ObjectUtil.isNotEmpty(region_code)) map.put("region_code","%" + region_code + "%"); + if (ObjectUtil.isNotEmpty(product_area)) map.put("product_area", product_area); JSONObject json = WQL.getWO("QSCH_REGION_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "region.region_code ASC"); return json; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index 694bebc7..1132339f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -51,6 +51,7 @@ public class TaskServiceImpl implements TaskService { JSONObject whereJson = JSONObject.parseObject(JSON.toJSONString(form)); String task_status = whereJson.getString("task_status"); + map.put("product_area", whereJson.getString("product_area")); if (StrUtil.isNotEmpty(task_status)) { task_status = task_status.replace("[\"", "").replace("\"]", "").replace("\"", ""); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql index ac375e59..a2ad0661 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql @@ -19,6 +19,7 @@ 输入.name TYPEAS s_string 输入.point_type TYPEAS s_string 输入.point_status TYPEAS s_string + 输入.product_area TYPEAS s_string 输入.block_num TYPEAS s_string 输入.row_num TYPEAS s_string 输入.col_num TYPEAS s_string @@ -78,6 +79,9 @@ OPTION 输入.lock_type <> "" point.lock_type = 输入.lock_type ENDOPTION + OPTION 输入.product_area <> "" + point.product_area = 输入.product_area + ENDOPTION OPTION 输入.point_status <> "" point.point_status = 输入.point_status ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_REGION_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_REGION_01.wql index 9bb640f3..523cf075 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_REGION_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_REGION_01.wql @@ -15,6 +15,7 @@ ################################################# 输入.flag TYPEAS s_string 输入.region_code TYPEAS s_string + 输入.product_area TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -46,12 +47,13 @@ SCH_BASE_Region region WHERE 1=1 - - OPTION 输入.region_code <> "" - (region.region_code like 输入.region_code or - region.region_name like 输入.region_code) + OPTION 输入.product_area <> "" + region.product_area = 输入.product_area + ENDOPTION + OPTION 输入.region_code <> "" + (region.region_code like 输入.region_code or + region.region_name like 输入.region_code) ENDOPTION - ENDSELECT ENDPAGEQUERY ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql index 200110c9..8938c9ab 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_TASK_01.wql @@ -14,12 +14,13 @@ ## 表字段对应输入参数 ################################################# 输入.flag TYPEAS s_string - 输入.task_status TYPEAS s_string + 输入.task_status TYPEAS s_string 输入.finished_type TYPEAS s_string 输入.task_type TYPEAS s_string - 输入.point_code1 TYPEAS s_string + 输入.point_code1 TYPEAS s_string 输入.point_code2 TYPEAS s_string 输入.task_code TYPEAS s_string + 输入.product_area TYPEAS s_string 输入.vehicle_code TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string @@ -76,7 +77,7 @@ WHERE task.is_delete = '0' OPTION 输入.task_type <> "" - task.task_type = 输入.task_type + task.task_type = ( select md2.class_code from md_pb_classstandard md2 where md2.class_id = 输入.task_type ) ENDOPTION OPTION 输入.finished_type <> "" task.finished_type = 输入.finished_type @@ -87,6 +88,9 @@ OPTION 输入.end_time <> "" task.create_time <= 输入.end_time ENDOPTION + OPTION 输入.product_area <> "" + task.product_area = 输入.product_area + ENDOPTION OPTION 输入.unFinish <> "" task.task_status <> '7' ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index f4d14c9a..de3d3cc4 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ diff --git a/mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue b/mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue index 81d7d74b..e1bb2274 100644 --- a/mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue +++ b/mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue @@ -190,7 +190,7 @@ import pagination from '@crud/Pagination' const defaultForm = { workprocedure_id: null, - product_area: null, + product_area: 'A1', workprocedure_code: null, workprocedure_name: null, worksection_type_scode: null, diff --git a/mes/qd/src/views/wms/mps/produce/index.vue b/mes/qd/src/views/wms/mps/produce/index.vue index cb6f743a..3493eb6f 100644 --- a/mes/qd/src/views/wms/mps/produce/index.vue +++ b/mes/qd/src/views/wms/mps/produce/index.vue @@ -10,6 +10,23 @@ label-width="90px" label-suffix=":" > + + + + + + + + + + {{ scope.row.workorder_code }} - + @@ -334,16 +365,16 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -364,17 +395,17 @@ {{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }} - + - + - + - - + + - + @@ -459,7 +423,7 @@ const defaultForm = { point_id: null, point_code: null, point_name: null, - product_area: null, + product_area: 'A1', region_code: null, pre_region_code: null, next_region_code: null, @@ -469,8 +433,6 @@ const defaultForm = { material_id: null, material_code: null, device_code: null, - can_vehicle_type: null, - can_vehicle_types: null, vehicle_max_qty: null, vehicle_type: null, vehicle_code: null, @@ -499,7 +461,7 @@ const defaultForm = { } export default { name: 'Point', - dicts: ['storagevehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'point_location'], + dicts: ['storagevehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'point_location', 'product_area'], components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation, ViewDialog }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { @@ -514,7 +476,10 @@ export default { download: false, reset: true }, - crudMethod: { ...crudPoint } + crudMethod: { ...crudPoint }, + query: { + product_area: 'A1' + } }) }, @@ -546,19 +511,9 @@ export default { region_code: [ { required: true, message: '区域类型不能为空', trigger: 'blur' } ], - pre_region_code: [ - { required: true, message: '上一区域类型不能为空', trigger: 'blur' } - ], - next_region_code: [ - { required: true, message: '下一区域类型不能为空', trigger: 'blur' } - ], lock_type: [ { required: true, message: '锁定类型不能为空', trigger: 'blur' } - ], - can_vehicle_types: [ - { required: true, message: '载具存放类型不能为空', trigger: 'blur' } ] - } } }, diff --git a/mes/qd/src/views/wms/sch/region/index.vue b/mes/qd/src/views/wms/sch/region/index.vue index 12ce9f32..c84b72a2 100644 --- a/mes/qd/src/views/wms/sch/region/index.vue +++ b/mes/qd/src/views/wms/sch/region/index.vue @@ -3,17 +3,41 @@
- - - - + + + + + + + + + + +
@@ -26,6 +50,20 @@ width="550px" > + + + + + @@ -56,13 +94,13 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - + - - + +