From c27d3ae9d5130a230e1dcb59abd4e8851dceb9d6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 24 四月 2025 14:22:20 +0800
Subject: [PATCH] #新增盘点单号，页面修改
---
src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
index d8bc282..178acec 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
@@ -36,47 +36,47 @@
@Autowired
private WorkService workService;
- @Transactional(isolation = Isolation.REPEATABLE_READ)
- public ReturnT<String> start(Integer crnNo, Integer ioType) {
- try {
- //11 绌挎绉诲崟杈�
- if (ioType==11){
- for (int bay = 1;bay < 27;bay++){
- for (int lev = 1 ; lev <6 ; lev++){
- List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay,lev,crnNo);
- if (!Cools.isEmpty(locMasts) && locMasts.size()<4){
- for (LocMast locMast:locMasts){
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
- StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(),0, null, 0);
- workService.locMove(locMast.getLocNo(), startupDto.getLocNo(),9527L);
- }
- return SUCCESS;
- }
- }
- }
- }else {//11 鍗曡竟绉荤┛姊�
- List<Map<String, Object>> list = locDetlService.selectLocDetlUnilateralMoveShuttleMap(crnNo);//111 鍗曡竟绉荤┛姊�
- for (Map<String, Object> map : list) {
- String matnr = map.getOrDefault("matnr","").toString();//鐗╂枡鍙�
- String batch = map.getOrDefault("batch","").toString();//鎵瑰彿
- String grade = map.getOrDefault("brand","").toString();//绛夌骇
- int count = Integer.parseInt(map.get("count").toString());//鍗曡竟搴撴暟閲�
- if (count < 4) {
- continue;
- }
-
- List<LocDetl> locDetlList = locDetlService.selectLocDetlUnilateralMoveShuttle(matnr, batch, grade, crnNo);
- for (LocDetl locDetl : locDetlList) {
- StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(),0, null, 0);
- workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L);
- }
- }
- return SUCCESS;
- }
- }catch (Exception e){
- log.error("鑷姩绉诲簱鍑洪敊,鍫嗗灈鏈哄彿{}锛屽伐浣滅被鍨媨}",crnNo,ioType);
- }
- return SUCCESS;
- }
+// @Transactional(isolation = Isolation.REPEATABLE_READ)
+// public ReturnT<String> start(Integer crnNo, Integer ioType) {
+// try {
+// //11 绌挎绉诲崟杈�
+// if (ioType==11){
+// for (int bay = 1;bay < 27;bay++){
+// for (int lev = 1 ; lev <6 ; lev++){
+// List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay,lev,crnNo);
+// if (!Cools.isEmpty(locMasts) && locMasts.size()<4){
+// for (LocMast locMast:locMasts){
+// LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null);
+// workService.locMove(locMast.getLocNo(), startupDto.getLocNo(),9527L);
+// }
+// return SUCCESS;
+// }
+// }
+// }
+// }else {//11 鍗曡竟绉荤┛姊�
+// List<Map<String, Object>> list = locDetlService.selectLocDetlUnilateralMoveShuttleMap(crnNo);//111 鍗曡竟绉荤┛姊�
+// for (Map<String, Object> map : list) {
+// String matnr = map.getOrDefault("matnr","").toString();//鐗╂枡鍙�
+// String batch = map.getOrDefault("batch","").toString();//鎵瑰彿
+// String grade = map.getOrDefault("brand","").toString();//绛夌骇
+// int count = Integer.parseInt(map.get("count").toString());//鍗曡竟搴撴暟閲�
+// if (count < 4) {
+// continue;
+// }
+//
+// List<LocDetl> locDetlList = locDetlService.selectLocDetlUnilateralMoveShuttle(matnr, batch, grade, crnNo);
+// for (LocDetl locDetl : locDetlList) {
+// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null);
+// workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L);
+// }
+// }
+// return SUCCESS;
+// }
+// }catch (Exception e){
+// log.error("鑷姩绉诲簱鍑洪敊,鍫嗗灈鏈哄彿{}锛屽伐浣滅被鍨媨}",crnNo,ioType);
+// }
+// return SUCCESS;
+// }
}
--
Gitblit v1.9.1