仓库导出修改

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.java

@@ -48,6 +48,6 @@ public interface StGoodsExtMapper extends BaseMapper<StGoodsExt> {
 
 	Double getPlanQty(Long goodsId);
 
-	List<StGoodsExtExcel> exportStGoodsExt(Map<String, Object> stGoodsExt);
+	List<StGoodsExtExcel> exportStGoodsExt(@Param("stGoodsExt") Map<String, Object> stGoodsExt);
 }
 

blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsExtMapper.xml

@@ -155,28 +155,28 @@
         LEFT JOIN BLADE_USER u ON se.turnover = u.id
         WHERE se.is_deleted = 0
         <!-- 3. 商品编码：可选条件，传了就过滤，没传不生效（模糊查询，业务常用） -->
-        <if test="param2.goodsCode != null and param2.goodsCode != ''">
+        <if test="stGoodsExt.goodsCode != null and stGoodsExt.goodsCode != ''">
-            AND g.goods_code = #{param2.goodsCode}
+            AND g.goods_code = #{stGoodsExt.goodsCode}
         </if>
         <!-- 4. 物料名称：新增可选条件，传了就过滤，没传不生效（模糊查询，同编码格式） -->
-        <if test="param2.goodsName != null and param2.goodsName != ''">
+        <if test="stGoodsExt.goodsName != null and stGoodsExt.goodsName != ''">
-            AND g.goods_name LIKE '%' || #{param2.goodsName} || '%'
+            AND g.goods_name LIKE '%' || #{stGoodsExt.goodsName} || '%'
         </if>
         <!-- 5. 周转工：新增可选条件，传了就过滤，没传不生效（精准匹配，数值类型） -->
-        <if test="param2.turnover != null">
+        <if test="stGoodsExt.turnover != null">
-            AND se.turnover = #{param2.turnover}
+            AND se.turnover = #{stGoodsExt.turnover}
         </if>
         <!-- 6. 物料状态：新增可选条件，传了就过滤，没传不生效（精准匹配，数值类型） -->
-        <if test="param2.goodsStatus != null">
+        <if test="stGoodsExt.goodsStatus != null">
-            AND se.goods_status = #{param2.goodsStatus}
+            AND se.goods_status = #{stGoodsExt.goodsStatus}
         </if>
 
-        <if test="param2.delivery != null">
+        <if test="stGoodsExt.delivery != null">
-            AND se.delivery = #{param2.delivery}
+            AND se.delivery = #{stGoodsExt.delivery}
         </if>
 
-        <if test="param2.special != null">
+        <if test="stGoodsExt.special != null">
-            AND se.special = #{param2.special}
+            AND se.special = #{stGoodsExt.special}
         </if>
 
         ORDER BY se.create_time DESC