From d8164749039823b815effbc0a856ed37805dae41 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 12 Mar 2025 13:36:22 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E6=B7=B7=E6=89=98=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=BB=84=E7=9B=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/service/impl/SchBaseTaskServiceImpl.java        | 9 ++++++---
 .../group_dick/service/impl/MdGruopDickServiceImpl.java  | 2 +-
 wms_pro/qd/新建文本文档.txt                        | 0
 3 files changed, 7 insertions(+), 4 deletions(-)
 delete mode 100644 wms_pro/qd/新建文本文档.txt

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
index 08635697..61a2c7a3 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
@@ -153,11 +153,14 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
                 handleFinishTask(param, task);
                 return;
             }
-            MdPbVehicleMater vehicleMater = iMdPbVehicleMaterService.getOne(new QueryWrapper<MdPbVehicleMater>()
+            List<MdPbVehicleMater> vehicleMaterList = iMdPbVehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>()
                     .eq("vehicle_code", task.getVehicle_code())
                     .eq("is_delete", false));
-            if (vehicleMater != null && !StringUtils.isEmpty(vehicleMater.getProc_inst_id())) {
-                FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMater.getProc_inst_id(), null, null);
+            if (ObjectUtil.isEmpty(vehicleMaterList)) {
+                throw new BadRequestException("任务完成失败，到载具物料信息: " + task.getVehicle_code());
+            }
+            if (StringUtils.isNotBlank(vehicleMaterList.get(0).getProc_inst_id())) {
+                FlowContinueEvent continueEvent = new FlowContinueEvent(vehicleMaterList.get(0).getProc_inst_id(), null, null);
                 BussEventMulticaster.Publish(continueEvent);
             } else {
                 handleFinishTask(param, task);
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
index a28b7921..f71a61a3 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
@@ -312,7 +312,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
                     vehicleMater.setMaterial_id(materialCode.getMaterial_id());
                     vehicleMater.setId(IdUtil.getStringId());
                     vehicleMater.setUnit_id("100438");//个
-                    vehicleMater.setStor_code("FStockId");
+                    vehicleMater.setStor_code(vehicle_code.toUpperCase().contains("T")?"FStockPallet":"FStockId");
                     vehicleMater.setCreate_time(now);
                     vehicleMater.setCreate_name(SecurityUtils.getCurrentNickName());
                     groups.add(dick);
diff --git a/wms_pro/qd/新建文本文档.txt b/wms_pro/qd/新建文本文档.txt
deleted file mode 100644
index e69de29b..00000000