From c28c70ac1507df7a9e17e97474fd7d2c368fc673 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 09:22:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 65121a2..9453e7a 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -86,14 +86,15 @@
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 locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNoWrkDtel, anfme,agvLocDetl.getProcessSts());
locDto.setCsocode(csocode);
locDto.setIsoseq(isoseq);
locDto.setContainerCode(agvLocDetl.getSuppCode());
+ locDto.setProcessSts(agvLocDetl.getProcessSts());
//褰撳墠搴撲綅鎵�澶勬ゼ灞�
int floor = Integer.parseInt(agvLocDetl.getLocNo().split("F")[1]);
//locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
- locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1()));
+ locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(),floor));
locDtoList.add(locDto);
issued -= anfme;
@@ -117,9 +118,24 @@
return page;
}
+ @Override
+ public Double getSumAnfme(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnr(matnr, threeCode);
+ }
+
+ @Override
+ public Double getSumAnfmeProcess(String matnr, String threeCode) {
+ return this.baseMapper.selectSumAnfmeByMatnrProcess(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();
}
@@ -160,6 +176,7 @@
} else {
AgvLocDetl agvLocDetl = this.selectOne(wrapper);
agvLocDetl.setAnfme(anfme);
+ agvLocDetl.setModiTime(new Date());
return this.baseMapper.updateAnfme(locNo,anfme,matnr,batch,csocode,isocode) > 0;
}
}
@@ -240,16 +257,21 @@
Row row = sheet.getRow(i);
// 搴撲綅鍙�
String locNo = dataFormatter.formatCellValue(row.getCell(0));
- // 瀹瑰櫒鐮�
+ // 璐ф灦鐮�
String containerCode = dataFormatter.formatCellValue(row.getCell(1));
List<AgvLocDetl> agvLocDetls = this.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("supp_code", containerCode));
if(Cools.isEmpty(agvLocDetls)){
- log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屼笉瀛樺湪鏄庣粏");
+ log.info("搴撲綅鍙凤細" + locNo + "锛岃揣鏋剁爜锛�" + containerCode + "锛屼笉瀛樺湪鏄庣粏");
}
if(agvLocDetls.size()>1){
- log.info("搴撲綅鍙凤細" + locNo + "锛屽鍣ㄧ爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�");
+ log.info("搴撲綅鍙凤細" + locNo + "锛岃揣鏋剁爜锛�" + containerCode + "锛屽瓨鍦�1鏉′互涓婅褰�");
}
}
}
+
+ @Override
+ public void updateLocNo(String locNo, String sourceLoc, AgvLocDetl agvLocDetl) {
+ this.baseMapper.updateLocNo(locNo,sourceLoc,agvLocDetl.getSuppCode());
+ }
}
--
Gitblit v1.9.1