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

zkqy-custom-business/src/main/java/com/zkqy/business/mapper/ProductInventoryMapper.java

@@ -91,4 +91,11 @@ public interface ProductInventoryMapper {
      */
     int batchInsertProductInventory(List<ProductInventory> productInventoryList);
 
+    /**
+     * 查询库存信息
+     * @param productInventory
+     * @return
+     */
+    ProductInventory selectProductInventoryInfo(ProductInventory productInventory);
+
 }

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

@@ -181,10 +181,28 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService
         }else {
             //表格数据
             //根据销售单编号查询货品信息
-            List<ProductInvoiceVO.SaleProductInfo> saleProductInfoList = saleProductsMapper.selectSaleProductsInfo(saleOrderNo);
+//            List<ProductInvoiceVO.SaleProductInfo> saleProductInfoList = saleProductsMapper.selectSaleProductsInfo(saleOrderNo);
+            List<ProductInvoiceVO.SaleProductInfo> saleProductInfoList = saleProductsMapper.selectSaleProductsInfo1(saleOrderNo);
+
             if(productInvoice != null){
                 for (ProductInvoiceVO.SaleProductInfo saleProductInfo : saleProductInfoList){
 
+                    //查询库存信息
+                    if(saleProductInfo.getLotNum() != null){
+                        ProductInventory productInventory1 = new ProductInventory();
+                        productInventory1.setProductId(saleProductInfo.getProductId());
+                        productInventory1.setLotNum(saleProductInfo.getLotNum());
+                        productInventory1.setProductColour(saleProductInfo.getProductColor());
+
+                        ProductInventory productInventory = productInventoryMapper.selectProductInventoryInfo(productInventory1);
+
+                        if(productInventory != null){
+                            saleProductInfo.setLevels(productInventory.getLevels());
+                            saleProductInfo.setQrCode(productInventory.getQrCode());
+                        }
+                    }
+
+
                     //获取已出库箱数和重量
                     ProductOutboundRecord productOutboundRecord = productOutboundRecordMapper
                             .statisticsBoxNumSuttle1(saleProductInfo.getProductId(), productInvoice.getNoticeNumber(),saleProductInfo.getProductColor());
@@ -204,18 +222,24 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService
                 }
             }
             //查询当前批号库存箱数，重量
-            ProductInventory productInventory1 = new ProductInventory();
-            productInventory1.setProductId(saleProductInfoList.get(0).getProductId());
-            productInventory1.setLotNum(saleProductInfoList.get(0).getLotNum());
-            ProductInventory productInventory = productInventoryMapper.selectProductInventoryByLotNumAndProductId(productInventory1);
-            if(productInventory != null){
-                vo.setInventoryBoxNum(productInventory.getTotalBoxNum());
-                vo.setInventoryWeight(handlingWeight(productInventory.getTotalSuttle()));
+            if(saleProductInfoList.size() > 0){
+                ProductInventory productInventory1 = new ProductInventory();
+                productInventory1.setProductId(saleProductInfoList.get(0).getProductId());
+                productInventory1.setLotNum(saleProductInfoList.get(0).getLotNum());
+                ProductInventory productInventory = productInventoryMapper.selectProductInventoryByLotNumAndProductId(productInventory1);
+                if(productInventory != null){
+                    vo.setInventoryBoxNum(productInventory.getTotalBoxNum());
+                    vo.setInventoryWeight(handlingWeight(productInventory.getTotalSuttle()));
+                }else {
+                    vo.setInventoryBoxNum(0);
+                    vo.setInventoryWeight(0.0);
+                }
             }else {
                 vo.setInventoryBoxNum(0);
                 vo.setInventoryWeight(0.0);
             }
 
+
             //客户编号
             vo.setCustomerId(saleOrderMapper.selectCustomerIdBySaleNo(saleOrderNo));
             vo.setSaleProductInfoList(saleProductInfoList);

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

@@ -346,4 +346,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
 
+    <select id="selectProductInventoryInfo" parameterType="Long" resultMap="ProductInventoryResult">
+        <include refid="selectProductInventoryVo"/>
+        where del_flag = '0'
+        <if test="productId != null">and product_id = #{productId}</if>
+        <if test="lotNum != null">and lot_num = #{lotNum}</if>
+        <if test="productColour != null">and product_colour = #{productColour}</if>
+    </select>
+
 </mapper>