From 0afeceec8035cafc01f32cd527ab828ead07ed2d Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 13 Dec 2022 14:19:00 +0800
Subject: [PATCH 1/6] =?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/ext/wql/QCRM_001.wql             | 3 +++
 lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue     | 2 +-
 lms/nladmin-ui/src/views/wms/sch/point/index.vue              | 2 +-
 lms/nladmin-ui/src/views/wms/sch/region/index.vue             | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
index b485e161f..3094bb858 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
@@ -99,6 +99,9 @@
                 ENDOPTION
                 OPTION 输入.packageboxsn <> ""
                     sub.package_box_sn = 输入.packageboxsn
+                ENDOPTION
+                OPTION 输入.container_name <> ""
+                    sub.container_name = 输入.container_name
                 ENDOPTION
 			ENDSELECT
 		ENDQUERY
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
index 83f865bf6..d5feedd55 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
@@ -206,7 +206,7 @@
         <el-table-column prop="simple_name" label="仓位简称" :min-width="flexWidth('simple_name',crud.data,'仓位简称')" />
         <el-table-column prop="sect_name" label="所属库区" width="150" />
         <el-table-column prop="stor_name" label="所属仓库" width="150" />
-        <el-table-column prop="storagevehicle_code" label="载具号" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="storagevehicle_code" label="载具号" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
         <el-table-column prop="lock_type" label="锁定类型" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.d_lock_type[scope.row.lock_type] }}
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index cdfcb18d7..6f986c5b2 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -312,7 +312,7 @@
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column>-->
-        <el-table-column prop="vehicle_code" label="载具编码" />
+        <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
         <el-table-column prop="vehicle_qty" label="载具数量" />
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
diff --git a/lms/nladmin-ui/src/views/wms/sch/region/index.vue b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
index 95f17184b..dc6718327 100644
--- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
@@ -60,8 +60,8 @@
         <el-table-column v-if="false" prop="region_id" label="区域标识" />
         <el-table-column prop="region_code" label="区域编码" min-width="120" />
         <el-table-column prop="region_name" label="区域名称" min-width="130" />
-        <el-table-column prop="point_type_explain" label="点位类型说明" min-width="150" />
-        <el-table-column prop="point_status_explain" label="点位状态说明" min-width="120" />
+        <el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
+        <el-table-column prop="point_status_explain" label="点位状态说明" :min-width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_name" label="创建人" />
         <el-table-column prop="create_time" label="创建时间" min-width="140" show-overflow-tooltip />

From aa3c30c2528e2ff7bdfdc18147c3f90513b9827d Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 13 Dec 2022 16:02:49 +0800
Subject: [PATCH 2/6] =?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

---
 .../pdm/rest/RawfoilworkorderController.java  |  8 ++
 .../pdm/service/RawfoilworkorderService.java  |  7 ++
 .../impl/RawfoilworkorderServiceImpl.java     | 15 ++++
 .../wms/pdm/order/rawfoilworkorder/Dialog.vue | 81 +++++++++++++++++++
 .../wms/pdm/order/rawfoilworkorder/index.vue  | 22 ++++-
 .../rawfoilworkorder/rawfoilworkorder.js      | 10 ++-
 6 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/Dialog.vue

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/RawfoilworkorderController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/RawfoilworkorderController.java
index dce11ad86..19ed727a4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/RawfoilworkorderController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/RawfoilworkorderController.java
@@ -74,4 +74,12 @@ public class RawfoilworkorderController {
         rawfoilworkorderService.compelEnd(whereJson);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @Log("称重")
+    @ApiOperation("称重")
+    @PostMapping("/confirm")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        rawfoilworkorderService.confirm(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/RawfoilworkorderService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/RawfoilworkorderService.java
index 79595edcd..675c2bec4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/RawfoilworkorderService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/RawfoilworkorderService.java
@@ -78,4 +78,11 @@ public interface RawfoilworkorderService {
      * @param whereJson /
      */
     void compelEnd(JSONObject whereJson);
+
+    /**
+     * 称重
+     *
+     * @param whereJson /
+     */
+    void confirm(JSONObject whereJson);
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java
index 8aec20bc6..38fdca9de 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java
@@ -208,4 +208,19 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService {
         tab.update(json);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void confirm(JSONObject whereJson) {
+        WQLObject tab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder");
+        String productin_qty = whereJson.getString("productin_qty");
+
+        JSONObject jsonRaw = tab.query("workorder_id = '" + whereJson.getString("workorder_id") + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(productin_qty)) {
+            jsonRaw.put("productin_qty",0);
+        } else {
+            jsonRaw.put("productin_qty",whereJson.getDoubleValue("productin_qty"));
+        }
+        tab.update(jsonRaw);
+    }
+
 }
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/Dialog.vue b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/Dialog.vue
new file mode 100644
index 000000000..d0bcbcf6e
--- /dev/null
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/Dialog.vue
@@ -0,0 +1,81 @@
+<template>
+  <el-dialog
+    title="称重"
+    append-to-body
+    :visible.sync="dialogVisible"
+    :before-close="handleClose"
+    width="500px"
+    destroy-on-close
+    @close="close"
+  >
+    <el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
+      <el-form-item label="重量" prop="productin_qty">
+        <el-input-number v-model="form1.productin_qty" :min="0" :controls="false" :precision="3" style="width: 250px;"/>
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="close">取消</el-button>
+      <el-button type="primary" @click="confirm">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import crudRawfoilworkorder from '@/views/wms/pdm/order/rawfoilworkorder/rawfoilworkorder'
+import CRUD, { crud } from '@crud/crud'
+export default {
+  name: 'SunShowDialog',
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+        this.form1 = this.openParam
+      }
+    }
+  },
+  data() {
+    return {
+      form1: {},
+      dialogVisible: false
+    }
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+      this.form1 = {}
+      this.crud.toQuery()
+    },
+    confirm() {
+      crudRawfoilworkorder.confirm(this.form1).then(res => {
+        this.crud.toQuery()
+        this.close()
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
index 77a4433c9..767f64a82 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
@@ -95,6 +95,17 @@
         >
           强制结束
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="weigh"
+        >
+          称重
+        </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -236,11 +247,13 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <Dialog :dialog-show.sync="dialogShow" :open-param="openParam" />
   </div>
 </template>
 
 <script>
 import crudRawfoilworkorder from '@/views/wms/pdm/order/rawfoilworkorder/rawfoilworkorder'
+import Dialog from '@/views/wms/pdm/order/rawfoilworkorder/Dialog'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -276,7 +289,7 @@ const defaultForm = {
 export default {
   name: 'Rawfoilworkorder',
   dicts: ['product_area', 'product_status'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation, udOperation, Dialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -296,6 +309,8 @@ export default {
   },
   data() {
     return {
+      dialogShow: false,
+      openParam: null,
       permission: {},
       rules: {
         container_name: [
@@ -346,6 +361,11 @@ export default {
         this.crud.toQuery()
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       })
+    },
+    weigh() {
+      const _selectData = this.$refs.table.selection
+      this.openParam = _selectData[0]
+      this.dialogShow = true
     }
   }
 }
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/rawfoilworkorder.js b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/rawfoilworkorder.js
index 1f9d7da90..6a67c4bd8 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/rawfoilworkorder.js
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/rawfoilworkorder.js
@@ -32,4 +32,12 @@ export function compelEnd(data) {
   })
 }
 
-export default { add, edit, del, compelEnd }
+export function confirm(data) {
+  return request({
+    url: 'api/rawfoilworkorder/confirm',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, compelEnd, confirm }

From 52276bb6bfa94ea0b15ddb21c66b49f55dade086 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Tue, 13 Dec 2022 23:00:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OvenGantryManipulatorDeviceDriver.java    | 22 +++----
 .../SlitTwoManipulatorDeviceDriver.java       | 66 +++++++++----------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
index 6333abb68..6b8502dc6 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
@@ -159,17 +159,17 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     if (StrUtil.equals(inst1.getInstruction_status(), "0")) {
                         inst1.setInstruction_status("1");
                         instructionService.update(inst1);
-                        TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
-                        if (ObjectUtil.isNotEmpty(taskDto)) {
-                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
-                                JSONArray array = new JSONArray();
-                                JSONObject map = new JSONObject();
-                                map.put("task_id", taskDto.getExt_task_id());
-                                map.put("task_status", "1");
-                                array.add(map);
-                                acsToWmsService.feedbackTaskStatusToWms(array);
-                            }
-                        }
+//                        TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
+//                        if (ObjectUtil.isNotEmpty(taskDto)) {
+//                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
+//                                JSONArray array = new JSONArray();
+//                                JSONObject map = new JSONObject();
+//                                map.put("task_id", taskDto.getExt_task_id());
+//                                map.put("task_status", "1");
+//                                array.add(map);
+//                                acsToWmsService.feedbackTaskStatusToWms(array);
+//                            }
+//                        }
                     }
                 }
             }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
index 71ff21035..4647d2fa6 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
@@ -212,17 +212,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                         //当前执行步骤为更新任务状态
                         inst1.setInstruction_status("1");
                         instructionService.update(inst1);
-                        TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
-                        if (!ObjectUtil.isEmpty(taskDto)) {
-                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
-                                JSONArray array = new JSONArray();
-                                JSONObject map = new JSONObject();
-                                map.put("task_id", taskDto.getExt_task_id());
-                                map.put("task_status", "1");
-                                array.add(map);
-                                acsToWmsService.feedbackTaskStatusToWms(array);
-                            }
-                        }
+//                        TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
+//                        if (!ObjectUtil.isEmpty(taskDto)) {
+//                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
+//                                JSONArray array = new JSONArray();
+//                                JSONObject map = new JSONObject();
+//                                map.put("task_id", taskDto.getExt_task_id());
+//                                map.put("task_status", "1");
+//                                array.add(map);
+//                                acsToWmsService.feedbackTaskStatusToWms(array);
+//                            }
+//                        }
                         ;
                         //this.setNow_steps_type1(1);
                     }
@@ -239,17 +239,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                         now_steps_type2 = 1;
                         inst2.setInstruction_status("1");
                         instructionService.update(inst2);
-                        TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code());
-                        if (!ObjectUtil.isEmpty(taskDto)) {
-                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
-                                JSONArray array = new JSONArray();
-                                JSONObject map = new JSONObject();
-                                map.put("task_id", taskDto.getExt_task_id());
-                                map.put("task_status", "1");
-                                array.add(map);
-                                acsToWmsService.feedbackTaskStatusToWms(array);
-                            }
-                        }
+//                        TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code());
+//                        if (!ObjectUtil.isEmpty(taskDto)) {
+//                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
+//                                JSONArray array = new JSONArray();
+//                                JSONObject map = new JSONObject();
+//                                map.put("task_id", taskDto.getExt_task_id());
+//                                map.put("task_status", "1");
+//                                array.add(map);
+//                                acsToWmsService.feedbackTaskStatusToWms(array);
+//                            }
+//                        }
                         ;
                        // this.setNow_steps_type2(1);
                     }
@@ -265,17 +265,17 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                         //当前指令更新状态
                         inst2.setInstruction_status("1");
                         instructionService.update(inst2);
-                        TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code());
-                        if (!ObjectUtil.isEmpty(taskDto)) {
-                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
-                                JSONArray array = new JSONArray();
-                                JSONObject map = new JSONObject();
-                                map.put("task_id", taskDto.getExt_task_id());
-                                map.put("task_status", "1");
-                                array.add(map);
-                                acsToWmsService.feedbackTaskStatusToWms(array);
-                            }
-                        }
+//                        TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code());
+//                        if (!ObjectUtil.isEmpty(taskDto)) {
+//                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
+//                                JSONArray array = new JSONArray();
+//                                JSONObject map = new JSONObject();
+//                                map.put("task_id", taskDto.getExt_task_id());
+//                                map.put("task_status", "1");
+//                                array.add(map);
+//                                acsToWmsService.feedbackTaskStatusToWms(array);
+//                            }
+//                        }
                         ;
                     }
                 }

From 29edd52442ddf068680caf170c0036298d635a0c Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Wed, 14 Dec 2022 11:01:49 +0800
Subject: [PATCH 4/6] =?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

---
 .../mes/service/impl/MesToLmsServiceImpl.java |  9 +++++-
 .../sap/service/impl/SapToLmsServiceImpl.java |  3 ++
 .../src/main/resources/log/LmsToMes.xml       | 28 +++++++++++++++++++
 .../src/main/resources/log/LmsToSap.xml       | 28 +++++++++++++++++++
 .../src/main/resources/log/MesToLms.xml       | 28 +++++++++++++++++++
 .../src/main/resources/log/SapToLms.xml       | 28 +++++++++++++++++++
 .../src/main/resources/logback-spring.xml     |  6 ++--
 7 files changed, 127 insertions(+), 3 deletions(-)
 create mode 100644 lms/nladmin-system/src/main/resources/log/LmsToMes.xml
 create mode 100644 lms/nladmin-system/src/main/resources/log/LmsToSap.xml
 create mode 100644 lms/nladmin-system/src/main/resources/log/MesToLms.xml
 create mode 100644 lms/nladmin-system/src/main/resources/log/SapToLms.xml

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index b4105e67b..938e791bc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -128,6 +128,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             result.put("RTDAT", null);
             System.out.println(result);
         }
+        log.info("momRollFoilStart接口输出参数为：-------------------" + result.toString());
         return result;
     }
 
@@ -176,6 +177,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             result.put("RTDAT", null);
             System.out.println(result);
         }
+        log.info("momRollFoilStart接口输出参数为：-------------------" + result.toString());
         return result;
     }
 
@@ -446,6 +448,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             result.put("RTDAT", null);
             System.out.println(result);
         }
+        log.info("cutPlanTransfer接口输出参数为：-------------------" + result.toString());
         return result;
     }
 
@@ -632,7 +635,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             result.put("RTDAT", null);
             System.out.println(result);
         }
-
+        log.info("callNextAssAndMomRoll接口输出参数为：-------------------" + result.toString());
         return result;
     }
 
@@ -721,6 +724,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             result.put("RTDAT", null);
             System.out.println(result);
         }
+        log.info("childRollCutStartComp接口输出参数为：-------------------" + result.toString());
         return result;
     }
 
@@ -849,6 +853,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             result.put("RTDAT", null);
             System.out.println(result);
         }
+        log.info("childRollPackComplete接口输出参数为：-------------------" + result.toString());
         return result;
     }
 
@@ -963,6 +968,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                 System.out.println(result);
             }
 //        }
+        log.info("inventoryTransferInfoSync接口输出参数为：-------------------" + result.toString());
         return result;
     }
 
@@ -1024,6 +1030,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             result.put("RTDAT", null);
             System.out.println(result);
         }
+        log.info("childRollInfoUpdate接口输出参数为：-------------------" + result.toString());
         return result;
     }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
index 2f12780fe..e8b560601 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
@@ -91,6 +91,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
         }
         result.put("TYPE", "S");
         result.put("MESSAGE", "物料同步成功！");
+        log.info("getMaterialInfo的输出参数为：------------------------" + result.toString());
         return result;
     }
 
@@ -286,6 +287,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
         result.put("RTMSG", "操作成功!");
         result.put("RTOAL", 1);
         result.put("RTDAT", null);
+        log.info("getDeliveryInfo的输出参数为：------------------------" + result.toString());
         return result;
     }
 
@@ -337,6 +339,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
         result.put("RTMSG", "操作成功!");
         result.put("RTOAL", 1);
         result.put("RTDAT", null);
+        log.info("getReturnDeliveryInfo的输出参数为：------------------------" + result.toString());
         return result;
     }
 
diff --git a/lms/nladmin-system/src/main/resources/log/LmsToMes.xml b/lms/nladmin-system/src/main/resources/log/LmsToMes.xml
new file mode 100644
index 000000000..ea58d79fb
--- /dev/null
+++ b/lms/nladmin-system/src/main/resources/log/LmsToMes.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE4" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/LmsToMes/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+      <logger name="org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl" level="info" additivity="false">
+          <appender-ref ref="FILE4"/>
+      </logger>
+
+    <!-- 打印sql -->
+</included>
diff --git a/lms/nladmin-system/src/main/resources/log/LmsToSap.xml b/lms/nladmin-system/src/main/resources/log/LmsToSap.xml
new file mode 100644
index 000000000..9a941da76
--- /dev/null
+++ b/lms/nladmin-system/src/main/resources/log/LmsToSap.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE2" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/LmsToSap/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+      <logger name="org.nl.wms.ext.sap.service.impl.LmsToSapServiceImpl" level="info" additivity="false">
+          <appender-ref ref="FILE2"/>
+      </logger>
+
+    <!-- 打印sql -->
+</included>
diff --git a/lms/nladmin-system/src/main/resources/log/MesToLms.xml b/lms/nladmin-system/src/main/resources/log/MesToLms.xml
new file mode 100644
index 000000000..85374b8bf
--- /dev/null
+++ b/lms/nladmin-system/src/main/resources/log/MesToLms.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE3" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/MesToLms/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+      <logger name="org.nl.wms.ext.mes.service.impl.MesToLmsServiceImpl" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>
+
+    <!-- 打印sql -->
+</included>
diff --git a/lms/nladmin-system/src/main/resources/log/SapToLms.xml b/lms/nladmin-system/src/main/resources/log/SapToLms.xml
new file mode 100644
index 000000000..a1beaa0fb
--- /dev/null
+++ b/lms/nladmin-system/src/main/resources/log/SapToLms.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE1" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/SapToLms/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+      <logger name="org.nl.wms.ext.sap.service.impl.SapToLmsServiceImpl" level="info" additivity="false">
+          <appender-ref ref="FILE1"/>
+      </logger>
+
+    <!-- 打印sql -->
+</included>
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index d1efa8607..fe216477e 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -20,8 +20,10 @@ https://juejin.cn/post/6844903775631572999
     <property name="SYSTEM_NAME" value="${systemName}"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!--引入默认的一些设置-->
-    <!--<include resource="log/XrToMes.xml"/>
-    <include resource="log/MesToErp.xml"/>-->
+    <include resource="log/LmsToMes.xml"/>
+    <include resource="log/LmsToSap.xml"/>
+    <include resource="log/MesToLms.xml"/>
+    <include resource="log/SapToLms.xml"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>

From f87fc8e919deb11d8111a14f4e61772c2136b570 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Wed, 14 Dec 2022 11:02:28 +0800
Subject: [PATCH 5/6] =?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

---
 .../org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index 938e791bc..3e00840ff 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -1030,6 +1030,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             result.put("RTDAT", null);
             System.out.println(result);
         }
+        
         log.info("childRollInfoUpdate接口输出参数为：-------------------" + result.toString());
         return result;
     }

From c41358f680ca7c39f5a1fa614add21a3ccd7c349 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Wed, 14 Dec 2022 11:10:47 +0800
Subject: [PATCH 6/6] =?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

---
 .../org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
index e8b560601..ae98b090d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
@@ -87,6 +87,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
         } catch (Exception exception) {
             result.put("RTYPE", "E");
             result.put("RTMSG", "操作失败!" + exception.getMessage());
+            log.info("getMaterialInfo的输出参数为：------------------------" + result.toString());
             return result;
         }
         result.put("TYPE", "S");
@@ -281,6 +282,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
             result.put("RTMSG", "操作失败!" + e.getMessage());
             result.put("RTOAL", 1);
             result.put("RTDAT", null);
+            log.info("getDeliveryInfo的输出参数为：------------------------" + result.toString());
             return result;
         }
         result.put("RTYPE", "S");