From dfb3e1fa332ee8be24c8f0e3438c54ac43c9e9d8 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, 31 Jan 2023 01:52:05 +0800
Subject: [PATCH] =?UTF-8?q?lms=E6=96=B0=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SiemensConveyorDeviceDriver.java          | 12 +++++++++++
 .../acs/ext/wms/service/AcsToWmsService.java  |  3 +++
 .../wms/service/impl/AcsToWmsServiceImpl.java | 21 +++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
index ae64411bb..55d99582f 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
@@ -231,6 +231,10 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
             message = "";
             Instruction instruction = null;
             List toInstructions;
+            if (last_move == 1 && move == 0) {
+                // 有货变无货请求lms
+                this.shipDeviceUpdate();
+            }
 
 
 //            if (mode == 2 && move != 0 && task > 0) {
@@ -302,6 +306,14 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
         last_task = task;
     }
 
+    private void shipDeviceUpdate() {
+        JSONObject param = new JSONObject() {{
+            put("device_code", device_code);
+        }};
+
+        acsToWmsService.shipDeviceUpdate(param);
+    }
+
 
     public boolean exe_error() {
         if (this.error == 0) {
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
index b880f9cad..84bc2c458 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
@@ -103,4 +103,7 @@ public interface AcsToWmsService {
     LiKuApplyTakResponse liKuApplyTaskRequest(LiKuApplyTaskRequest liKuApplyTaskRequest);
 
     UpdateLKTaskResponse updateLKTaskRequest(UpdateLKTaskRequest updateLKTaskRequest);
+
+    // 输送线有货变成无货时向lms请求
+    void shipDeviceUpdate(JSONObject param);
 }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
index eaae2ff27..c84b1e13e 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
@@ -501,4 +501,25 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
 
     }
 
+    @Override
+    public void shipDeviceUpdate(JSONObject param) {
+        try {
+            MDC.put(log_file_type, log_type);
+            log.info("shipDeviceUpdate-----输入参数{}", param);
+            if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
+                String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue();
+                AddressDto addressDto = addressService.findByCode("shipDeviceUpdate");
+                String methods_url = addressDto.getMethods_url();
+                String url = wmsUrl + methods_url;
+                HttpRequest
+                        .post(url)
+                        .body(param.toString())
+                        .execute();
+            }
+        } catch (Throwable ignored) {
+
+        } finally {
+            MDC.remove(log_file_type);
+        }
+    }
 }