1.修改盘点逻辑，适配多种盘点类型

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductDetailRequest.java

@@ -32,4 +32,9 @@ public class FilterInvProductDetailRequest extends ListPageRequest {
     private String invSpaceCode;
     private List<String> invCodes;
 
+    /**
+     * 产品ID集合
+     */
+    private List<String> productIdList;
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java

@@ -216,7 +216,16 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
             invProductDetailRequest.setProductIdFk(productId);
             invProductDetailRequest.setInvStorageCode(invCountOrder.getInvStorageCode());
             invProductDetailRequest.setInvWarehouseCode(invCountOrder.getInvWarehouseCode());
-            invProductDetailRequest.setInvSpaceCode(invCountOrder.getInvSpaceCode());
+
+            if (invCountOrder.getCountType() == 1) {
+                //按照货位盘点，查询库存详情添加货位条件
+                invProductDetailRequest.setInvSpaceCode(invCountOrder.getInvSpaceCode());
+            } else if (invCountOrder.getCountType() == 2) {
+                //部分盘点，查询库存的产品信息
+                invProductDetailRequest.setProductIdList(countProductIds);
+            }
+
+
             List<InvProductDetailEntity> invProductDetailEntities = invProductDetailDao.filterInvProductDetail(invProductDetailRequest);
             if (CollUtil.isEmpty(invProductDetailEntities)) {
                 log.info("产品：" + productId + " 非当前仓库产品，添加到盘点入库单条码中");

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDetailDao.xml

@@ -57,6 +57,12 @@
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
             </if>
+            <if test="productIdList != null and productIdList.size() != 0">
+                AND productIdFk in
+                <foreach collection="productIdList" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="filterJoinInvProduct" parameterType="com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest"