From 1a8e7f30035b45771d05cd4cc99aae2743576112 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 17 五月 2024 00:16:46 +0800
Subject: [PATCH] # 手动调拨
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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..6f91a5b 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(),floor));
locDtoList.add(locDto);
issued -= anfme;
@@ -113,9 +117,19 @@
return page;
}
+ @Override
+ public Double getSumAnfme(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnr(matnr, threeCode);
+ }
+
+ @Override
+ public Double getSumAnfmeDb(String matnr, String threeCode,Integer floor) {
+ return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor);
+ }
+
/*
- 鑾峰彇搴撳瓨鎬绘暟
- */
+ 鑾峰彇搴撳瓨鎬绘暟
+ */
public Integer sum() {
return this.baseMapper.sum();
}
@@ -249,5 +263,8 @@
}
}
-
+ @Override
+ public void updateLocNo(String locNo, String sourceLoc, AgvLocDetl agvLocDetl) {
+ this.baseMapper.updateLocNo(locNo,sourceLoc,agvLocDetl.getSuppCode());
+ }
}
--
Gitblit v1.9.1