From 5dac37cde0205be965c2b74dd1bddefc7f9cceda Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 26 三月 2025 08:56:57 +0800
Subject: [PATCH] Merge branch 'integrationWms' into mdqzasrs
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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 b08fe2a..2bdc4f2 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -2,7 +2,11 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
+import com.core.common.R;
+import com.zy.asrs.entity.FrozenParam;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
@@ -13,14 +17,24 @@
Page<LocDetl> getPage(Page<LocDetl> page);
- LocDetl selectItem(String locNo, String matnr, String batch);
+ List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO);
+
+ int selectAllCount(LocDetlDTO locDetlDTO);
+
+
+ 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);
+
+ Page<LocDetl> getStockStatis2(Page<LocDetl> page);
+
+ List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯＄硦鎼滅储
/**
* 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负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);
@@ -53,6 +67,8 @@
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);
+
Double queryStockAnfme(String matnr, String batch);
List<StockVo> queryStockTotal();
@@ -69,4 +85,14 @@
List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo);
List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo);
+
+ /**
+ * 鍐荤粨搴撳瓨
+ */
+ R frozenInventory(List<FrozenParam> param);
+
+ /**
+ * 搴撳瓨瑙ｅ喕
+ */
+ R unfreezeInventory(List<FrozenParam> param);
}
--
Gitblit v1.9.1