From 2c13894b6099cb88b45e3796b994b12b52e12db3 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Wed, 1 Feb 2023 18:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SiemensConveyorDeviceDriver.java                | 13 ++++++-------
 .../SiemensConveyorLabelingDeviceDriver.java        |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

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 10e992eb4..8b5e3436f 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
@@ -182,7 +182,12 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                 inst = instructionService.findByCodeFromCache(String.valueOf(task));
                 if (inst != null) {
                     inst_message = "当前指令号:" + inst.getInstruction_code() + " " + inst.getStart_point_code() + "->" + inst.getNext_point_code() + "  载具号：" + inst.getVehicle_code();
-                    if (mode == 2) {
+                    if (StrUtil.equals(inst.getInstruction_status(), "0") && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) {
+                        inst.setInstruction_status("1");
+                        inst.setExecute_device_code(this.device_code);
+                        instructionService.update(inst);
+                    }
+                    if (mode == 2 || mode == 8) {
                         if (StrUtil.equals(inst.getInstruction_status(), "1")) {
                             if (StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) {
                                 vehicle_code = inst.getVehicle_code();
@@ -196,12 +201,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                             }
 
                         }
-                    } else {
-                        if (StrUtil.equals(inst.getInstruction_status(), "0") && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) {
-                            inst.setInstruction_status("1");
-                            inst.setExecute_device_code(this.device_code);
-                            instructionService.update(inst);
-                        }
                     }
                 }
             }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
index 1602f5927..644591eac 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
@@ -679,7 +679,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
             applyLabelingAndBindingRequest.setDevice_code(start_point_code);
             applyLabelingAndBindingRequest.setType("1");
             applyLabelingAndBindingRequest.setVehicle_code(vehicle_code);
-            applyLabelingAndBindingRequest.setWeight(String.valueOf(weight/10));
+            applyLabelingAndBindingRequest.setWeight(String.valueOf(weight/100));
             ApplyLabelingAndBindingResponse applyLabelingAndBindingResponse = acsToWmsService.applyLabelingAndBindingRequest(applyLabelingAndBindingRequest);
 
             if(applyLabelingAndBindingResponse.getstatus() == 200){