From 6294dd1b096fd4a77864dd4680d58a814acd7a08 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 03 九月 2024 14:38:20 +0800
Subject: [PATCH] #缓存队列bug fixed

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java |  103 ++++++++++++++++++++++++++-------------------------
 1 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java
index 1c1ced4..443f8b1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java
@@ -148,32 +148,6 @@
             priority = param.getPriority();
         }
 
-        Task task = new Task();
-        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
-        task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
-        task.setWmsTaskNo(param.getTaskNo());
-        task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
-        task.setTaskCtg(taskCtg.getId());
-        task.setPriority(priority);
-        task.setOriginSite(param.getOriginSite());
-        task.setOriginLoc(null);
-        task.setDestSite(destSite);
-        task.setDestLoc(param.getDestLoc());
-        task.setZpallet(param.getBarcode());
-        task.setIoTime(new Date());
-        task.setStartTime(new Date());
-        task.setStatus(1);
-        task.setMemo("");
-        task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
-        task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
-        task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
-        task.setMemo(param.getEndSite());
-
-        boolean result = taskService.save(task);
-        if (!result) {
-            throw new CoolException("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
-        }
-
         if (createWcsTaskParam != null) {
             //杞彂agv
             if (!createWcsTaskParam.getFrmPos().equals("06YZ0001")){
@@ -183,6 +157,32 @@
                     String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
                     if (!httpRequest.equals("SUCCESS")){
                         throw new CoolException("杞彂AGV浠诲姟澶辫触" + httpRequest);
+                    }
+
+                    Task task = new Task();
+                    task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+                    task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
+                    task.setWmsTaskNo(param.getTaskNo());
+                    task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
+                    task.setTaskCtg(taskCtg.getId());
+                    task.setPriority(priority);
+                    task.setOriginSite(param.getOriginSite());
+                    task.setOriginLoc(null);
+                    task.setDestSite(destSite);
+                    task.setDestLoc(param.getDestLoc());
+                    task.setZpallet(param.getBarcode());
+                    task.setIoTime(new Date());
+                    task.setStartTime(new Date());
+                    task.setStatus(1);
+                    task.setMemo("");
+                    task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
+                    task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+                    task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+                    task.setMemo(param.getEndSite());
+
+                    boolean result = taskService.save(task);
+                    if (!result) {
+                        throw new CoolException("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
                     }
                 }catch (Exception e){
                     throw new CoolException("杞彂AGV浠诲姟鍑洪敊" + e.getMessage());
@@ -302,31 +302,6 @@
             priority = param.getPriority();
         }
 
-        Task task = new Task();
-        task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
-        task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
-        task.setWmsTaskNo(param.getTaskNo());
-        task.setTaskSts(TaskStsType.NEW_OUTBOUND.sts);
-        task.setTaskCtg(taskCtg.getId());
-        task.setPriority(priority);
-        task.setOriginSite(originSite);
-        task.setOriginLoc(param.getOriginLoc());
-        task.setDestSite(param.getDestSite());
-        task.setDestLoc(null);
-        task.setIoTime(new Date());
-        task.setStartTime(new Date());
-        task.setStatus(1);
-        task.setMemo(param.getEndSite());
-        task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
-        task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
-        task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
-        task.setZpallet(param.getZpallet());
-
-        boolean result = taskService.save(task);
-        if (!result) {
-            throw new CoolException("鐢熸垚鍑哄簱浠诲姟澶辫触锛�");
-        }
-
         if (createWcsTaskParam != null) {
             if (!createWcsTaskParam.getFrmPos().equals("06YZ0001")){
                 try {
@@ -336,6 +311,32 @@
                     if (!httpRequest.equals("SUCCESS")){
                         throw new CoolException("杞彂AGV浠诲姟澶辫触" + httpRequest);
                     }
+
+                    Task task = new Task();
+                    task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+                    task.setTaskNo(String.valueOf(Utils.getTaskNo("OUT")));
+                    task.setWmsTaskNo(param.getTaskNo());
+                    task.setTaskSts(TaskStsType.NEW_OUTBOUND.sts);
+                    task.setTaskCtg(taskCtg.getId());
+                    task.setPriority(priority);
+                    task.setOriginSite(originSite);
+                    task.setOriginLoc(param.getOriginLoc());
+                    task.setDestSite(param.getDestSite());
+                    task.setDestLoc(null);
+                    task.setIoTime(new Date());
+                    task.setStartTime(new Date());
+                    task.setStatus(1);
+                    task.setMemo(param.getEndSite());
+                    task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
+                    task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+                    task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+                    task.setZpallet(param.getZpallet());
+
+                    boolean result = taskService.save(task);
+                    if (!result) {
+                        throw new CoolException("鐢熸垚鍑哄簱浠诲姟澶辫触锛�");
+                    }
+
                 }catch (Exception e){
                     throw new CoolException("杞彂AGV浠诲姟鍑洪敊" + e.getMessage());
                 }

--
Gitblit v1.9.1