From 2c945116a7d4dccac387930e40980ae1ba32f05c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 30 三月 2024 16:18:58 +0800
Subject: [PATCH] 物料导入更新 任务完成不解绑站点和容器 组托入库时增加判断是否容器和接驳位已经绑定
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 12add0c..65121a2 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -82,14 +82,18 @@
double anfme = agvLocDetl.getAnfme();
//int ioType = anfme > issued ? 101 : 103;
anfme = anfme > issued ? issued : anfme;
- LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNo, anfme);
+ //鐢ㄤ簬鏄剧ず宸ヤ綔鏄庣粏妗ｇ殑璁㈠崟鍙�
+ String orderNoWrkDtel = Utils.getOrderNo(orderNo,anfme);
+ //鏇存柊璁㈠崟鏁伴噺
+ orderNo = Utils.orderMergeUpdate(orderNo,anfme);
+ LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNoWrkDtel, anfme);
locDto.setCsocode(csocode);
locDto.setIsoseq(isoseq);
locDto.setContainerCode(agvLocDetl.getSuppCode());
//褰撳墠搴撲綅鎵�澶勬ゼ灞�
- int floor = Integer.parseInt(agvLocDetl.getLocNo().split("@")[1]);
+ int floor = Integer.parseInt(agvLocDetl.getLocNo().split("F")[1]);
//locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
- locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByFloor(floor));
+ locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1()));
locDtoList.add(locDto);
issued -= anfme;
@@ -248,6 +252,4 @@
}
}
}
-
-
}
--
Gitblit v1.9.1