入库明细统计修改

ruoyi-admin-vue/src/api/inventory/inbound_items.js

@@ -51,9 +51,10 @@ export function delInbound_items(id) {
 }
 
 // 统计入库单明细
-export function inbound_details(){
+export function inbound_details(query){
   return request({
     url: '/inventory/inbound_items/details',
-    method: 'get'
+    method: 'get',
+    params: query
   })
 }

ruoyi-admin-vue/src/views/inventory/inbound_items/index.vue

@@ -468,11 +468,11 @@ export default {
     // 根据字典类型和值，获取对应的listClass（标签样式）
     getDictListClass(dictType, value) {
       const dictList = this.dict.type[dictType] || []
-      if (!value) return 'info'
+      if (!value) return ''
       const dictItem = dictList.find(item => item.value === value+"")
 
       // 兼容raw和直接属性两种写法
-      return  dictItem?.raw?.listClass || 'info'
+      return dictItem?.raw?.listClass
     },
 
     // 根据字典类型和值，获取对应的显示标签

ruoyi-admin/src/main/java/com/ruoyi/web/controller/inventory/InboundOrderItemsController.java

@@ -141,7 +141,8 @@ public class InboundOrderItemsController extends BaseController
     public TableDataInfo itemDetails(InboundDetailsVO inboundDetailsVO) throws Exception
     {
         startPage();
-        List<InboundDetailsVO> list = inboundOrderItemsService.selectInboundDetailsVOBySapNo();
+        System.out.println(inboundDetailsVO);
+        List<InboundDetailsVO> list = inboundOrderItemsService.selectInboundDetailsVOBySapNo(inboundDetailsVO);
         return getDataTable(list);
     }
 }

ruoyi-inventory/src/main/java/com/ruoyi/inventory/mapper/InboundOrderItemsMapper.java

@@ -72,5 +72,5 @@ public interface InboundOrderItemsMapper
      * 统计入库单明细
      * @return 结果
      */
-    public List<InboundDetailsVO> selectInboundDetailsVOBySapNo();
+    public List<InboundDetailsVO> selectInboundDetailsVOBySapNo(InboundDetailsVO inboundDetailsVO);
 }

ruoyi-inventory/src/main/java/com/ruoyi/inventory/service/IInboundOrderItemsService.java

@@ -74,5 +74,5 @@ public interface IInboundOrderItemsService
      * 统计入库单明细
      * @return 结果
      */
-    public List<InboundDetailsVO> selectInboundDetailsVOBySapNo();
+    public List<InboundDetailsVO> selectInboundDetailsVOBySapNo(InboundDetailsVO inboundDetailsVO);
 }

ruoyi-inventory/src/main/java/com/ruoyi/inventory/service/impl/InboundOrderItemsServiceImpl.java

@@ -176,7 +176,7 @@ public class InboundOrderItemsServiceImpl implements IInboundOrderItemsService
     }
 
     @Override
-    public List<InboundDetailsVO> selectInboundDetailsVOBySapNo() {
-        return inboundOrderItemsMapper.selectInboundDetailsVOBySapNo();
+    public List<InboundDetailsVO> selectInboundDetailsVOBySapNo(InboundDetailsVO inboundDetailsVO) {
+        return inboundOrderItemsMapper.selectInboundDetailsVOBySapNo(inboundDetailsVO);
     }
 }

ruoyi-inventory/src/main/resources/mapper/inventory/InboundOrderItemsMapper.xml

@@ -336,7 +336,7 @@
         <result column="inbound_date" property="inboundDate"/>
     </resultMap>
 
-    <select id="selectInboundDetailsVOBySapNo" resultMap="InboundDetailsResultMap">
+    <select id="selectInboundDetailsVOBySapNo" resultMap="InboundDetailsResultMap" parameterType="com.ruoyi.inventory.domain.vo.InboundDetailsVO">
         SELECT
         ioi.material_id,
         ms.material_name,
@@ -358,7 +358,30 @@
         INNER JOIN materials ms ON ms.sap_no = ioi.material_id
         inner join warehouses w on ioi.warehouse_id = w.id
         inner join storage_locations sl on ioi.location_id = sl.id
-        WHERE io.order_status = 2
+        <where>
+        io.order_status = 2
+        <if test="materialId != null and materialId != ''">
+            AND ioi.material_id = #{materialId}
+        </if>
+        <if test="materialName != null and materialName != ''">
+            AND ms.material_name LIKE CONCAT('%', #{materialName}, '%')
+        </if>
+        <if test="orderId != null and orderId != ''">
+            AND ioi.order_id = #{orderId}
+        </if>
+        <if test="batchId != null and batchId != ''">
+            AND ioi.batch_id = #{batchId}
+        </if>
+        <if test="warehouseId != null and warehouseId != ''">
+            AND ioi.warehouse_id = #{warehouseId}
+        </if>
+        <if test="locationId != null and locationId != ''">
+            AND ioi.location_id = #{locationId}
+        </if>
+        <if test="labelColor != null and labelColor != ''">
+            AND ioi.label_color = #{labelColor}
+        </if>
+        </where>
         GROUP BY
         ioi.material_id,
         ioi.batch_id,