From 34e0894214280018ac9de1bd0f8fe1ce5cd5a97f Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 29 十月 2024 16:28:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 15 +++++++++++++--
1 files changed, 13 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 7ff140e..d8580cc 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -13,12 +13,14 @@
LocDetl selectItem(String locNo, String matnr, String batch,String suppCode);
+ LocDetl selectItem(String locNo, String matnr, String batch, String csocode, String isoCode);
+
Page<LocDetl> getStockOut(Page<LocDetl> page);
/**
* 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
*/
- boolean updateAnfme(Double anfme, String locNo, String matnr, String batch);
+ boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String containerCode, String csoCode, String isoCode);
boolean updateLocNo(String newLocNo, String oldLocNo);
@@ -30,6 +32,11 @@
* @return locNo 搴撲綅鍙�
*/
List<String> getSameDetl(String matnr);
+
+ /**
+ * 鑾峰彇鐩稿悓瑙勬牸璐х墿
+ */
+ List<String> getSameLevDetl(String matnr, Integer lev);
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
@@ -71,6 +78,10 @@
List<String> selectLocNo(String matnr);
- Set<String> selectLocNo(String matnr, String batch, String csocode, String isocode);
+ Set<String> selectLocNos(String matnr);
+
+ LocDetl selectByContainerCode(String containerCode);
+
+ List<LocDetl> selectByLocWithoutContainer(String locNo);
}
--
Gitblit v1.9.1