From 0ff66508469ce993b771fe63085f7039a430999c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 27 一月 2026 16:33:42 +0800
Subject: [PATCH] 1.捡货单打印里面显示备注和发货时间 2.拣货单界面,仓库管理员角色拣货单发货时间超过当天16:00则当天不显示

---
 src/main/java/com/zy/asrs/mapper/PlaMapper.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/PlaMapper.java b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
index 7c03a65..30ea888 100644
--- a/src/main/java/com/zy/asrs/mapper/PlaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.mapper;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.DropdownValuesDto;
 import com.zy.asrs.entity.Pla;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,12 +20,18 @@
     List<Pla> getStockStatisAllByBrand(@Param("brand") String brand);
 
 //    @Select("select brand, matnr,workshop , sum(weight_anfme) as weight from asr_pla_detl GROUP BY brand,matnr,workshop ORDER BY matnr,workshop desc")
-    List<Pla> getStockStatisAll(@Param("brand") String brand,@Param("status") String status,@Param("stime") Date stime, @Param("etime") Date etime);
+    List<Pla> getStockStatisAll(@Param("brand") String brand,@Param("status") String status,@Param("stime") Date stime, @Param("etime") Date etime,
+                                @Param("type") String type,@Param("workshop") String workshop,@Param("transfer") String transfer);
 
 
     Integer getStockStatisCountAll(Map<String, Object> map);
 
     /**
+     * 鑾峰彇涓嬫媺鍒楄〃鍊�
+     */
+    List<DropdownValuesDto> getDropdownValues();
+
+    /**
      * 鑷姩瑙e喕鍐荤粨鏃堕棿瓒呰繃90澶╃殑搴撳瓨
      * @return 鏇存柊鏁伴噺
      */

--
Gitblit v1.9.1