From 8575002e3bce8a6d16633d5c1a4eed99ccf638ce Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 17 十二月 2025 16:50:55 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 13d9382..d1d8539 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1478,10 +1478,6 @@
if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曡繘琛屾搷浣�");
}
- String agvSta = null;
- if (wrkMast.getIoType() == TaskIOType.MERGE_OUT.type) {
- agvSta = wrkMast.getAvgSta();
- }
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
@@ -1516,7 +1512,10 @@
throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦�:" + wrkMast.getLocNo());
+ }
locMast.setLocSts("Q");
locMast.setAreaId(basAreas.getId());
locMast.setAreaName(basAreas.getName());
@@ -1527,19 +1526,7 @@
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
- // . 鍒犻櫎缂撳瓨绔欑偣鏄庣粏
- if (!Objects.isNull(agvSta)) {
- // 淇敼鐩爣绔欑偣淇℃伅
- BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", agvSta));
- if (Objects.isNull(station)) {
- throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
- }
- basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
- station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
- if (!basStationService.updateById(station)) {
- throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
- }
+
// .淇敼骞舵墭鍏ュ簱鏄庣粏鎵樼爜
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
.eq("area_id", locMast.getAreaId())
@@ -1555,21 +1542,19 @@
}
// .淇敼浠诲姟妗ｆ槑缁嗘墭鐩樼爜
-
-
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (!Objects.isNull(wrkDetls) && !wrkDetls.isEmpty()) {
- wrkDetls.forEach(wrkDetl -> {
- wrkDetl.setZpallet(wrkMast.getBarcode());
- wrkDetl.setBarcode(wrkMast.getBarcode());
- if (!wrkDetlService.updateById(wrkDetl)) {
+ for (WrkDetl wrkDetl : wrkDetls) {
+ wrkDetl.setZpallet(wrkMast.getBarcode());
+ wrkDetl.setBarcode(wrkMast.getBarcode());
+ if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>()
+ .eq("matnr", wrkDetl.getMatnr())
+ .eq("standby1", wrkDetl.getStandby1())
+ .eq("wrk_no", wrkMast.getWrkNo()))) {
throw new CoolException("浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
-
}
- });
+ }
}
-
-
}
@Override
--
Gitblit v1.9.1