From d1963b1046b1b5d9b32aa27204c3cda5311a0ec4 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 13:15:30 +0800
Subject: [PATCH] # 再次拣料订单数量优化

---
 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 9dc37f9..2a2b8f0 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -93,7 +93,7 @@
                 //褰撳墠搴撲綅鎵�澶勬ゼ灞�
                 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;
@@ -120,6 +120,11 @@
     @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);
     }
 
     /*
@@ -245,15 +250,15 @@
             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鏉′互涓婅褰�");
             }
         }
     }

--
Gitblit v1.9.1