From a23b44f21f596c5500bda617050aa72125e2e701 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 07 十月 2023 12:49:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index e80ba27..41f917f 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -4,13 +4,14 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.common.model.LocDto;
import java.util.List;
import java.util.Set;
public interface LocDetlService extends IService<LocDetl> {
- LocDetl selectItem(String locNo, String matnr, String batch);
+ LocDetl selectItem(String locNo, String matnr, String batch,String suppCode);
Page<LocDetl> getStockOut(Page<LocDetl> page);
@@ -21,16 +22,18 @@
boolean updateLocNo(String newLocNo, String oldLocNo);
+ int updateStockFreeze(String matnr, String locNo, Integer stockFreeze);
+
/**
* 鑾峰彇鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
* @param matnr 浜у搧鍙�
* @return locNo 搴撲綅鍙�
*/
- List<String> getSameDetl(String matnr, Integer start, Integer end);
+ List<String> getSameDetl(String matnr);
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
- * @param matnr 鍟嗗搧缂栧彿
+ * @param matnr 鐗╂枡鍙�
* @return locNo 搴撲綅鍙�
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
@@ -49,6 +52,8 @@
List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+ double queryStockAndSetLocDto(String matnr, String batch, String orderNo, List<LocDto> locDtoList, double issued, String csocode, String isoseq);
+
Double queryStockAnfme(String matnr, String batch);
List<StockVo> queryStockTotal();
@@ -58,4 +63,8 @@
List<LocDetl> unreason();
+ List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯＄硦鎼滅储
+
+ List<LocDetl> selectByLocNo(String locNo);
+
}
--
Gitblit v1.9.1