修改出库发货，打印单据逻辑

zkqy-custom-business/src/main/java/com/zkqy/business/domain/vo/ProductCodeListVO.java

@@ -261,6 +261,16 @@ public class ProductCodeListVO extends BaseEntity {
     // 是否累加批次库存
     private boolean isLotNum;
 
+    private String productNo;
+
+    public String getProductNo() {
+        return productNo;
+    }
+
+    public void setProductNo(String productNo) {
+        this.productNo = productNo;
+    }
+
     public boolean getIsLotNum() {
         return isLotNum;
     }

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

@@ -184,23 +184,40 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService
 //            List<ProductInvoiceVO.SaleProductInfo> saleProductInfoList = saleProductsMapper.selectSaleProductsInfo(saleOrderNo);
             List<ProductInvoiceVO.SaleProductInfo> saleProductInfoList = saleProductsMapper.selectSaleProductsInfo1(saleOrderNo);
 
+            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());
+                    }
+                }
+            }
+
             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());
-                        }
-                    }
+//                    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());
+//                        }
+//                    }
 
 
                     //获取已出库箱数和重量

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

@@ -346,12 +346,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
 
-    <select id="selectProductInventoryInfo" parameterType="Long" resultMap="ProductInventoryResult">
+    <select id="selectProductInventoryInfo"  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>
+        and product_id = #{productId} and lot_num = #{lotNum}
+         and product_colour = #{productColour}
+         group by product_id,lot_num,product_colour
     </select>
 
 </mapper>

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

@@ -87,6 +87,7 @@
         <result property="productColour" column="product_colour"/>
         <result property="customName" column="custom_name"/>
         <result property="productUnitPrice" column="product_unit_price"/>
+        <result property="productNo" column="product_no"/>
     </resultMap>
 
     <sql id="selectProductOutboundRecordVo">
@@ -370,13 +371,14 @@
     <select id="selectOutboundProduct" parameterType="com.zkqy.business.domain.vo.ProductCodeListVO" resultMap="ProductCodeListResultVO">
         SELECT
             r.*,
+            p.product_no,
             p.product_name,
             p.product_specifications,
             r.product_colour AS product_color,
             c.custom_name,
-            TRUNCATE ( SUM( r.suttle ), 2 ) AS totalSuttle,
-            count(r.id) AS totalBoxNum,
-            sp.product_unit_price as productUnitPrice
+            TRUNCATE ( SUM( r.suttle ), 2 ) AS total_suttle,
+            count(r.id) AS total_box_num,
+            sp.product_unit_price as product_unit_price
         FROM
             {DBNAME}.product_outbound_record r
                 LEFT JOIN {DBNAME}.production p ON r.product_id = p.id