From a4dfdf1a98eee98129466e88538057c0912e025f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?=
 <zhangjiangwei2000@outlook.com>
Date: Tue, 27 Dec 2022 13:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=9B=9E=E8=B0=83=20?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=AE=8C=E6=88=90=E5=90=8E=E6=9A=82=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88mes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-spring.xml     |  2 +-
 .../acs/service/impl/AcsToWmsServiceImpl.java | 20 +++++++++----------
 .../src/main/resources/logback-spring.xml     |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml
index 997a112..85e8ca0 100644
--- a/acs/nladmin-system/src/main/resources/logback-spring.xml
+++ b/acs/nladmin-system/src/main/resources/logback-spring.xml
@@ -72,7 +72,7 @@ https://juejin.cn/post/6844903775631572999
         </http>
         <format>
             <label>
-                <pattern>logType=%X{log_file_type:-logType},device=%X{device_code_log:-device}</pattern>
+                <pattern>system=${SYSTEM_NAME},level=%level,logType=%X{log_file_type:-logType},device=%X{device_code_log:-device}</pattern>
             </label>
             <message>
                 <pattern>${log.pattern}</pattern>
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 d4f2f11..852f67c 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
@@ -169,16 +169,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 message = "操作成功！";
 
                 // 操作成功后向 MES 反馈
-                JSONObject param = new JSONObject();
-                param.put("material_code", materialbaseService.findById(jsonObject1.getLong("material_id")).getMaterial_code());
-                param.put("workorder_code", jsonObject1.getString("workorder_code"));
-                param.put("workorder_qty", jsonObject1.getString("plan_qty"));
-                param.put("device_code", deviceService.findByCode(jsonObject1.getString("device_code")).getExtend_code());
-                String workorder_uri = paramService.findByCode("mes_url").getValue() + "api/mes/materialIvt";
-                HttpRequest
-                        .post(workorder_uri)
-                        .body(param.toJSONString())
-                        .execute();
+//                JSONObject param = new JSONObject();
+//                param.put("material_code", materialbaseService.findById(jsonObject1.getLong("material_id")).getMaterial_code());
+//                param.put("workorder_code", jsonObject1.getString("workorder_code"));
+//                param.put("workorder_qty", jsonObject1.getString("plan_qty"));
+//                param.put("device_code", deviceService.findByCode(jsonObject1.getString("device_code")).getExtend_code());
+//                String workorder_uri = paramService.findByCode("mes_url").getValue() + "api/mes/materialIvt";
+//                HttpRequest
+//                        .post(workorder_uri)
+//                        .body(param.toJSONString())
+//                        .execute();
             } catch (Exception e) {
                 status = "400";
                 message = "操作失败！";
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index 9d10551..5eaf0bd 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -66,7 +66,7 @@ https://juejin.cn/post/6844903775631572999
         </http>
         <format>
             <label>
-                <pattern>logType=%X{log_file_type:-logType}</pattern>
+                <pattern>system=${SYSTEM_NAME},level=%level,logType=%X{log_file_type:-logType}</pattern>
             </label>
             <message>
                 <pattern>${log.pattern}</pattern>