diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/AUTO_QUERYTASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/AUTO_QUERYTASK.wql index b667a46..616375a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/AUTO_QUERYTASK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/AUTO_QUERYTASK.wql @@ -48,7 +48,7 @@ SCH_BASE_Task task WHERE task.is_delete = '0' - AND task.task_status = '01' + AND task.task_status = '1' AND task.point_code1 in ('YQX01_WX','YQX02_WX') ENDSELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java index 7be5d6d..2efb31c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java @@ -121,7 +121,7 @@ public class WorkorderServiceImpl implements WorkordeService { String newCode = CodeUtil.getNewCode("PDM_SHIFTORDER"); dto.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextId()); dto.setWorkorder_code(newCode); - dto.setOrder_status("00"); + dto.setOrder_status("1"); dto.setCreate_id(currentUserId); dto.setCreate_time(now); dto.setCreate_name(nickName); @@ -386,7 +386,7 @@ public class WorkorderServiceImpl implements WorkordeService { WQLObject wo = WQLObject.getWQLObject("PDM_BD_WORKORDER"); JSONObject produceorderMap = new JSONObject(); produceorderMap.put("workorder_id",workorder_id); - produceorderMap.put("order_status","04"); + produceorderMap.put("order_status","5"); produceorderMap.put("update_optid", currentUserId); produceorderMap.put("device_id", null); produceorderMap.put("update_optname", nickName); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql index 51de45c..adeff47 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql @@ -74,7 +74,7 @@ ShiftOrder.order_type_scode = 输入.order_type_scode ENDOPTION OPTION 输入.unFinish <> "" - ShiftOrder.order_status <> '04' + ShiftOrder.order_status <> '5' ENDOPTION OPTION 输入.order_status <> "" find_in_set( ShiftOrder.order_status, 输入.order_status) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java index 32f0cd3..5e353c1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java @@ -123,7 +123,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { JSONObject dpjPoint1 = pointTab.query("is_delete='0' and region_code='DPJQB01' and can_vehicle_type like '%" + vehicle_type + "%'").uniqueResult(0); //叠盘架无载具:1-判断是否有在执行中的堆叠任务，有则等堆叠任务完成以后再去，否则去去缓存位和养生A区找 - JSONObject ddTask = taskTab.query("is_delete='0' and point_code2 = '" + dpjPoint1.getString("point_code") + "'").uniqueResult(0); + JSONObject ddTask = taskTab.query("is_delete='0' and point_code2 = '" + dpjPoint1.getString("point_code") + "'" + " and task_status <> '7' ").uniqueResult(0); if (ObjectUtil.isNotEmpty(ddTask)) continue; //去缓存位和养生A区找,生成到叠盘架的任务 diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index edddf3d..652cd87 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -341,9 +341,9 @@ const defaultForm = { planproduceend_date: null, realproducestart_date: null, realproduceend_date: null, - order_status: '00', + order_status: '1', is_needmove: '1', - order_type_scode: '01', + order_type_scode: '1', create_id: null, create_name: null, create_time: null, diff --git a/lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue b/lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue index c7d5b5d..9970300 100644 --- a/lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue +++ b/lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue @@ -153,6 +153,10 @@ export default { url: 'api/regionio', idField: 'qty_unit_id', sort: 'qty_unit_id,desc', + query: { + io_type: '1', + io_region: "'CPQYA01'" + }, crudMethod: { ...crudBill } }) }, @@ -175,8 +179,6 @@ export default { methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { - this.query.io_type = '1' - this.query.io_region = "'CPQYA01'" return true } } diff --git a/lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue b/lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue index b0ba680..e550f00 100644 --- a/lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue +++ b/lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue @@ -260,6 +260,9 @@ export default { del: false, download: false, reset: true + }, + query: { + region_code: "'CPQYA01'" } }) }, @@ -280,7 +283,6 @@ export default { methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { - this.query.region_code = "'CPQYA01'" return true }, hand(value) { diff --git a/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue b/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue index a611f75..c29f00d 100644 --- a/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue +++ b/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue @@ -260,6 +260,9 @@ export default { del: false, download: false, reset: true + }, + query: { + region_code: "'YSQA01', 'YSAQKTPQ01'" } }) }, @@ -280,7 +283,6 @@ export default { methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { - this.query.region_code = "'YSQA01', 'YSAQKTPQ01'" return true }, hand(value) { diff --git a/lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue b/lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue index ff1989f..0075181 100644 --- a/lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue +++ b/lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue @@ -95,29 +95,29 @@ - - + + - - - + + + - - + + - - - - + + + +