From a99ffc550c5063e0816d96176d21e7867f42fc15 Mon Sep 17 00:00:00 2001 From: ludj Date: Thu, 22 Dec 2022 13:49:11 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/ext/acs/rest/AcsToWmsController.java | 8 +++++--- .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 8 ++++---- .../main/java/org/nl/wms/sch/manage/AbstractAcsTask.java | 1 - .../main/java/org/nl/wms/sch/manage/AutoCreateTask.java | 9 ++++++--- .../wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java | 2 +- .../wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java | 4 ++-- .../wms/sch/tasks/callMaterial/YqxCallMaterialTask.java | 2 +- .../nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java | 4 ++-- .../wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java | 4 ++-- .../wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java | 4 ++-- lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue | 3 +-- 11 files changed, 26 insertions(+), 23 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 0fe289f..e27edd4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -2,7 +2,7 @@ package org.nl.wms.ext.acs.rest; -import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -32,6 +32,7 @@ public class AcsToWmsController { @PostMapping("/status") @Log("ACS给WMS反馈任务状态") @ApiOperation("ACS给WMS反馈任务状态") + @SaIgnore public ResponseEntity receiveTaskStatusAcs(@RequestBody String string) { return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK); } @@ -39,6 +40,7 @@ public class AcsToWmsController { @PostMapping("/orderFinish") @Log("ACS给WMS下发工单完成状态") @ApiOperation("ACS给WMS下发工单完成状态") + @SaIgnore public ResponseEntity orderFinish(@RequestBody String string) { return new ResponseEntity<>(acsToWmsService.orderFinish(string), HttpStatus.OK); } @@ -46,7 +48,7 @@ public class AcsToWmsController { @PostMapping("/apply") @Log("申请任务") @ApiOperation("申请任务") - @SaCheckPermission("menu:list") + @SaIgnore public ResponseEntity apply(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK); } @@ -54,7 +56,7 @@ public class AcsToWmsController { @PostMapping("/againApply") @Log("二次申请任务") @ApiOperation("二次申请任务") - @SaCheckPermission("menu:list") + @SaIgnore public ResponseEntity againApply(@RequestBody String task_id) { return new ResponseEntity<>(acsToWmsService.againApply(task_id), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 40fd615..290b4dd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -53,7 +53,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONArray errArr = new JSONArray(); for (int i = 0; i < array.size(); i++) { JSONObject row = array.getJSONObject(i); - String task_id = row.getString("task_id"); + String task_id = row.getString("ext_task_id"); JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); // 任务处理类 String processing_class = taskObj.getString("handle_class"); @@ -62,10 +62,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String message = ""; String status = ""; if ("1".equals(acs_task_status)) { - status = TaskStatusEnum.EXECUTING.getCode(); + status = "1"; } if ("2".equals(acs_task_status)) { - status = TaskStatusEnum.FINISHED.getCode(); + status = "2"; } if ("3".equals(acs_task_status)) { status = "0"; @@ -76,7 +76,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { Object obj = clz.newInstance(); // 调用每个任务类的forceFinishInst()强制结束方法 Method m = obj.getClass().getDeclaredMethod("updateTaskStatus", JSONObject.class, String.class); - m.invoke(obj, row, status); + m.invoke(obj, taskObj, status); } catch (InvocationTargetException e) { e.printStackTrace(); //空指针 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index 1473a84..0178f3a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -69,7 +69,6 @@ public abstract class AbstractAcsTask { } - ; /** * @param form 创建任务需要的参数 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java index a299f32..969e9d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java @@ -108,9 +108,12 @@ public class AutoCreateTask { //处理下发失败的任务 for (int i = 0; i < errArr.size(); i++) { JSONObject taskObj = errArr.getJSONObject(i); - taskObj.put("remark", "下发失败:"+taskObj.getString("message")); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); + + JSONObject param=new JSONObject(); + param.put("remark", "下发失败:"+taskObj.getString("message")); + param.put("update_time", DateUtil.now()); + param.put("task_id", taskObj.getString("ext_task_id")); + taskTab.update(param); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java index 72950a2..e4ae000 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java @@ -398,7 +398,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask { //判断起点是否属于养生A区 if (point_code1.startsWith("2")) { //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code1 = point_code1.substring(0, 4) + "1" + point_code1.substring(4, 9); + point_code1 = point_code1.substring(0, 4) + "2" + point_code1.substring(4, 10); } AcsTaskDto dto = AcsTaskDto.builder() diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java index 97e5e37..da71072 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java @@ -405,8 +405,8 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { String point_code1 = json.getString("point_code1"); //判断起点是否属于养生A区 if (point_code1.startsWith("2")) { - //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code1 = point_code1.substring(0, 4) + "1" + point_code1.substring(4, 9); + //养生A区发给ACS需要新的点位(21012-03-1----->21011-03-1) + point_code1 = point_code1.substring(0, 4) + "2" + point_code1.substring(4, 10); } AcsTaskDto dto = AcsTaskDto.builder() diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java index 7c31707..334345b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java @@ -165,7 +165,7 @@ public class YqxCallMaterialTask extends AbstractAcsTask { JSONObject json = arr.getJSONObject(i); //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) String point_code =json.getString("point_code1"); - String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + String newPoint = point_code.substring(0, 4) + "2" + point_code.substring(4, 10); AcsTaskDto dto = AcsTaskDto.builder() .task_id(json.getString("task_id")) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java index 34162d3..5989ff9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java @@ -407,7 +407,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask { //判断点位是否属于养生A区 if (point_code.startsWith("2")) { //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 10); } return point_code; } @@ -427,7 +427,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask { //判断终点是否属于养生A区 if (point_code3.startsWith("2")) { //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 9); + point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 10); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java index e7cc37c..3546a21 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java @@ -360,7 +360,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { //判断点位是否属于养生A区 if (point_code.startsWith("2")) { //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 10); } return point_code; } @@ -379,7 +379,7 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { //判断终点是否属于养生A区 if (point_code3.startsWith("2")) { //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 9); + point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 10); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java index 176be07..7603d36 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java @@ -252,7 +252,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask { //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) String point_code = json.getString("point_code2"); - String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 10); AcsTaskDto dto = AcsTaskDto.builder() .task_id(json.getString("task_id")) @@ -373,7 +373,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask { //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) String point_code = taskObj.getString("point_code3"); - String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); + String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 10); return newPoint; } } 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 169fab4..04c05d3 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -441,9 +441,8 @@ export default { rounding(row, column) { return parseFloat(row[column.property]).toFixed(2) }, - // 下发按钮禁用条件 is_disabled(len, row) { - if (len === 1 && row.order_status === '00') { + if (len === 1 && row.order_status === '1') { return false } else { return true From 9832fc925cf37c7e1460208d495a3e11fb2a8bde Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Thu, 22 Dec 2022 13:49:40 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 2 +- .../nl/acs/task/service/impl/TaskFeedbackServiceImpl.java | 3 +-- .../java/org/nl/acs/task/service/impl/TaskServiceImpl.java | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 3c6856b..4c6e24b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -123,7 +123,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { } JSONObject jo = new JSONObject(); jo.put("task_code", task_code); - jo.put("task_id", ext_task_id); + jo.put("ext_task_id", ext_task_id); jo.put("start_point_code", start_point_code); jo.put("next_point_code", next_point_code); jo.put("start_parent_code", start_point_code); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java index dd4d38a..d526c6a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java @@ -166,7 +166,7 @@ public class TaskFeedbackServiceImpl implements TaskFeedbackService { TaskFeedbackDto dto = this.findById(id); TaskDto entity = taskService.findById(dto.getTask_id()); JSONObject feed_jo = new JSONObject(); - feed_jo.put("task_id", entity.getTask_id()); + feed_jo.put("ext_task_id", entity.getExt_task_id()); feed_jo.put("task_code", entity.getTask_code()); feed_jo.put("task_status", entity.getTask_status()); JSONArray ja = new JSONArray(); @@ -180,7 +180,6 @@ public class TaskFeedbackServiceImpl implements TaskFeedbackService { e.printStackTrace(); } int status = body.getStatus(); - JSONObject jo = (JSONObject) JSONObject.toJSON(body.body()); dto.setTask_status(entity.getTask_status()); if (status == 200) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 2976399..0caad2f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -542,7 +542,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code()); JSONObject feed_jo = new JSONObject(); - feed_jo.put("task_id", entity.getTask_id()); + feed_jo.put("ext_task_id", entity.getExt_task_id()); feed_jo.put("task_code", dto.getTask_code()); feed_jo.put("task_status", dto.getTask_status()); JSONArray ja = new JSONArray(); @@ -658,7 +658,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code()); JSONObject feed_jo = new JSONObject(); - feed_jo.put("task_id", entity.getTask_id()); + feed_jo.put("ext_task_id", entity.getExt_task_id()); feed_jo.put("task_code", entity.getTask_code()); feed_jo.put("task_status", entity.getTask_status()); JSONArray ja = new JSONArray(); @@ -785,7 +785,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { JSONObject feed_jo = new JSONObject(); - feed_jo.put("task_id", entity.getTask_id()); + feed_jo.put("ext_task_id", entity.getExt_task_id()); feed_jo.put("task_code", entity.getTask_code()); feed_jo.put("task_status", entity.getTask_status()); JSONArray ja = new JSONArray(); From 5fc642422365d57be1fbdd5d4f4b9d64d511b6e9 Mon Sep 17 00:00:00 2001 From: ludj Date: Thu, 22 Dec 2022 14:05:57 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/sch/service/impl/PointServiceImpl.java | 4 ++++ .../java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 752734a..71aa4d8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -50,6 +50,10 @@ public class PointServiceImpl implements PointService { map.put("point_status", whereJson.get("point_status")); map.put("is_used", whereJson.get("is_used")); map.put("point_type", whereJson.get("point_type")); + map.put("block_num", whereJson.get("block_num")); + map.put("row_num", whereJson.get("row_num")); + map.put("col_num", whereJson.get("col_num")); + map.put("layer_num", whereJson.get("layer_num")); map.put("name", whereJson.get("name")); JSONObject json = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc"); JSONArray content = json.getJSONArray("content"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql index bdf9d1a..e139c90 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/QSCH_BASE_POINT.wql @@ -19,6 +19,10 @@ 输入.name TYPEAS s_string 输入.point_type TYPEAS s_string 输入.point_status TYPEAS s_string + 输入.block_num TYPEAS s_string + 输入.row_num TYPEAS s_string + 输入.col_num TYPEAS s_string + 输入.layer_num TYPEAS s_string 输入.is_used TYPEAS s_string 输入.ids TYPEAS f_string @@ -79,6 +83,18 @@ OPTION 输入.is_used <> "" point.is_used = 输入.is_used ENDOPTION + OPTION 输入.block_num <> "" + point.block_num = 输入.block_num + ENDOPTION + OPTION 输入.row_num <> "" + point.row_num = 输入.row_num + ENDOPTION + OPTION 输入.col_num <> "" + point.col_num = 输入.col_num + ENDOPTION + OPTION 输入.layer_num <> "" + point.layer_num = 输入.layer_num + ENDOPTION OPTION 输入.name <> "" ( point.point_code like "%" 输入.name "%" or point.point_name like "%" 输入.name "%" ) ENDOPTION From af89a2522bddc492f73328dac945d027a4178ea4 Mon Sep 17 00:00:00 2001 From: ludj Date: Thu, 22 Dec 2022 14:52:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WorkorderServiceImpl.java | 2 +- .../resources/config/application-prod.yml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../src/views/wms/sch/point/ViewDialog.vue | 74 +------------------ 4 files changed, 6 insertions(+), 74 deletions(-) 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 8addcce..709a886 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 @@ -192,7 +192,7 @@ public class WorkorderServiceImpl implements WorkordeService { JSONArray orderArr = wo.query("device_id = '" + param.getString("device_id") + "' and order_status = '02'").getResultJSONArray(0); if (ObjectUtil.isNotEmpty(orderArr)) throw new BadRequestException("当前设备正在生产中"); - json.put("order_status", "02"); + json.put("order_status", "2"); json.put("update_optid", currentUserId); json.put("update_optname", nickName); json.put("update_time", now); diff --git a/lms/nladmin-system/src/main/resources/config/application-prod.yml b/lms/nladmin-system/src/main/resources/config/application-prod.yml index 1d3bb43..61eaff1 100644 --- a/lms/nladmin-system/src/main/resources/config/application-prod.yml +++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml @@ -162,4 +162,4 @@ sa-token: loki: url: http://localhost:3100/loki/api/v1 - systemName: lms + systemName: lms \ No newline at end of file diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index 3e68ee7..7684235 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -122,7 +122,7 @@ https://juejin.cn/post/6844903775631572999 - + diff --git a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue index d8321dc..ee122f2 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue @@ -84,81 +84,13 @@ - -
- 库存信息: - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 库存信息: - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + <!– 操作按钮–> - + -->