From ea311bea6773822a7672411a6967277379aefa68 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 18:25:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 fae83c0..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();
}
@@ -149,8 +163,8 @@
public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String csocode, String isocode) {
EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
- Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
wrapper.eq("loc_no", locNo);
+ Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
if (anfme <= 0) {
return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0;
} else {
@@ -165,7 +179,7 @@
if(Cools.isEmpty(condition)){
wrapper.andNew().eq(column,"").or().isNull(column);
}else {
- wrapper.eq(column,condition);
+ wrapper.andNew().eq(column,condition);
}
}
@@ -195,6 +209,11 @@
@Override
public Double selectSumAnfmeByLocNo(String locNo) {
return this.baseMapper.sumByLocNo(locNo);
+ }
+
+ @Override
+ public Double selectSumAnfmeByMatnr(String matnr) {
+ return this.baseMapper.sumByMatnr(matnr);
}
@Override
@@ -244,5 +263,8 @@
}
}
-
+ @Override
+ public void updateLocNo(String locNo, String sourceLoc, AgvLocDetl agvLocDetl) {
+ this.baseMapper.updateLocNo(locNo,sourceLoc,agvLocDetl.getSuppCode());
+ }
}
--
Gitblit v1.9.1