From d66bc1821a36fd9272292bfa9d9c0980359e9ae0 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 08 十二月 2025 08:44:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 badaec3..2368ec4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -864,10 +864,6 @@
}
}
- locMast.setLocSts("R");
- if(!locMastService.updateById(locMast)){
- throw new CoolException("鏂板agv鍏ュ簱浠诲姟澶辫触");
- }
BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
@@ -881,6 +877,11 @@
if(resultBind.getCode() != 200){
throw new CoolException("agv鍏ュ簱缁戝畾澶辫触");
}
+ locMast.setBarcode(param.getBarcode());
+ locMast.setLocSts("R");
+ if(!locMastService.updateById(locMast)){
+ throw new CoolException("鏂板agv鍏ュ簱浠诲姟澶辫触");
+ }
OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
}
}
--
Gitblit v1.9.1