From 92a19721efccbd17127d6fb1ea3b5d3ba38300c2 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Mon, 22 Jul 2024 17:00:25 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BB=BB=E5=8A=A1=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=8F=8A=E4=B8=8B=E5=8F=91=E5=A4=B1=E8=B4=A5=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acs/nladmin-ui/src/views/acs/task/index.vue   |  2 +-
 .../wms/pda/service/impl/PdaServiceImpl.java  |  3 +++
 .../nl/wms/sch/task_manage/AbstractTask.java  | 20 +++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index 43bd16c..b1b979d 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -250,7 +250,7 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="25" />
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
-        <el-table-column prop="task_code" label="任务号" />
+        <el-table-column prop="task_code" label="任务号" min-width="150" show-overflow-tooltip />
         <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="task_status" label="任务状态">
           <template slot-scope="scope">
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
index 710dbce..510ddad 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
@@ -445,6 +445,9 @@ public class PdaServiceImpl implements PdaService {
         Assert.notBlank(point_code, "出库点位不能为空!");
         SchBasePoint point = pointService.getById(requestParam.getPoint_code());
         Assert.notNull(point, point_code + "对应的点位信息不存在!");
+        if (point.getPoint_status().equals(PointStatusEnum.EMPTY_POINT.getCode())) {
+            throw new BadRequestException("回库请求失败, " + point_code + "点位为空位。");
+        }
         if (!RegionEnum.JLHC.getRegion_code().equals(point.getRegion_code())) {
             throw new BadRequestException("回库请求失败,出库点位所属区域不是" + RegionEnum.JLHC.getRegion_name());
         }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
index 4723a44..50f9439 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
@@ -145,6 +145,26 @@ public abstract class AbstractTask {
                 }
             }
             taskService.updateBatchById(taskList);
+        } else {
+            JSONArray errArr = resultForAcs.getErrArr();
+            if (errArr.size() > 0) {
+                for (int i = 0; i < errArr.size(); i++) {
+                    JSONObject jsonObject = errArr.getJSONObject(i);
+                    String task_code = jsonObject.getString("task_code");
+                    String message = jsonObject.getString("message");
+                    SchBaseTask task = taskService.getByCode(task_code);
+                    task.setRemark("下发失败," + message);
+                    task.setUpdate_time(DateUtil.now());
+                    taskService.updateById(task);
+                }
+            } else {
+                for (int i = 0; i < taskList.size(); i++) {
+                    SchBaseTask schBaseTask = taskList.get(i);
+                    schBaseTask.setRemark("下发失败" + resultForAcs.getMessage());
+                    schBaseTask.setUpdate_time(DateUtil.now());
+                    taskService.updateById(schBaseTask);
+                }
+            }
         }
         return resultForAcs;
     }