From 66552cbb1bf59cb5f58142b1bc89ad45788b0360 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 6 Feb 2025 15:17:15 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acs/service/impl/AcsToWmsServiceImpl.java | 29 ++++++-------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index e9d1e8a51..d712ce7a2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -83,7 +83,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AcsToWmsServiceImpl implements AcsToWmsService {
 
-    private static Interner<String> Heap_Lock = Interners.newWeakInterner();
+    private static Map<String,String> Task_Status_Convers = MapOf.of("1",TaskStatusEnum.EXECUTING.getCode(),"2",TaskStatusEnum.FINISHED.getCode(),"3","0");
 
 
     private final RawAssistIStorService rawAssistIStorService;
@@ -185,38 +185,27 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
             boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
             try {
                 if (tryLock) {
-                    JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
+                    JSONObject task = WQLObject.getWQLObject("SCH_BASE_Task")
+                            .query("task_id = '" + task_id + "'")
+                            .uniqueResult(0);
                     if (StrUtil.isNotEmpty(row.getString("car_no"))) {
-                        taskObj.put("car_no", row.getString("car_no"));
-                        WQLObject.getWQLObject("SCH_BASE_Task").update(taskObj);
+                        WQLObject.getWQLObject("SCH_BASE_Task")
+                                .update(MapOf.of("car_no",row.getString("car_no")),"task_id = '" + task_id + "'");
                     }
-                    // 任务处理类
-                    String processing_class = taskObj.getString("handle_class");
-                    AbstractAcsTask abstractTask = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
-                    String status = "";
-                    if ("1".equals(row.getString("task_status"))) {
-                        status = TaskStatusEnum.EXECUTING.getCode();
-                    }
-                    if ("2".equals(row.getString("task_status"))) {
-                        status = TaskStatusEnum.FINISHED.getCode();
-                    }
-                    if ("3".equals(row.getString("task_status"))) {
-                        status = "0";
-                    }
-                    abstractTask.updateTaskStatus(taskObj,status);
+                    AbstractAcsTask abstractTask = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(task.getString("handle_class")));
+                    abstractTask.updateTaskStatus(task,Task_Status_Convers.get(row.getString("task_status")));
                 } else {
                     throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！");
                 }
             }catch (Exception ex){
                 WQLObject.getWQLObject("SCH_BASE_Task").update(MapOf.of("remark",DateUtil.now()+"更新"+row.getString("task_status")+"失败:"+ex.getMessage()),"task_id = '" + task_id + "'");
                 log.error(task_id+"acs更新任务失败:{}", ex);
-                throw new BadRequestException(ex.getMessage());
+                throw ex;
             }finally {
                 if (lock.isLocked() && lock.isHeldByCurrentThread()) {
                     lock.unlock();
                 }
             }
-
         }
         JSONObject result = new JSONObject();
         result.put("status", HttpStatus.OK.value());