From 575472fca6aee019ffdc8307a3ff4bbd7c54077e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?=
 <zhangjiangwei2000@outlook.com>
Date: Sat, 17 Dec 2022 14:37:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=8D=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hongfeng/hf_station/HfStationDeviceDriver.java     | 10 +++++-----
 .../service/impl/ProduceshiftorderServiceImpl.java     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
index 01e205d..546e602 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
@@ -288,13 +288,13 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De
                     break;
                 case 3:
                     //人工排产确认
-                    if (!requireSucess && !order.equals("0")) {
+                    if (!requireSucess && StrUtil.isNotEmpty(order)) {
                         enterOrder();
                     }
                     break;
                 case 4:
                     //工单完成
-                    if (!finishRequireSucess && !order.equals("0")) {
+                    if (!finishRequireSucess && StrUtil.isNotEmpty(order)) {
                         finish();
                     }
                     break;
@@ -302,19 +302,19 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De
                     break;
                 case 6:
                     //呼叫空盅
-                    if (!callEmptyRequireSucess && !order.equals("0")) {
+                    if (!callEmptyRequireSucess && StrUtil.isNotEmpty(order)) {
                         callEmpty();
                     }
                     break;
                 case 7:
                     //满盅入库
-                    if (!fullInRequireSucess && !order.equals("0")) {
+                    if (!fullInRequireSucess && StrUtil.isNotEmpty(order)) {
                         fullIn();
                     }
                     break;
                 case 8:
                     //压机叫料
-                    if (!callMaterialRequireSucess && !order.equals("0")) {
+                    if (!callMaterialRequireSucess && StrUtil.isNotEmpty(order)) {
                         callMaterial();
                     }
                     break;
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
index 27c2ff9..14dea09 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
@@ -137,9 +137,9 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
 
         if (device.getDeviceDriver() instanceof HfStationDeviceDriver) {
             hfStationDeviceDriver = (HfStationDeviceDriver) device.getDeviceDriver();
-//            hfStationDeviceDriver.writing("to_order",dto.getOrder_code());
-//            hfStationDeviceDriver.writing("to_order_num",String.valueOf(dto.getQty()));
-//            hfStationDeviceDriver.writing("to_product_number",dto.getMaterial_code());
+            hfStationDeviceDriver.writing("to_order",dto.getOrder_code());
+            hfStationDeviceDriver.writing("to_order_num",String.valueOf(dto.getQty()));
+            hfStationDeviceDriver.writing("to_product_number",dto.getMaterial_code());
         }
 
         JSONObject json = (JSONObject) JSONObject.toJSON(dto);