From 4289789946d2713ba408f07d6f6d00b9f0cd3c63 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sun, 19 Feb 2023 21:04:57 +0800 Subject: [PATCH 1/4] =?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 --- .../src/main/java/org/nl/wms/sch/tasks/SendOutTask.java | 2 ++ .../nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java | 3 ++- .../java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java index c5ae64ea0..4c49d19d8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java @@ -73,6 +73,8 @@ public class SendOutTask extends AbstractAcsTask { JSONObject jsonPoint2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0); jsonPoint2.put("lock_type", "1"); + jsonPoint2.put("vehicle_code", ""); + jsonPoint2.put("point_status", "1"); pointTab.update(jsonPoint2); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index f4823bccf..e7fb0d120 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -292,7 +292,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { storPublicService.IOStor(jo, "31"); //锁定起点点位、仓位 JSONObject from_start = new JSONObject(); - from_start.put("lock_type", "03"); + from_start.put("lock_type", "6"); from_start.put("struct_id", jo.getString("turnout_struct_id")); from_start.put("inv_type", jo_mst.getString("bill_type")); from_start.put("inv_id", jo_mst.getString("moveinv_id")); @@ -303,6 +303,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { storPublicService.updateStructAndPoint(from_start); //锁定终点点位、仓位 from_start.put("struct_id", turnin_struct_id); + from_start.put("lock_type", "7"); storPublicService.updateStructAndPoint(from_start); } ret.put("total_qty", total_qty); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java index 0db85a0de..6366d4651 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java @@ -89,7 +89,7 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { if(TaskStatusEnum.EXECUTING.getCode().equals(status)){ map.put("work_status","02"); wo_dtl.update(map,"task_id='"+task_id+"'"); - map.put("task_status","03"); + map.put("task_status",TaskStatusEnum.EXECUTING.getCode()); map.put("update_optid",currentUserId+""); map.put("update_optname",nickName); map.put("update_time",now); From 02152af90a8434a906414bbdc8419c8dffd1fd00 Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 20 Feb 2023 10:51:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=A0=BC=E5=BC=8F=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/nladmin-system/pom.xml | 6 ++++++ acs/nladmin-system/src/main/resources/logback-spring.xml | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/acs/nladmin-system/pom.xml b/acs/nladmin-system/pom.xml index 92dd526a9..1f86527ae 100644 --- a/acs/nladmin-system/pom.xml +++ b/acs/nladmin-system/pom.xml @@ -33,6 +33,12 @@ + + + org.fusesource.jansi + jansi + 1.9 + @@ -68,6 +69,7 @@ https://juejin.cn/post/6844903775631572999 %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${log.charset} From e6342cef42e79e7df138977140ff2fc113a159c3 Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 20 Feb 2023 10:59:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B9=B1=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/nladmin-system/pom.xml | 1 + lms/nladmin-system/pom.xml | 8 +++++++ .../src/main/resources/logback-spring.xml | 22 ++++++++----------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/acs/nladmin-system/pom.xml b/acs/nladmin-system/pom.xml index 1f86527ae..4e7942c59 100644 --- a/acs/nladmin-system/pom.xml +++ b/acs/nladmin-system/pom.xml @@ -34,6 +34,7 @@ + org.fusesource.jansi jansi diff --git a/lms/nladmin-system/pom.xml b/lms/nladmin-system/pom.xml index 8579a3819..48d21902a 100644 --- a/lms/nladmin-system/pom.xml +++ b/lms/nladmin-system/pom.xml @@ -57,6 +57,14 @@ 0.9.10 + + + + org.fusesource.jansi + jansi + 1.9 + + cn.hutool diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index d4ab2b935..bc40bd84b 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -29,9 +29,11 @@ https://juejin.cn/post/6844903775631572999 + + true ${log.pattern} - ${log.charset} + @@ -54,7 +56,6 @@ https://juejin.cn/post/6844903775631572999 %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n ${log.charset} - @@ -149,14 +150,14 @@ https://juejin.cn/post/6844903775631572999 - - + + - + @@ -199,14 +200,14 @@ https://juejin.cn/post/6844903775631572999 - - + + - + @@ -229,23 +230,18 @@ https://juejin.cn/post/6844903775631572999 - - - - - From 8290ed28103b0eae8cede7e644253ac98d1ecddf Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 20 Feb 2023 11:39:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java | 1 + .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 6 +++++- .../main/java/org/nl/wms/pda/mps/rest/OutController.java | 1 - .../src/main/resources/log/{ACSToMes.xml => AcsToLms.xml} | 2 +- .../src/main/resources/log/{MesToACS.xml => LmsToAcs.xml} | 2 +- lms/nladmin-system/src/main/resources/logback-spring.xml | 8 ++------ 6 files changed, 10 insertions(+), 10 deletions(-) rename lms/nladmin-system/src/main/resources/log/{ACSToMes.xml => AcsToLms.xml} (95%) rename lms/nladmin-system/src/main/resources/log/{MesToACS.xml => LmsToAcs.xml} (95%) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java index ff3e155c4..d5e92f4b7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java @@ -213,6 +213,7 @@ public class AutoRunServiceImpl implements AutoRunService, ApplicationAutoInitia thread.start(); } else if (SystemConfig.thread_auto_run.booleanValue() && (!DevelopConfig.develop.booleanValue() || !DevelopConfig.thread_auto_run_force_stop.contains(this.thread_code_index.get(i)))) { + thread.setName("test_"+thread.getName()); thread.start(); } } 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 e26b47f86..df75c2ccd 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 @@ -135,6 +135,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { result.put("message", "任务状态反馈成功!"); result.put("data", new JSONObject()); result.put("errArr", errArr); + log.info("receiveTaskStatusAcs返回参数：--------------------------------------" + result.toString()); return result; } @@ -493,6 +494,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } result.put("status", HttpStatus.OK.value()); result.put("message", "下发成功!"); + log.info("apply返回参数：---------------------------------------------" + result.toString()); return result; } } finally { @@ -502,6 +504,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } result.put("status", HttpStatus.BAD_REQUEST.value()); result.put("message", "申请任务超时！" + type); + log.info("apply返回参数：---------------------------------------------" + result.toString()); + return result; } @@ -602,7 +606,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { lock.unlock(); } } - + log.info("deviceApply返回参数：---------------------------------------------" + result.toString()); return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java index e81b9e10f..690cb55a5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.logging.annotation.Log; -import org.nl.wms.pda.mps.service.CasingService; import org.nl.wms.pda.mps.service.OutService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/lms/nladmin-system/src/main/resources/log/ACSToMes.xml b/lms/nladmin-system/src/main/resources/log/AcsToLms.xml similarity index 95% rename from lms/nladmin-system/src/main/resources/log/ACSToMes.xml rename to lms/nladmin-system/src/main/resources/log/AcsToLms.xml index b3ca345f5..74080ec33 100644 --- a/lms/nladmin-system/src/main/resources/log/ACSToMes.xml +++ b/lms/nladmin-system/src/main/resources/log/AcsToLms.xml @@ -6,7 +6,7 @@ - ${LOG_HOME}/ACSToMes/%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/AcsToLms/%d{yyyy-MM-dd}.%i.log 15 diff --git a/lms/nladmin-system/src/main/resources/log/MesToACS.xml b/lms/nladmin-system/src/main/resources/log/LmsToAcs.xml similarity index 95% rename from lms/nladmin-system/src/main/resources/log/MesToACS.xml rename to lms/nladmin-system/src/main/resources/log/LmsToAcs.xml index b0aed616a..ad31a026c 100644 --- a/lms/nladmin-system/src/main/resources/log/MesToACS.xml +++ b/lms/nladmin-system/src/main/resources/log/LmsToAcs.xml @@ -6,7 +6,7 @@ - ${LOG_HOME}/MesToACS/%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/LmsToAcs/%d{yyyy-MM-dd}.%i.log 15 diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index bc40bd84b..036d43bf5 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -14,19 +14,15 @@ https://juejin.cn/post/6844903775631572999 - - - - - - + +