zhangyuewww před 2 roky
rodič
revize
e600a88904

+ 1 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInventoryCountInfoServiceImpl.java

@@ -53,6 +53,7 @@ public class WarehouseInventoryCountInfoServiceImpl extends ServiceImpl<Warehous
                 * warehouseInventoryCountInfo.getPageSize());
                 * warehouseInventoryCountInfo.getPageSize());
         //  仓库ID
         //  仓库ID
         pageView.put("baseId", warehouseInventoryCountInfo.getBaseId());
         pageView.put("baseId", warehouseInventoryCountInfo.getBaseId());
+        pageView.put("warehouseName", warehouseInventoryCountInfo.getWarehouseName());
         //  仓位ID
         //  仓位ID
         pageView.put("positionId", warehouseInventoryCountInfo.getPositionId());
         pageView.put("positionId", warehouseInventoryCountInfo.getPositionId());
         pageView.put("pageSize", warehouseInventoryCountInfo.getPageSize());
         pageView.put("pageSize", warehouseInventoryCountInfo.getPageSize());

+ 6 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInventoryCountInfoMapper.xml

@@ -10,6 +10,9 @@
         base_id = #{baseId}
         base_id = #{baseId}
         and position_id = #{positionId}
         and position_id = #{positionId}
         and delete_flag = '0'
         and delete_flag = '0'
+        <if test="warehouseName != null and warehouseName != ''">
+            AND warehouse_name= #{warehouseName}
+        </if>
     </select>
     </select>
     <!-- 盘损记录查询 -->
     <!-- 盘损记录查询 -->
     <select id="getListByCondition" parameterType="Map"
     <select id="getListByCondition" parameterType="Map"
@@ -30,6 +33,9 @@
         base_id = #{baseId}
         base_id = #{baseId}
         and position_id = #{positionId}
         and position_id = #{positionId}
         and delete_flag = '0'
         and delete_flag = '0'
+        <if test="warehouseName != null and warehouseName != ''">
+            AND warehouse_name= #{warehouseName}
+        </if>
         ORDER BY create_date DESC
         ORDER BY create_date DESC
         <if test="currentPage != null and currentPage != ''">
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
             LIMIT ${startRecord}, ${pageSize}