From fa83398a292a9436ec1caa255830db286a2d1898 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Thu, 13 Feb 2025 10:18:28 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=B7=BB=E5=8A=A0=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E4=BD=8D=E6=89=8B=E5=8A=A8=E8=A1=A5=E6=89=98=E7=9B=98=E5=8F=B7?=
 =?UTF-8?q?=E5=92=8C=E6=9C=A8=E7=AE=B1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConveyorWithScannerWeightDeviceDriver.java                | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
index d4c2268fc..7453ed0c3 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
@@ -348,7 +348,9 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
 
                 //申请退货入库
                 if (mode == 18 && move == 1 && !requireSucess) {
-                    if (StrUtil.isEmpty(barcode) || StrUtil.isEmpty(material_barcode)) {
+                    if (StrUtil.isNotEmpty(hand_barcode) && StrUtil.isNotEmpty(hand_material_barcode)) {
+                        applyBoxReturnTask(StorageTypeEnum.BOX_RETURN.getType(), mode);
+                    } else if (StrUtil.isEmpty(barcode) || StrUtil.isEmpty(material_barcode)) {
                         message = "托盘条码为空或者木箱号为空";
                     } else {
                         applyBoxReturnTask(StorageTypeEnum.BOX_RETURN.getType(), mode);