From af332787938a5c6265dc06c189ffdd05794dada7 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期二, 28 四月 2026 14:25:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index a764efc..10c1a11 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.param.AbnormalLocDetlParam;
 import com.zy.asrs.entity.result.LocDetlAll;
 import com.zy.asrs.entity.result.LocDetlDTO;
 import com.zy.asrs.entity.result.StockVo;
@@ -49,6 +50,17 @@
     @Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end})  AND lm.loc_sts = 'F' AND DateDiff(dd, ld.appe_time, getdate()) = 0) ORDER BY ld.appe_time ASC")
     List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
 
+    @Select("select top 1 ld.* from asr_loc_detl ld left join asr_loc_mast lm on ld.loc_no = lm.loc_no " +
+            "where lm.crn_no = #{crnNo} and lm.loc_sts = 'F' and lm.frozen = 0 and lm.deleted = 0 and lm.whs_type = 1 " +
+            "and ld.appe_time is not null and (ld.frozen is null or ld.frozen = 0) " +
+            "order by ld.appe_time asc, ld.id asc")
+    LocDetl selectOldestLocDetl(@Param("crnNo") Integer crnNo);
+
+    @Select("select count(1) from asr_loc_detl ld left join asr_loc_mast lm on ld.loc_no = lm.loc_no " +
+            "where lm.crn_no = #{crnNo} and lm.frozen = 0 and lm.deleted = 0 and lm.whs_type = 1 " +
+            "and ld.matnr = #{matnr} and (ld.frozen is null or ld.frozen = 0)")
+    Integer countMatnrByCrnNo(@Param("crnNo") Integer crnNo, @Param("matnr") String matnr);
+
     List<String> selectSameDetlTodayBatch(@Param("matnr") String matnr,@Param("batch") String batch, @Param("start") Integer start, @Param("end") Integer end);
 
     List<LocDetl> getStockStatis(Map<String, Object> map);
@@ -56,6 +68,10 @@
     Integer getStockStatisCount(Map<String, Object> map);
 
     List<LocDetl> getStockStatis2(Map<String, Object> map);
+
+    List<AbnormalLocDetlParam> groupLocList(Map<String, Object> map);
+
+    Integer groupLocListCount(Map<String, Object> map);
 
     List<LocDetl> getStockStatisExcel();
 
@@ -71,6 +87,9 @@
     // -------------------------------------------------
 
     List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+    List<LocDetl> queryStockAll(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("batch")String batch,
+                                @Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
+                                @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3);
 
     Double queryStockAnfme(String matnr, String batch);
 

--
Gitblit v1.9.1