From 1dca57c0f15c3cdfbebf14ad1e9e04d8c84e775c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期六, 07 三月 2026 09:51:47 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2983a0e..f2664f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1423,7 +1423,7 @@
             generateCacheOutTask(station, locCache, userId);
 
             /**鐢熸垚绔嬪簱鍑哄簱浠诲姟*/
-            generateCRNOutTask(station, locCache, userId);
+           // generateCRNOutTask(station, locCache, userId);
 
             return R.ok();
         }
@@ -1513,7 +1513,7 @@
         Task task = new Task();
         task.setWrkNo(workNo)
                 .setIoTime(new Date())
-                .setWrkSts(1L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+                .setWrkSts(201L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍏ュ簱搴揑D
                 .setIoType(1) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
                 .setTaskType("agv")
                 .setIoPri(10D)
@@ -1820,12 +1820,14 @@
             throw new CoolException("瀹瑰櫒缂栫爜鏈淮鎶わ紝璇风淮鎶ゅ悗鍐嶆搷浣滐紒锛�");
         }
 
-        Integer whsType = 1;
+        Integer whsType = 2;
+        Short lcoType = 1;
         //鐢ㄤ簬鍒ゆ柇鏂欑鎵樼洏锛屾枡绠憋紝绗兼
-        if (container.getType().equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
-            whsType = 3;
-        } else if (container.getType().equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
+        if (!container.getType().equals(ContainerType.CONTAINER_TYPE_BOX.type)) {
             whsType = 2;
+            if (container.getType().equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
+                lcoType = 2;
+            }
         }
 
         WrkMast barcode = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
@@ -1858,7 +1860,7 @@
                     throw new CoolException("鏁版嵁閿欒,缁勬嫋妗e凡涓嶅瓨鍦�!!");
                 }
 
-                WrkMast wrkMast = generateCrnInTask(waitPakins, whsType, station, param.getLocType1(), userId);
+                WrkMast wrkMast = generateCrnInTask(waitPakins, whsType, station, lcoType, userId);
 
                 response.put("taskNo", wrkMast.getWrkNo());
                 response.put("locNo", wrkMast.getLocNo());

--
Gitblit v1.9.1