From e181a4a6e7be9479faae9a2439ad8e72bdef7070 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 21 Mar 2023 19:26:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E7=BB=B4=E6=8A=A4=E3=80=81?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86=E3=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E7=82=B9=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E7=AD=89bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8E=E6=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WorkProcedureServiceImpl.java | 12 +- .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 233984 -> 234496 bytes .../impl/ProduceWorkorderServiceImpl.java | 2 + .../nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql | 4 + .../pdm/service/impl/DeviceServiceImpl.java | 2 +- .../org/nl/wms/sch/manage/TaskStatusEnum.java | 14 +- .../sch/service/impl/PointServiceImpl.java | 17 +-- .../sch/service/impl/RegionServiceImpl.java | 2 + .../wms/sch/service/impl/TaskServiceImpl.java | 1 + .../org/nl/wms/sch/wql/QSCH_BASE_POINT.wql | 4 + .../org/nl/wms/sch/wql/QSCH_REGION_01.wql | 12 +- .../java/org/nl/wms/sch/wql/QSCH_TASK_01.wql | 10 +- .../src/main/java/org/nl/wms/sch/wql/sch.xls | Bin 179200 -> 179712 bytes .../wms/basedata/pdm/workProcedure/index.vue | 2 +- mes/qd/src/views/wms/mps/produce/index.vue | 74 +++++++--- mes/qd/src/views/wms/sch/point/index.vue | 135 ++++++------------ mes/qd/src/views/wms/sch/region/index.vue | 71 +++++++-- mes/qd/src/views/wms/sch/task/index.vue | 32 ++++- 18 files changed, 220 insertions(+), 174 deletions(-) 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 322c3c563525616407ef80ec157e9e1ed7930332..79fb8b7d5a84847425aa63a0521832fcf3243ec2 100644 GIT binary patch delta 4695 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 OAX=)SH|D@*TH!w_gK(Vy delta 4589 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 "" 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 f4d14c9a8b614543fe401e6e66ae9ef1be2f20b2..de3d3cc4ba5c2d65c7e11c8ca07d24ad8064db76 100644 GIT binary patch delta 12967 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 delta 12814 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 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" > - + - - + +