From 3599feef955e2dcf974ecefeaeb7b28cacb97a73 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 19 四月 2025 08:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/asrs/service/ManLocDetlService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/ManLocDetlService.java b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
index 63b5350..7d3d0e8 100644
--- a/src/main/java/com/zy/asrs/service/ManLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.ManLocDetl;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
@@ -41,14 +43,14 @@
// --------------------------------------------------
- List<ManLocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+ List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
Double queryStockAnfme(String matnr, String batch);
List<StockVo> queryStockTotal();
- Integer sum();
+ Double sum();
List<ManLocDetl> unreason();
@@ -57,5 +59,9 @@
Page<ManLocDetl> getOutPage(Page<ManLocDetl> manLocDetlPage);
+ void adjustLocDetl(LocDetlAdjustParam param, Long userId);
+ Page<ManLocDetl> selectAllPage(Page<ManLocDetl> param);
+
+ List<ManLocDetl> getStockStatisExcel();
}
--
Gitblit v1.9.1