From a84386f98cc752516d492222684d5c850c9c7a1e Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 21 七月 2025 00:00:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqzasrs' into mdqzasrs
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index a715a08..49339f3 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -22,7 +22,7 @@
int selectAllCount(LocDetlDTO locDetlDTO);
- LocDetl selectItem(String locNo, String matnr, String batch);
+ LocDetl selectItem(String locNo, String matnr, String batch,String brand,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3);
Page<LocDetl> getStockOut(Page<LocDetl> page);
@@ -33,7 +33,8 @@
/**
* 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
*/
- boolean updateAnfme(Double anfme, String locNo, String matnr, String batch);
+ boolean updateAnfme(Double anfme, String locNo, String matnr
+ ,String batch,String brand,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3);
boolean updateLocNo(String newLocNo, String oldLocNo);
@@ -66,6 +67,10 @@
List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+ List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
+
+ List<LocDetl> queryStockAllNew(String orderNo, Set<String> locNos,String matnr, String batch, String model, Double volume);
+
Double queryStockAnfme(String matnr, String batch);
List<StockVo> queryStockTotal();
--
Gitblit v1.9.1