From 9591d4a4184a76f2af997a47c3bd883beecb1ea2 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 12 十二月 2025 14:56:42 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 130 +++++++++++++++++++++++++++++--------------
1 files changed, 87 insertions(+), 43 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 28662ed..93237b3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -656,6 +656,7 @@
waitPakin.setAnfme(detlDto.getAnfme());
waitPakin.setThreeCode(detlDto.getThreeCode());
waitPakin.setStatus("Y");
+ waitPakin.setSuppCode(detlDto.getStandby1());
waitPakin.setStandby1(detlDto.getStandby1());
waitPakin.setStandby2(detlDto.getStandby2());
waitPakin.setStandby3(detlDto.getStandby3());
@@ -1589,17 +1590,16 @@
if (Objects.isNull(params.getBsCode())) {
throw new CoolException("BS鐮佷笉鑳戒负绌猴紒锛�");
}
- Task task = taskService.selectOne(new EntityWrapper<Task>()
- .eq("io_type", TaskIOType.PICK_OUT.type)
- .eq("wrk_sts", 14)
- .eq("barcode", params.getCarBarcode()));
- if (Objects.isNull(task)) {
- throw new CoolException("鏁版嵁閿欒锛氫换鍔′俊鎭瓨鍦紒锛�");
- }
+// Task task = taskService.selectOne(new EntityWrapper<Task>()
+// .eq("io_type", TaskIOType.PICK_OUT.type)
+// .eq("wrk_sts", 14)
+// .eq("barcode", params.getCarBarcode()));
+// if (Objects.isNull(task)) {
+// throw new CoolException("鏁版嵁閿欒锛氫换鍔′俊鎭瓨鍦紒锛�");
+// }
- List<TaskDetl> taskDetl = taskDetlService.selectList(new EntityWrapper<TaskDetl>()
+ List<BasStationDetl> taskDetl = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>()
.eq("three_code", params.getBsCode())
- .eq("wrk_no", task.getWrkNo())
.eq("zpallet", params.getCarBarcode()));
if (Objects.isNull(taskDetl) || taskDetl.isEmpty()) {
@@ -1688,9 +1688,23 @@
throw new CoolException("鐗╂枡锛�" + detlDto.getMatnr() + ", 瓒呭嚭褰撳墠鎵樼洏瑁呰浇涓婇檺锛侊紒");
}
+ BasStationDetl stationDetl = basStationDetlService.selectOne(new EntityWrapper<BasStationDetl>()
+ .eq("zpallet", param.getCarBarcode())
+ .eq("three_code", detlDto.getThreeCode()));
+ if (Objects.isNull(stationDetl)) {
+ throw new CoolException("鏄庣粏鍐呭涓嶅瓨鍦紒锛�");
+ }
+
+ Double v = Math.round((stationDetl.getAnfme() - stationDetl.getWorkQty()) * 10000) / 10000.0;
+
+ if (detlDto.getAnfme().compareTo(v) > 0) {
+ throw new CoolException("缁勬墭涓婇檺涓猴細" + stationDetl.getAnfme() + ", 宸茬粍鎵橈細" + stationDetl.getWorkQty() + ", 杩樺彲缁勬墭锛�" + v);
+ }
+
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(mat, waitPakin);
waitPakin.setBatch(detlDto.getBatch());
+ waitPakin.setType(param.getType());
waitPakin.setZpallet(param.getBarcode());
// 璁剧疆缁勬墭绫诲瀷
waitPakin.setType(param.getType());
@@ -1698,6 +1712,7 @@
waitPakin.setAnfme(detlDto.getAnfme());
waitPakin.setThreeCode(detlDto.getThreeCode());
waitPakin.setStatus("Y");
+ waitPakin.setSuppCode(detlDto.getStandby1());
waitPakin.setStandby1(detlDto.getStandby1());
waitPakin.setStandby2(detlDto.getStandby2());
waitPakin.setStandby3(detlDto.getStandby3());
@@ -1711,6 +1726,33 @@
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
+
+ Double v1 = Math.round((stationDetl.getWorkQty() + detlDto.getAnfme()) * 10000) / 10000.0 ;
+ stationDetl.setWorkQty(v1);
+
+ if (!basStationDetlService.updateById(stationDetl)) {
+ throw new CoolException("绔欑偣鏄庣粏淇敼澶辫触");
+ }
+
+ if (v1.compareTo(stationDetl.getWorkQty()) >= 0) {
+ if (!basStationDetlService.deleteById(stationDetl)) {
+ throw new CoolException("鍘熷鏁版嵁绉婚櫎澶辫触锛�");
+ }
+ }
+
+ List<BasStationDetl> devNo = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", stationDetl.getDevNo()));
+ if (Objects.isNull(devNo) || devNo.isEmpty()) {
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+ .eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
+ .eq("dev_no", stationDetl.getDevNo()));
+ if (!Objects.isNull(station)) {
+ station.setLocSts(LocStsType.LOC_STS_TYPE_D.type);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐锛侊紒");
+ }
+ }
+ }
+
}
}
@@ -1731,37 +1773,37 @@
if (Objects.isNull(param.getStation())) {
throw new CoolException("绔欑偣涓嶈兘涓虹┖!!");
}
- // TODO 淇敼缂撳瓨绔欑偣鐘舵�佸強鏁版嵁
- Task task = taskService.selectOne(new EntityWrapper<Task>()
- .eq("wrk_sts", 14L)
- .eq("barcode", param.getCarBarcode()));
- if (Objects.isNull(task)) {
- throw new CoolException("鏁版嵁閿欒,浠诲姟涓嶅瓨鍦�!!");
- }
- List<TaskDetl> taskDetls = taskDetlService
- .selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
- if (Objects.isNull(taskDetls) || taskDetls.isEmpty()) {
- throw new CoolException("鏁版嵁閿欒,浠诲姟鏄庣粏涓嶅瓨鍦�!!");
- }
+// // TODO 淇敼缂撳瓨绔欑偣鐘舵�佸強鏁版嵁
+// Task task = taskService.selectOne(new EntityWrapper<Task>()
+// .eq("wrk_sts", 14L)
+// .eq("barcode", param.getCarBarcode()));
+// if (Objects.isNull(task)) {
+// throw new CoolException("鏁版嵁閿欒,浠诲姟涓嶅瓨鍦�!!");
+// }
+// List<TaskDetl> taskDetls = taskDetlService
+// .selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
+// if (Objects.isNull(taskDetls) || taskDetls.isEmpty()) {
+// throw new CoolException("鏁版嵁閿欒,浠诲姟鏄庣粏涓嶅瓨鍦�!!");
+// }
BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
- .eq("dev_no", task.getStaNo()));
+ .eq("dev_no", param.getStation()));
if (Objects.isNull(station)) {
throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
}
- station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
- if (!basStationService.updateById(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("绔欑偣鐘舵�佷慨鏀瑰け璐�!");
+// }
+// basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
- // 浠诲姟瀹屾垚
- task.setWrkSts(15L);
-
- if (!taskService.updateById(task)) {
- throw new CoolException("AGV浠诲姟瀹屾垚澶辫触!!");
- }
+// // 浠诲姟瀹屾垚
+// task.setWrkSts(15L);
+//
+// if (!taskService.updateById(task)) {
+// throw new CoolException("AGV浠诲姟瀹屾垚澶辫触!!");
+// }
List<WaitPakin> waitPakins = waitPakinService
.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
@@ -1814,6 +1856,7 @@
.setOrderNo(orderPakin.getOrderNo())
.setDevNo(basStation.getDevNo())
.setBarcode(params.getTarBarcode())
+ .setZpallet(params.getTarBarcode())
.setBatch(combMat.getBatch())
.setStandby1(combMat.getStandby1())
.setAnfme(combMat.getWorkQty().doubleValue());
@@ -1946,6 +1989,7 @@
waitPakins.forEach(waitPakin -> {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
+ wrkDetl.setSuppCode(waitPakin.getSuppCode());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
@@ -1954,16 +1998,16 @@
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
});
- // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("zpallet", pakin.getZpallet());
- WaitPakin setParam = new WaitPakin();
- setParam.setLocNo(dto.getLocNo());
- setParam.setIoStatus("Y");
- setParam.setModiTime(now);
- if (!waitPakinService.update(setParam, wrapper)) {
- throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
- }
+// // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+// Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
+// .eq("zpallet", pakin.getZpallet());
+// WaitPakin setParam = new WaitPakin();
+// setParam.setLocNo(dto.getLocNo());
+// setParam.setIoStatus("Y");
+// setParam.setModiTime(now);
+// if (!waitPakinService.update(setParam, wrapper)) {
+// throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
+// }
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(now);
--
Gitblit v1.9.1