Merge remote-tracking branch 'origin/master'

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/java/com/zkqy/business/controller/SaleRegistrationCollectionController.java

@@ -66,7 +66,7 @@ public class SaleRegistrationCollectionController extends BaseController {
     /**
      * 获取收款登记详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:SaleRegistrationCollection:query')")
+    @PreAuthorize("@ss.hasPermi('system:SaleRegistrationCollection:edit')")
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "获取收款登记详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {

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,

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

@@ -156,7 +156,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="productDescribe != null  and productDescribe != ''"> and product_describe = #{productDescribe}</if>
         <if test="productUnit != null  and productUnit != ''"> and product_unit = #{productUnit}</if>
         <if test="productTypeNo != null "> and product_type_no = #{productTypeNo}</if>
-        group by product_name
         order by product_name asc
     </select>
 

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

@@ -376,7 +376,7 @@
           AND sale_craft.del_flag = 0
           AND materiel.del_flag = 0
           AND sale_order.del_flag = 0
-          AND sale_order.status = 3
-          and sale_products.on_board_state != 3 -- 过滤已完成的任务
+          AND sale_order.`status` > 2 AND sale_order.`status` < 7
+          AND sale_products.on_board_state != 12 -- 过滤已完成的任务111111
     </select>
 </mapper>