From fbdad64fe45fa120beb4332e7a3615856d05ab96 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 06 三月 2025 18:20:05 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index ececff1..2cba774 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -516,7 +516,7 @@
         //璐ф灦缂栫爜
         mast.setBarcode(agvLocMast.getBarcode());
         //璐ф灦绫诲瀷
-        mast.setWhsType(30);
+        mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
 
         mast.setAppeUser(userId);
         mast.setAppeTime(now);
@@ -666,7 +666,7 @@
             throw new CoolException("闈炴墜鍔ㄨ皟鎷ㄤ换鍔★紝涓嶆敮鎸佹鍔熻兘");
         }
         if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
-            throw new CoolException("褰撳墠璐ф灦鐮佷换鏈夋簮搴撲綅锛岃纭");
+            throw new CoolException("褰撳墠璐ф灦鐮佹湁婧愬簱浣嶏紝璇风‘璁�");
         }
         AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(param.getDevNo());
         if (Cools.isEmpty(agvWrkMast)) {
@@ -864,7 +864,7 @@
         // TODO: 鍥涙湡
         List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("supp_code", param.getBarcode()));
         String factory = param.getFactory();
-        AgvLocMast newLocMast = agvCommonService.getLocByLocRule(3, 1, factory);
+        AgvLocMast newLocMast = agvCommonService.getLocByLocRule20(3, 1, factory,false);
         if (newLocMast == null) {
             throw new CoolException("鏃犲彲鐢ㄥ簱浣�");
         }

--
Gitblit v1.9.1