From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 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 48bc303..dd8f8d1 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,19 +3,33 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.result.StockVo;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
public interface LocDetlService extends IService<LocDetl> {
+
+ LocDetl selectItem(String locNo, String matnr, String batch);
Page<LocDetl> getStockOut(Page<LocDetl> page);
/**
* 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
*/
- boolean updateAnfme(Double anfme, String locNo, String matnr);
+ boolean updateAnfme(Double anfme, String locNo, String matnr, String batch);
+
+ boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String manu, String memo);
boolean updateLocNo(String newLocNo, String oldLocNo);
+
+ /**
+ * 鑾峰彇鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ * @param matnr 浜у搧鍙�
+ * @return locNo 搴撲綅鍙�
+ */
+ List<String> getSameDetl(String matnr);
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
@@ -24,8 +38,44 @@
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
-
Page<LocDetl> getStockStatis(Page<LocDetl> page);
+ Page<LocDetl> getStockStatis2(Page<LocDetl> page);
+ Page<LocDetl> getStockStatisOut(Page<LocDetl> page);
Double getSumAnfme(String matnr);
+
+ List<LocDetl> selectPakoutByRule(String matnr);
+
+ List<LocDetl> getAsrsLocDetl(String matnr);
+
+ Integer countLocNoNum(String locNo);
+
+ // --------------------------------------------------
+
+ List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+
+ Double queryStockAnfme(String matnr, String batch);
+
+ List<StockVo> queryStockTotal();
+
+
+ Integer sum();
+
+ List<LocDetl> unreason();
+
+ Double selectSumByMatnr(String matnr);
+
+ List<LocDetl> selectGroupPage(Map<String, Object> param, Integer curr, Integer limit);
+
+ List<LocDetl> selectByLocNo(String locNo);
+
+ List<LocDetl> selectByLocNosAndMatnr(List<String> locNos, String matnr);
+
+ List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯＄硦鎼滅储
+
+ List<LocDetl> findHighAreaByMatnr(String matnr);//閫氳繃鐗╂枡鍙锋煡璇㈤珮棰戝尯鍩�
+
+ List<LocDetl> findSingleAreaByMatnr(String matnr);//閫氳繃鐗╂枡鍙锋煡璇㈠崟鍝佸尯鍩�
+
+ List<LocDetl> findLowAreaByMatnr(String matnr);//閫氳繃鐗╂枡鍙锋煡璇綆棰戞贩鏀惧尯
}
--
Gitblit v1.9.1