现场问题解决

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/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>