From d14cdcf4b181a9525a1bf255f08ef94f02b79ffb Mon Sep 17 00:00:00 2001
From: songxiaopeng <1393756821@qq.com>
Date: Mon, 29 Apr 2024 16:25:11 +0800
Subject: [PATCH] =?UTF-8?q?update:=E5=88=86=E6=8B=A3=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BD=93=E6=97=A5=E6=8B=86=E7=A0=81=E5=9E=9B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20update:=E9=94=99=E8=AF=AF=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=BF=87=E6=BB=A4,=E5=8F=AA=E8=AE=B0=E5=BD=95error?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=BA0=E7=9A=84=E6=83=85=E5=86=B5=20update:?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=A7=E5=B1=8F=E8=AE=BE=E5=A4=87=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E5=9B=BE=E8=A1=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/service/impl/WmsToAcsServiceImpl.java |  6 +++
 .../nl/wms/cockpit/service/dao/StackVo.java   |  5 +-
 .../service/impl/CockpitServiceImpl.java      |  1 +
 .../cockpit/service/mapper/CockPitMapper.xml  | 46 +++++++++++++------
 .../acs/service/impl/AcsToWmsServiceImpl.java |  4 ++
 5 files changed, 44 insertions(+), 18 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 baf7a5c..d53570c 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
@@ -1275,6 +1275,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
             if (ObjectUtil.isEmpty(device)) {
                 continue;
             }
+            if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) {
+                LnshRGVDeviceDriver driver = (LnshRGVDeviceDriver) device.getDeviceDriver();
+                status.put("device_status", driver.getStatus());
+                status.put("mode", driver.getMode());
+                status.put("error", driver.getError());
+            }
             if (device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver) {
                 ConveyorBarcodeDeviceDriver driver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
                 status.put("mode", driver.getMode());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/StackVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/StackVo.java
index a11554a..bdd2a6b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/StackVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/StackVo.java
@@ -10,10 +10,9 @@ import java.util.Date;
  */
 @Data
 public class StackVo {
-    private String vehicleCode;
     private String materialQty;
-    private String materialWeight;
-    private String materialName;
+    private String materialModel;
+    private String materialCode;
     @JsonFormat(pattern ="MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
index 442ab49..5f5a048 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
@@ -264,6 +264,7 @@ public class CockpitServiceImpl implements CockpitService {
         CompletableFuture<DeviceRunStatVo> deviceRunStatCompletableFuture = CompletableFuture.supplyAsync(
                 () -> {
                     List<String> devices = cockPitMapper.selectAllDevice();
+                    devices.add("RGV");
                     if (devices.isEmpty()) {
                         return null;
                     }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml
index 6fa7577..cfad4bc 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/mapper/CockPitMapper.xml
@@ -103,30 +103,30 @@
     </select>
 
     <select id="getUnstackingList" resultType="org.nl.wms.cockpit.service.dao.StackVo">
-        SELECT g.create_time     AS createTime,
-               g.vehicle_code    AS vehicleCode,
-               g.material_qty    AS materialQty,
-               g.material_weight AS materialWeight,
-               m.material_code   AS materialName
+        SELECT g.update_time    AS createTime,
+               g.material_qty   AS materialQty,
+               m.material_code  AS materialCode,
+               m.material_model AS materialModel
         FROM sch_base_vehiclematerialgroup g
                  LEFT JOIN md_base_material m ON g.material_id = m.material_id
         WHERE g.point_code LIKE ('%CDW%')
-          AND DATE (g.update_time) = CURDATE()
-        ORDER BY g.update_time DESC
+          AND DATE ( g.update_time ) = CURDATE()
+        ORDER BY
+            g.update_time DESC
     </select>
 
     <select id="getStackingList" resultType="org.nl.wms.cockpit.service.dao.StackVo">
-        SELECT g.create_time     as createTime,
-               g.vehicle_code    as vehicleCode,
-               g.material_qty    as materialQty,
-               g.material_weight as materialWeight,
-               m.material_code   as materialName
+        SELECT g.create_time    AS createTime,
+               g.material_qty   AS materialQty,
+               m.material_code  AS materialCode,
+               m.material_model AS materialModel
         FROM sch_base_vehiclematerialgroup g
                  LEFT JOIN pdm_bd_workorder w ON g.workorder_code = w.workorder_code
-                 left join md_base_material m on g.material_id = m.material_id
+                 LEFT JOIN md_base_material m ON g.material_id = m.material_id
         WHERE w.region_code = 'FJ'
-          AND DATE (g.update_time) = CURDATE()
-        order by g.create_time desc
+          AND DATE ( g.create_time ) = CURDATE()
+        ORDER BY
+            g.create_time DESC
     </select>
 
     <select id="selectRgSortCount" resultType="org.nl.wms.cockpit.service.dao.SortingLineRes">
@@ -194,6 +194,21 @@
         SELECT point_code
         FROM sch_base_point
         WHERE is_used = '1'
+            AND (region_code = 'HN' AND point_type = '2')
+           OR (region_code = 'YZ' AND point_type = '1')
+           OR (point_code = 'DTW01')
+           OR (region_code = 'FJ')
+            AND point_code NOT IN (
+                                   'FJ02CDW01',
+                                   'FJ02CDW02',
+                                   'FJ02MDW01',
+                                   'FJ02MDW02',
+                                   'FJCDJXS02',
+                                   'FJMDJXS02',
+                                   'HNJ07DJW',
+                                   'HNJ08DJW',
+                                   'YJ09',
+                                   'YZJXS06')
     </select>
 
     <select id="selectInKilnInfo" resultType="org.nl.wms.cockpit.service.dao.InOutKilnVo">
@@ -299,6 +314,7 @@
                if(LENGTH(p.point_name) <![CDATA[ > ]]> 0, p.point_name, r.device_code) as deviceName
         FROM `das_device_error_record` r
                  LEFT JOIN sch_base_point p ON r.device_code = p.point_code
+        where r.error not in ('0')
         ORDER BY r.record_time desc limit 100
     </select>
     <select id="selectHchjList" resultType="org.nl.wms.cockpit.service.dao.HchjMaterialInfo">
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index d0c913f..5c5ac8f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -1053,6 +1053,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     @Override
     public JSONObject errorDeviceRecord(JSONObject param) {
+        String error = param.getString("error");
+        if(StringUtils.isNotEmpty(error) && "0".equals(error)){
+            return null;
+        }
         DasDeviceErrorRecord dasDeviceErrorRecord = new DasDeviceErrorRecord();
         dasDeviceErrorRecord.setDevice_code(param.getString("device_code"));
         dasDeviceErrorRecord.setError(param.getString("error"));