Browse Source

零售单出库明细分页

xuezizhuo 1 year ago
parent
commit
60f20fec0f

+ 4 - 2
zkqy-custom-business/src/main/java/com/zkqy/business/controller/ProductOutboundRecordController.java

@@ -143,8 +143,10 @@ public class ProductOutboundRecordController extends BaseController
      * 销售单/零售单出库明细记录
      */
     @GetMapping("/outboundDetails")
-    public AjaxResult outboundDetails(@RequestParam String saleOrderNo){
-        return AjaxResult.success(productOutboundRecordService.outboundDetails(saleOrderNo));
+    public TableDataInfo outboundDetails(@RequestParam String saleOrderNo){
+        startPage();
+        List<ProductCodeListVO> productCodeListVOS = productOutboundRecordService.outboundDetails(saleOrderNo);
+        return getDataTable(productCodeListVOS);
     }
 
 }

+ 1 - 1
zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml

@@ -373,7 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                   AND sp.sale_order_no = #{saleOrderNo}
             ) AS a
                 LEFT JOIN {DBNAME}.product_inventory pi ON a.productId = pi.product_id
-                AND a.lotNum = pi.lot_num AND pi.del_flag = '0'
+                 AND pi.del_flag = '0' and pi.total_suttle > 0
     </select>
 
     <select id="selectOutboundOrderInfo" resultType="com.zkqy.business.domain.vo.SaleProductsVo">