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/mapper/ManLocDetlMapper.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
index 59f54e1..c37099b 100644
--- a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
@@ -1,6 +1,7 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.result.StockVo;
import org.apache.ibatis.annotations.Mapper;
@@ -42,7 +43,7 @@
List<ManLocDetl> getStockStatisExcel();
- @Select("select sum(a.anfme) as sum from asr_loc_detl a left join asr_loc_mast b on a.loc_no = b.loc_no where b.loc_sts = 'F' and a.matnr = #{matnr}")
+ @Select("select sum(a.anfme) as sum from man_loc_detl where matnr = #{matnr}")
Double selectSumAnfmeByMatnr(@Param("matnr") String matnr);
List<ManLocDetl> selectPakoutByRule(String matnr);
@@ -53,14 +54,14 @@
// -------------------------------------------------
- List<ManLocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+ List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp, @Param("temp1")String temp1, @Param("temp2")String temp2);
Double queryStockAnfme(String matnr, String batch);
List<StockVo> queryStockTotal();
- Integer sum();
+ Double sum();
List<ManLocDetl> unreason();
@@ -79,4 +80,8 @@
List<ManLocDetl> listByOutPage(Map<String, Object> condition);
long listByOutPageCount(Map<String, Object> condition);
+
+ List<ManLocDetl> selectAllPage(Map<String, Object> condition);
+
+ long selectAllPageSize(Map<String, Object> condition);
}
--
Gitblit v1.9.1