From ac9b5a8835b23f83f99322625a08ecdca6a37ab8 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 22 Nov 2022 20:01:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HandNewMaterialServiceImpl.java | 2 +- .../impl/StoragevehicleinfoServiceImpl.java | 2 + .../impl/ProducetaskprocServiceImpl.java | 16 ++++++ .../nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql | 2 +- .../nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql | 4 ++ .../org/nl/wms/sch/rest/TaskController.java | 2 +- .../wms/sch/service/impl/TaskServiceImpl.java | 38 +++++++++++--- .../java/org/nl/wms/sch/wql/QSCH_TASK_01.wql | 46 +++++++++++------ .../wms/pdm/produce/mouthtask/AddDialog.vue | 10 ++-- mes/qd/src/views/wms/sch/task/index.vue | 49 ++++++++++++------- 10 files changed, 123 insertions(+), 48 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java index dde09097..6619b630 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java @@ -347,7 +347,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { } JSONObject jo_now = WQL.getWO("QPADST_IN_SERVICE").addParam("flag", "11").addParam("storagevehicle_code", storagevehicle_code).process().uniqueResult(0); if(jo_now!=null){ - throw new PdaRequestException("该载具"+storagevehicle_code+"已存在未完成的入库单！"); + throw new PdaRequestException("该载具"+storagevehicle_code+"已存在未完成的出入库单！"); } JSONObject mst_jo = new JSONObject(); String bill_code = CodeUtil.getNewCode("IO_CODE"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java index 237fbec4..7aa79f3f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java @@ -94,6 +94,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService String now = DateUtil.now(); String storagevehicle_type = (String) map.get("storagevehicle_type"); + String is_used = (String) map.get("is_used"); String code = ""; switch (storagevehicle_type) { case "10": @@ -128,6 +129,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService dto.setUpdate_optname(nickName); dto.setUpdate_time(now); dto.setCreate_time(now); + dto.setIs_used(is_used); dto.setStoragevehicle_type((String) map.get("storagevehicle_type")); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.insert(json); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java index 0b0d4884..29d5afc1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java @@ -288,6 +288,20 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService { dto.setUpdate_time(DateUtil.now()); dto.setRemark(remark); if(StrUtil.isNotEmpty(device_code) && !"null".equals(device_code)){ + + JSONObject jsonMater2 = MD_ME_ProducMaterialExt.query("material_id = '" + jsonMater.getString("material_id") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonMater2)) { + throw new BadRequestException("此【" + material_code + "】物料未配置成品物料扩展信息"); + } + String product_series = jsonMater2.getString("product_series"); + if(StrUtil.isNotEmpty(product_series)){ + JSONObject device = WQL.getWO("QPDM_PRODUCTPLANPROC").addParam("flag", "33").addParam("product_series", product_series).addParam("device_code", device_code).process().uniqueResult(0); + if(device==null){ + throw new BadRequestException("此【" + material_code + "】物料系列排产设备不包含"+device_code); + } + }else{ + throw new BadRequestException("此【" + material_code + "】物料未配置产品系列属性"); + } JSONObject device = em_bi_deviceinfo.query("is_delete='0' and is_active='1' and device_code='"+device_code+"'").uniqueResult(0); if(device!=null){ dto.setDevice_id(device.getLong("device_id")); @@ -303,6 +317,8 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService { if(device!=null){ dto.setDevice_id(device.getLong("id")); } + }else{ + throw new BadRequestException("此【" + material_code + "】物料未配置产品系列属性"); } } dto.setTask_code(CodeUtil.getNewCode("PCS_TASK_CODE")); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql index c3308ac0..ed90efa6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql @@ -94,7 +94,7 @@ OPTION 输入.device_id <> "" pp.device_id = 输入.device_id ENDOPTION - order by pp.planstart_date,pp.plan_code + order by pp.planend_date,materialbase.material_code ENDSELECT ENDQUERY ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql index 2786304c..1c60dabf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTPLANPROC.wql @@ -17,6 +17,7 @@ 输入.product_type_name TYPEAS s_string 输入.plan_month TYPEAS s_string 输入.material_code TYPEAS s_string + 输入.device_code TYPEAS s_string 输入.task_code TYPEAS s_string 输入.is_proc TYPEAS s_string 输入.plan_org_code TYPEAS s_string @@ -172,6 +173,9 @@ OPTION 输入.product_series <> "" WorkDevice.product_series_id = 输入.product_series ENDOPTION + OPTION 输入.device_code <> "" + deviceinfo.device_code = 输入.device_code + ENDOPTION order by deviceinfo.device_code asc ENDSELECT ENDQUERY diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java index aa0f2955..56d0e24b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/TaskController.java @@ -87,7 +87,7 @@ public class TaskController { } //增加未完成状态 JSONObject unFinish = new JSONObject(); - unFinish.put("code", "-1"); + unFinish.put("code", "11"); unFinish.put("name", "未完成"); arr.add(unFinish); return new ResponseEntity<>(arr, HttpStatus.OK); 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 c94a6709..9118bd8a 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 @@ -28,6 +28,7 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author ldjun @@ -47,16 +48,29 @@ public class TaskServiceImpl implements TaskService { JSONObject whereJson = JSONObject.parseObject(JSON.toJSONString(form)); + String task_status_old = whereJson.getString("task_status"); String task_status = whereJson.getString("task_status"); - if (StrUtil.isNotEmpty(task_status)) { - task_status = task_status.replace("[\"", "").replace("\"]", "").replace("\"", ""); + + String task_status_new = ""; + if (StrUtil.isNotEmpty(task_status) && !"null".equals(task_status)) { + task_status = task_status.replace("11","01,02,03"); + String[] strs = task_status.split(","); + for( int i=0;i ((JSONObject) o).getString("taskdtl_id")).collect(Collectors.joining("\",\""))+"\")"; + map.put("flag", "2"); + map.put("materialIds", allmaterialId); + JSONArray currentArray = WQL.getWO("QSCH_TASK_01").addParamMap(map).process().getResultJSONArray(0); + json.put("content",currentArray); + } return json; } 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 055a0118..aaeb4fa7 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,7 +14,7 @@ ## 表字段对应输入参数 ################################################# 输入.flag TYPEAS s_string - 输入.task_status TYPEAS s_string + 输入.task_status TYPEAS f_string 输入.finished_type TYPEAS s_string 输入.task_type TYPEAS s_string 输入.start_point_code TYPEAS s_string @@ -25,6 +25,7 @@ 输入.end_time TYPEAS s_string 输入.unFinish TYPEAS s_string 输入.taskdtl_type TYPEAS s_string + 输入.materialIds TYPEAS f_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -51,21 +52,9 @@ IF 输入.flag = "1" PAGEQUERY SELECT - task.*, - p1.point_name AS start_point_name, - d1.label AS start_area_name, - p2.point_name AS next_point_name, - d2.label AS next_area_name, - d3.label AS task_type_name, - d4.label AS taskdtl_type_name + task.taskdtl_id FROM sch_base_task task - LEFT JOIN sch_base_point p1 ON task.start_point_code = p1.point_code - LEFT JOIN sys_dict_detail d1 ON d1.`value` = p1.area_type AND d1.`name` = 'sch_area_type' - LEFT JOIN sch_base_point p2 ON task.next_point_code = p2.point_code - LEFT JOIN sys_dict_detail d2 ON d2.`value` = p2.area_type AND d2.`name` = 'sch_area_type' - LEFT JOIN sys_dict_detail d3 ON d3.`value` = task.task_type AND d3.`name` = 'SCH_TASK_TYPE' - LEFT JOIN sys_dict_detail d4 ON d4.`value` = task.taskdtl_type AND d4.`name` = 'SCH_TASK_TYPE_DTL' WHERE task.is_delete = '0' OPTION 输入.task_type <> "" @@ -87,7 +76,7 @@ task.task_status <> '99' ENDOPTION OPTION 输入.task_status <> "" - find_in_set( task.task_status, 输入.task_status) + task.task_status in 输入.task_status ENDOPTION OPTION 输入.vehicle_code <> "" (task.vehicle_code like 输入.vehicle_code) @@ -110,3 +99,30 @@ ENDSELECT ENDPAGEQUERY ENDIF + + IF 输入.flag = "2" + QUERY + SELECT + task.*, + p1.point_name AS start_point_name, + d1.label AS start_area_name, + p2.point_name AS next_point_name, + d2.label AS next_area_name, + d3.label AS task_type_name, + d4.label AS taskdtl_type_name + FROM + sch_base_task task + LEFT JOIN sch_base_point p1 ON task.start_point_code = p1.point_code + LEFT JOIN sys_dict_detail d1 ON d1.`value` = p1.area_type AND d1.`name` = 'sch_area_type' + LEFT JOIN sch_base_point p2 ON task.next_point_code = p2.point_code + LEFT JOIN sys_dict_detail d2 ON d2.`value` = p2.area_type AND d2.`name` = 'sch_area_type' + LEFT JOIN sys_dict_detail d3 ON d3.`value` = task.task_type AND d3.`name` = 'SCH_TASK_TYPE' + LEFT JOIN sys_dict_detail d4 ON d4.`value` = task.taskdtl_type AND d4.`name` = 'SCH_TASK_TYPE_DTL' + WHERE + task.is_delete = '0' + OPTION 输入.materialIds <> "" + task.taskdtl_id in 输入.materialIds + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF diff --git a/mes/qd/src/views/wms/pdm/produce/mouthtask/AddDialog.vue b/mes/qd/src/views/wms/pdm/produce/mouthtask/AddDialog.vue index e91c8818..3d911a90 100644 --- a/mes/qd/src/views/wms/pdm/produce/mouthtask/AddDialog.vue +++ b/mes/qd/src/views/wms/pdm/produce/mouthtask/AddDialog.vue @@ -4,6 +4,7 @@ :visible.sync="dialogVisible" :show-close="false" @close="close" + @open="open" >
@@ -173,11 +174,13 @@ export default { workorder.getDepts().then(res => { this.Depts = res }) - producetask.getDevices().then(res => { - this.Devices = res - }) }, methods: { + open() { + producetask.getDevices({ product_series_id: this.form.product_series}).then(res => { + this.Devices = res + }) + }, close() { this.$emit('update:dialogShow', false) this.form = {} @@ -185,7 +188,6 @@ export default { }, submit() { producetask.submit3(this.form).then(res => { - debugger this.$emit('update:dialogShow', false) this.form = {} this.$emit('AddChanged') diff --git a/mes/qd/src/views/wms/sch/task/index.vue b/mes/qd/src/views/wms/sch/task/index.vue index 76d9c253..b79067a8 100644 --- a/mes/qd/src/views/wms/sch/task/index.vue +++ b/mes/qd/src/views/wms/sch/task/index.vue @@ -50,8 +50,8 @@ - - + - - - + - + - + 完成 - - - - @@ -238,7 +229,7 @@ export default { sort: 'taskdtl_id,desc', crudMethod: { ...crudTask }, query: { - task_code:'',vehicle_code:'',start_point_code:'',next_point_code:'',task_type:'',taskdtl_type:'',finished_type:'',task_status:"" + task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', taskdtl_type: '', finished_type: '', task_status: '', status:'' }, optShow: { add: false, @@ -257,9 +248,11 @@ export default { currentComponent: '', openParam: {}, create_time: [], + task_status: [], taskStatusList: [], taskTypeList: [], finishTypeList: [], + flag1: true, permission: { }, @@ -276,16 +269,34 @@ export default { crudTask.getFinishType().then(data => { this.finishTypeList = data }) - this.crud.query.task_status = ['-1'] + this.crud.query.status = ['11'] + this.crud.query.task_status = '11' this.crud.toQuery() }, methods: { + [CRUD.HOOK.beforeRefresh]() { + if (this.flag1) { + this.crud.query.status = ['11'] + this.crud.query.task_status = '11' + this.flag1 = false + } + }, hand(value) { this.crud.toQuery() }, handTaskStatus(value) { + var str1 = '' if (value) { - this.query.task_status = this.task_status.toString() + for (const item of value) { + if (str1 === '') { + str1 = item + } else { + str1 = str1 + ',' + item + } + } + this.query.task_status = str1 + } else { + this.query.task_status = '' } this.crud.toQuery() },