查询、领料

zkqy-custom-business/src/main/java/com/zkqy/business/controller/RequisitionOrdersController.java

@@ -107,7 +107,7 @@ public class RequisitionOrdersController extends BaseController {
             // 实际领料 -》减物料库存
             Map<String, Map<String, Object>> retMap = requisitionOrdersService.reduceMaterialInventory(requisitionOrders);
             if (retMap.keySet().size() != 0) {
-                return AjaxResult.warn("部分物料无法完整领取", retMap);
+                return AjaxResult.warn("物料数量不足,无法领取！！", retMap);
             }
             requisitionOrdersService.updateRequisitionOrders(requisitionOrders);
             return AjaxResult.success("领料成功");

zkqy-custom-business/src/main/resources/mapper/business/ProductInventoryMapper.xml

@@ -354,6 +354,7 @@
         </if>
         <if test="productId != null">and pi.product_id = #{productId}</if>
         <if test="levels != null and levels != ''">and pi.levels = #{levels}</if>
+        <if test="productType != null and productType != ''">and p.product_type = #{productType}</if>
         <if test="lotNum != null and lotNum != ''">and pi.lot_num like concat('%', #{lotNum}, '%')</if>
         GROUP BY
         pi.product_id,