From 7d25ea606c75200ccc01312a92dba4a4c3478458 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Thu, 24 Nov 2022 18:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acs/instruction/service/impl/InstructionServiceImpl.java   | 3 +++
 .../main/java/org/nl/hand/service/impl/HFHandServiceImpl.java  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 6b565ad..c21a943 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -388,6 +388,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
                 Integer now_need_emptypallet_num = Integer.parseInt(taskService.findByCode(dto.getTask_code()).getEmptypallet_num());
                 //当前叠盘架有空托盘数量
                 int now_number = emptyVehicleStackingPositionDeviceDriver.getNumber();
+                if (now_number == 0){
+                    now_number = 1;
+                }
                 //判断从第几层取
                 int i = now_number - now_need_emptypallet_num - emptyNum + 1;
                 if (i <= 0) {
diff --git a/acs/nladmin-system/src/main/java/org/nl/hand/service/impl/HFHandServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/hand/service/impl/HFHandServiceImpl.java
index af41f8b..84b0f8d 100644
--- a/acs/nladmin-system/src/main/java/org/nl/hand/service/impl/HFHandServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/hand/service/impl/HFHandServiceImpl.java
@@ -291,6 +291,7 @@ public class HFHandServiceImpl implements HFHandService {
         String task_type = jsonObject.get("task_type");
         String priority = jsonObject.get("priority");
         String carrier = jsonObject.get("carrier");
+        String emptypallet_num = jsonObject.get("emptypallet_num");
 
         JSONObject resultJson = new JSONObject();
         DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
@@ -363,6 +364,7 @@ public class HFHandServiceImpl implements HFHandService {
         dto.setTask_type(task_type);
         dto.setPriority(priority);
         dto.setVehicle_code(carrier);
+        dto.setEmptypallet_num(emptypallet_num);
         try {
             taskService.create(dto);
 //            startDevice.setIslock("true");