From f18306cca09bf52c12bd5dfa9b80fcf136424ac1 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Mon, 16 Dec 2024 18:03:20 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=BB=A1=E5=85=A5=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/service/impl/SchBaseTaskServiceImpl.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 372a2a5e..1bc356bb 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
@@ -305,6 +305,12 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
                         .eq("vehicle_code", task.getVehicle_code())
                         .eq("is_delete",false));
         //查询分配规则
+        iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
+                .eq("struct_code", stIvtStructattr.getStruct_code())
+                .set("lock_type", StatusEnum.LOCK.code("异常锁定"))
+                .set("update_time", DateUtil.now())
+                .set("remark", "入满异常:" + task_code)
+                .set("vehicle_code", task_code+"_ZD_"+org.nl.common.utils.IdUtil.getStringId()));
         Map map = SpringContextHolder.getBean(DecisionHandler.class)
                 .dispenseTransa(ListOf.of("limitStorage","depthPriority","nearby"), new JSONObject(MapOf.of("stor_code", stIvtStructattr.getStor_code(),"vehicle_code",task.getVehicle_code())));
         String new_struct_code = ((Map<String, String>) map.get("form_data")).get("end_struct_code");
@@ -317,12 +323,6 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
                 .set("point_code2", new_struct_code)
                 .set("remark", stIvtStructattr.getStruct_code() + "入满异常重新分配货位" + new_struct_code)
                 .eq("task_code", task_code));
-        iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
-                .eq("struct_code", stIvtStructattr.getStruct_code())
-                .set("lock_type", StatusEnum.LOCK.code("异常锁定"))
-                .set("update_time", DateUtil.now())
-                .set("remark", "入满异常:" + task_code)
-                .set("vehicle_code", task_code+"_ZD_"+org.nl.common.utils.IdUtil.getStringId()));
         JSONObject result = new JSONObject();
         result.put("point_code2", new_struct_code);
         return result;