From 4dbb96434dceef64f00cc118853e131b04bf6ba1 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 11 四月 2024 14:12:25 +0800
Subject: [PATCH] 根据入库单与销售单查询库存

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index ffcc871..00fe50d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -58,6 +58,11 @@
     }
 
     @Override
+    public List<String> getSameLevDetl(String matnr, Integer lev) {
+        return this.baseMapper.selectSameLevDetl(matnr, lev);
+    }
+
+    @Override
     public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
         return this.baseMapper.selectSameDetlToday(matnr, start, end);
     }
@@ -118,7 +123,13 @@
                 double anfme = locDetl.getAnfme();
                 int ioType = anfme > issued ? 103 : 101;
                 anfme = anfme > issued ? issued : anfme;
-                LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNo, anfme);
+
+                //鐢ㄤ簬鏄剧ず宸ヤ綔鏄庣粏妗g殑璁㈠崟鍙�
+                String orderNoWrkDtel = Utils.getOrderNo(orderNo,anfme);
+                //鏇存柊璁㈠崟鏁伴噺
+                orderNo = Utils.orderMergeUpdate(orderNo,anfme);
+
+                LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNoWrkDtel, anfme);
 
                 List<Integer> outSite = basDevpService.getAvailableOutSite(101);
                 List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);

--
Gitblit v1.9.1