Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

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

@@ -1,12 +1,15 @@
 package com.zkqy.business.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.zkqy.business.domain.ProductHandsetOutboundRecord;
+import com.zkqy.business.domain.ProductInvoice;
 import com.zkqy.business.domain.ProductWarehousingRecord;
 import com.zkqy.business.domain.vo.ProductCodeListVO;
 import com.zkqy.business.service.IProductHandsetOutboundRecordService;
+import com.zkqy.business.service.IProductInvoiceService;
 import com.zkqy.business.service.IProductWarehousingRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,6 +45,9 @@ public class ProductOutboundRecordController extends BaseController
     @Autowired
     private IProductHandsetOutboundRecordService productHandsetOutboundRecordService;
 
+    @Autowired
+    private IProductInvoiceService productInvoiceService;
+
     /**
      * 查询成品出库记录列表
      */
@@ -143,8 +149,15 @@ 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){
+        List<ProductCodeListVO> productCodeListVOS = new ArrayList<>();
+        ////根据销售单编号查询通知单编号
+        ProductInvoice productInvoice = productInvoiceService.selectProductInvoiceBySaleOrderNo(saleOrderNo);
+        if(productInvoice != null){
+            startPage();
+            productCodeListVOS = productOutboundRecordService.outboundDetails(productInvoice.getNoticeNumber());
+        }
+        return getDataTable(productCodeListVOS);
     }
 
 }

zkqy-custom-business/src/main/java/com/zkqy/business/service/IProductInvoiceService.java

@@ -77,4 +77,12 @@ public interface IProductInvoiceService
      */
     ProductInvoiceVO saleStorageDetails(Long id);
 
+    /**
+     * 查询产品发货单
+     *
+     * @param saleOrderNo 产品发货单主键
+     * @return 产品发货单
+     */
+    ProductInvoice selectProductInvoiceBySaleOrderNo(String saleOrderNo);
+
 }

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductInvoiceServiceImpl.java

@@ -200,6 +200,11 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService
         return vo;
     }
 
+    @Override
+    public ProductInvoice selectProductInvoiceBySaleOrderNo(String saleOrderNo) {
+        return productInvoiceMapper.selectProductInvoiceBySaleOrderNo(saleOrderNo);
+    }
+
     //保留两位小数
     public Double handlingWeight(Double weight){
         DecimalFormat df = new DecimalFormat("0.00");

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductOutboundRecordServiceImpl.java

@@ -106,12 +106,7 @@ public class ProductOutboundRecordServiceImpl implements IProductOutboundRecordS
     }
 
     @Override
-    public List<ProductCodeListVO> outboundDetails(String saleOrderNo) {
-        //根据销售单编号查询通知单编号
-        ProductInvoice productInvoice = productInvoiceMapper.selectProductInvoiceBySaleOrderNo(saleOrderNo);
-        if(productInvoice == null){
-            return new ArrayList<>();
-        }
-        return productOutboundRecordMapper.selectOutboundDetails(productInvoice.getNoticeNumber());
+    public List<ProductCodeListVO> outboundDetails(String noticeNumber) {
+        return productOutboundRecordMapper.selectOutboundDetails(noticeNumber);
     }
 }

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