From 45b95bf88ab48e4b4db7ff9205e9afa2b83e8737 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 03 四月 2026 19:29:09 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 77 +++++++++++++++++++++++++-------------
src/main/java/com/zy/asrs/controller/MobileController.java | 9 ++++
2 files changed, 59 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b1f24d1..9fb43e5 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -222,8 +222,15 @@
return mobileService.callAgvMove(params, getUserId());
}
+ /**
+ * SO/EO鍏ュ簱
+ * @author Ryan
+ * @date 2026/4/3 14:53
+ * @param params
+ * @return com.core.common.R
+ */
@PostMapping("/collection/agv/call")
- @ApiOperation("闆嗚揣鍖哄叆搴�")
+ @ApiOperation("SO/EO鍏ュ簱")
@ManagerAuth
public R CollectionInCall(@RequestBody AgvCallParams params) {
if (Objects.isNull(params)) {
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 c6c3eea..78c07c3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1510,6 +1510,9 @@
}
BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("name", params.getTarSite()));
+ if (Objects.isNull(basAreas)) {
+ return R.error("绔欑偣涓嶅瓨鍦紝璇锋鏌ョ珯鐐规槸鍚﹁緭鍏ユ纭紒锛�");
+ }
List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
.in("loc_sts", LocStsType.LOC_STS_TYPE_O.type)
@@ -1531,12 +1534,6 @@
@Transactional(rollbackFor = Exception.class)
public void generateSOEOInTask(String type, LocCache loc, String orgSite, String barcode, Long userId) {
- List<BasStationDetl> basStationDetls = basStationDetlService
- .selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", orgSite));
- if (Objects.isNull(basStationDetls) || basStationDetls.isEmpty()) {
- throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦紒锛�");
- }
-
List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().eq("barcode", barcode));
if (!tasks.isEmpty()) {
throw new CoolException("鎵樼洏宸插湪浠诲姟鎵ц涓�..");
@@ -1567,7 +1564,9 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- for (BasStationDetl basStationDetl : basStationDetls) {
+ List<BasStationDetl> basStationDetls = basStationDetlService
+ .selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", orgSite));
+ basStationDetls.forEach(basStationDetl -> {
TaskDetl wrkDetl = new TaskDetl();
BeanUtils.copyProperties(basStationDetl, wrkDetl);
wrkDetl.setWrkNo(workNo)
@@ -1589,7 +1588,7 @@
if (!taskDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
- }
+ });
// 淇敼鐩爣搴撲綅鐘舵��
if (loc.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
@@ -1603,22 +1602,18 @@
throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + loc.getLocSts$());
}
- // 淇敼鐩爣绔欑偣淇℃伅
+ // 淇敼鍘熺珯鐐逛俊鎭�
BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", orgSite));
if (Objects.isNull(station)) {
throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
}
- if (station.getLocSts().equals(LocStsType.LOC_STS_TYPE_F.type)) {
- station.setLocSts("R"); // S.鍏ュ簱棰勭害
- station.setBarcode(barcode);
- station.setModiTime(new Date());
- station.setModiUser(userId);
- if (!basStationService.updateById(station)) {
- throw new CoolException("鏇存柊鐩爣绔欑偣鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細" + station.getLocSts());
+ station.setLocSts("R"); // S.鍏ュ簱棰勭害
+ station.setBarcode(barcode);
+ station.setModiTime(new Date());
+ station.setModiUser(userId);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("鏇存柊鐩爣绔欑偣鐘舵�佸け璐�");
}
}
@@ -3056,15 +3051,18 @@
if (Objects.isNull(combMat)) {
continue;
}
- OrderPakin order = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", combMat.getOrderNo()));
+ OrderPakin order = orderPakinService.selectOne(new EntityWrapper<OrderPakin>()
+ .lt("settle", 4)
+ .eq("order_no", combMat.getOrderNo()));
if (Objects.isNull(order)) {
- return R.error("涓烘煡璇㈠埌璁㈠崟锛岃纭鏄惁涓哄簱鍙ｇ粍鎵樹俊鎭紒锛�");
+ return R.error("鏈煡璇㈠埌璁㈠崟锛岃纭鏄惁涓哄簱鍙ｇ粍鎵樹俊鎭紒锛�");
}
//鍏ュ簱
OrderDetlPakin detlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
.eq("order_no", combMat.getOrderNo())
.eq("matnr", combMat.getMatnr())
- .eq("supp_code", combMat.getStandby1()));
+ .eq("supp_code", combMat.getStandby1())
+ .last("AND anfme != qty"));
if (!Objects.isNull(detlPakin)) {
Double v = Math.round((detlPakin.getWorkQty() - combMat.getAnfme()) * 10000) / 10000.0;
@@ -3076,10 +3074,37 @@
throw new CoolException("璁㈠崟鏄庣粏鏇存柊澶辫触锛侊紒");
}
- if (!basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("order_no", combMat.getOrderNo())
+ BasStationDetl stationDetl = basStationDetlService.selectOne(new EntityWrapper<BasStationDetl>()
+ .eq("order_no", combMat.getOrderNo())
.eq("matnr", combMat.getMatnr())
- .eq("supp_code", combMat.getStandby1()))) {
- throw new CoolException("绔欑偣鏁版嵁鍒犻櫎澶辫触锛侊紒");
+ .eq("supp_code", combMat.getStandby1()));
+ if (!Objects.isNull(stationDetl)) {
+ if (!basStationDetlService.delete(new EntityWrapper<BasStationDetl>()
+ .eq("order_no", combMat.getOrderNo())
+ .eq("matnr", combMat.getMatnr())
+ .eq("supp_code", combMat.getStandby1()))) {
+ throw new CoolException("瑙ｇ粦澶辫触锛岀珯鐐瑰簱瀛樺垹闄ゅけ璐ワ紒");
+ }
+ }
+
+ BasAreas basAreas = basAreasService.selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_IN_CACHE.type));
+ if (Objects.isNull(basAreas)) {
+ throw new CoolException("绔欑偣鏌ヨ澶辫触锛岃鑱旂郴绠＄悊鍛橈紒锛�");
+ }
+
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("area_id", basAreas.getId())
+ .eq("order_no", combMat.getOrderNo())
+ .eq("matnr", combMat.getMatnr())
+ .eq("supp_code", combMat.getStandby1()));
+ if (!Objects.isNull(locDetl)) {
+ if (!locDetlService.delete(new EntityWrapper<LocDetl>()
+ .eq("area_id", basAreas.getId())
+ .eq("order_no", combMat.getOrderNo())
+ .eq("matnr", combMat.getMatnr())
+ .eq("supp_code", combMat.getStandby1()))) {
+ throw new CoolException("瑙ｇ粦澶辫触锛岀紦鍐插簱鍖哄簱瀛樺垹闄ゅけ璐ワ紒");
+ }
}
WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>()
@@ -3094,7 +3119,7 @@
}
}
} else {
- throw new CoolException("璁㈠崟鏄庣粏缁戝畾鍏崇郴涓嶅瓨鍦紒锛�");
+ throw new CoolException("璁㈠崟鏄庣粏缁戝畾鍏崇郴涓嶅瓨鍦ㄦ垨宸插畬鎴愬叆搴擄紒锛�");
}
}
return R.ok();
--
Gitblit v1.9.1