From a6df3df0ddf1b121f78ea895da9b557c41ec3804 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 22 一月 2026 14:11:18 +0800
Subject: [PATCH] 输送线组托功能优化
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 23 ++++++++++++++---------
src/main/java/com/zy/asrs/controller/MobileController.java | 7 +++++++
src/main/java/com/zy/asrs/entity/param/CollectionPakinParams.java | 2 ++
3 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 9184d71..4b3cb11 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -63,6 +63,13 @@
@PostMapping("/agv/collectionPakin/view")
@ManagerAuth
public R pdaAgvCollectionPakinView(@RequestBody CollectionPakinParams params) {
+ if (Objects.isNull(params.getOrgBarcode())) {
+ return R.error("婧愭墭鐩樹笉鑳戒负绌猴紒");
+ }
+ if (Objects.isNull(params.getMatnr())) {
+ return R.error("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+
return mobileService.collectionPakinView(params);
}
diff --git a/src/main/java/com/zy/asrs/entity/param/CollectionPakinParams.java b/src/main/java/com/zy/asrs/entity/param/CollectionPakinParams.java
index 0afddd6..c724d80 100644
--- a/src/main/java/com/zy/asrs/entity/param/CollectionPakinParams.java
+++ b/src/main/java/com/zy/asrs/entity/param/CollectionPakinParams.java
@@ -12,6 +12,8 @@
private String tarBarcode;
+ private String matnr;
+
private String devNo;
private List<CombMat> combMats;
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 9547f1d..ff97fe4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1180,7 +1180,7 @@
@Override
@Transactional
public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
- Double curOutQty, Integer ioType, Long userId, Date now) {
+ Double curOutQty, Integer ioType, Long userId, Date now) {
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locDetl.getLocNo());
// 鑾峰彇璺緞
@@ -1811,10 +1811,11 @@
/**
* SO/EO 鍖虹粍鎵�
- * @author Ryan
- * @date 2025/12/18 15:19
+ *
* @param params
* @return com.core.common.R
+ * @author Ryan
+ * @date 2025/12/18 15:19
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -1925,6 +1926,10 @@
&& wrkMast.getIoType().equals(TaskIOType.PICK_OUT.type)) {
throw new CoolException("浜虹墿绫诲瀷閿欒");
}
+
+ wrkDetlService.selectList(new EntityWrapper<WrkDetl>()
+ .eq(!Objects.isNull(params.getMatnr()), "matnr", params.getMatnr())
+ .eq("wrk_no", wrkMast.getWrkNo()));
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
if (Cools.isEmpty(wrkDetls)) {
@@ -2054,7 +2059,6 @@
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
});
-
// // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
@@ -2229,7 +2233,7 @@
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", locMast.getLocNo()));
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
- if (Cools.isEmpty(wrkMast1)){
+ if (Cools.isEmpty(wrkMast1)) {
Integer outSta = devp.getDevNo();
// 鑾峰彇璺緞
StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
@@ -2261,7 +2265,7 @@
if (!wrkMastService.insert(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + locMast.getLocNo());
}
- }else {
+ } else {
workNo = wrkMast1.getWrkNo();
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
@@ -2540,10 +2544,11 @@
/**
* 鍛煎彨AGV绌哄彴杞﹁繑鍥�
- * @author Ryan
- * @date 2025/9/24
+ *
* @param callAgvBackParam
* @return com.core.common.R
+ * @author Ryan
+ * @date 2025/9/24
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -2554,7 +2559,7 @@
// 鎸夊綋鍓嶆煡鎵惧簱浣嶉『搴忥紝鏌ュ埌涓�涓悗锛屼笉鍐嶅線涓嬫煡璇�
LocCache locCache = findPriorityLocCache();
-
+
if (Objects.isNull(locCache)) {
return R.error("鏈煡璇㈠埌鍙敤搴撲綅");
}
--
Gitblit v1.9.1