From 5b29798927ce746e62856916aadd95d459973e4e Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Fri, 12 Jul 2024 16:08:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=8A=A5=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/acs/opc/DeviceOpcProtocolRunable.java  |  2 +-
 .../service/dao/mapper/ReportMapper.xml       | 11 ++++++++--
 .../wms/sch/report/service/dto/ReportDto.java | 10 +++++++++
 .../sch/report/service/dto/ReportQuery.java   |  2 ++
 .../src/views/wms/sch/report/index.vue        | 22 +++++++++++++++++++
 5 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
index 1f7ffc9..4222ade 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
@@ -400,7 +400,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
 //            } else if (log.isInfoEnabled()) {
 //                log.info("Item {} new value: {}, Timestamp: {}, Quality: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime(), itemState.getQuality()});
 //            }
-            log.trace("Item {} new value: {}, Timestamp: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime()});
+            log.info("Item {} new value: {}, Timestamp: {}", new Object[]{itemId, itemState.getValue(), itemState.getTimestamp().getTime()});
 
             OpcItemDto itemDto = this.getItem(itemId);
 //            if (Boolean.TRUE.equals(itemDto.getNeed_log())) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
index 1c296a5..81cbcf6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
@@ -5,14 +5,18 @@
     <select id="queryReport" resultType="org.nl.wms.sch.report.service.dto.ReportDto">
         SELECT
         DISTINCT p.point_code as pointCode,
+        p.point_name as pointName,
+        p.region_code as regionCode,
+        p.region_name as regionName,
+        p.vehicle_code2 as subTray,
+        p.vehicle_code as motherTray,
             m.productDescription,
             m.supplierName
         FROM
             sch_base_point p
                 LEFT JOIN sch_base_material m ON p.vehicle_code2 = m.PalletSN
         WHERE
-            region_code IN ( 'HW', 'HWK' )
-          AND vehicle_code2 IS NOT NULL
+            vehicle_code2 IS NOT NULL
           AND vehicle_code2 != ''
         <if test="query.supplierName  != null">
             and m.supplierName like CONCAT('%', #{query.supplierName}, '%')
@@ -23,6 +27,9 @@
         <if test="query.point_code  != null">
             and p.point_code like  CONCAT('%', #{query.point_code}, '%')
         </if>
+        <if test="query.region_code  != null">
+            and p.region_code = #{query.region_code}
+        </if>
         ORDER BY point_code ASC
     </select>
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportDto.java
index cecbd0e..f52aa97 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportDto.java
@@ -8,6 +8,16 @@ import java.io.Serializable;
 public class ReportDto implements Serializable {
     /** 点位编码 */
     private String pointCode;
+    /** 点位名称 */
+    private String pointName;
+    /** 区域编码 */
+    private String regionCode;
+    /** 区域名称 */
+    private String regionName;
+    /** 子托号 */
+    private String subTray;
+    /** 母拖号 */
+    private String motherTray;
     /** 物料名称 */
     private String productDescription;
     /** 供应商名称 */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java
index d86bf10..5d91164 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java
@@ -22,4 +22,6 @@ public class ReportQuery implements Serializable {
     private String group_bind_material_status;
     //点位编码
     private String point_code;
+
+    private String region_code;
 }
diff --git a/lms/nladmin-ui/src/views/wms/sch/report/index.vue b/lms/nladmin-ui/src/views/wms/sch/report/index.vue
index e8e2be0..b10c932 100644
--- a/lms/nladmin-ui/src/views/wms/sch/report/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/report/index.vue
@@ -27,6 +27,23 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="区域编码">
+            <el-select
+              v-model="query.region_code"
+              clearable
+              size="mini"
+              placeholder="区域编码"
+              class="filter-item"
+              filterable  
+              @remote-method="getRegionList"
+            >
+              <el-option
+                v-for="item in regionList"
+                :label="item.region_name"
+                :value="item.region_code"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="供应商名称">
             <el-select
               v-model="query.supplierName"
@@ -221,6 +238,11 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
+        <el-table-column prop="pointName" label="点位名称" :min-width="flexWidth('pointName',crud.data,'点位名称')" />
+        <el-table-column prop="regionCode" label="区域编码" :min-width="flexWidth('regionCode',crud.data,'区域编码')" />
+        <el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" />
+        <el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
+        <el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
         <el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
         <el-table-column prop="productDescription" label="物料名称" :min-width="flexWidth('productDescription',crud.data,'物料名称')" />
       </el-table>