修改销售出库两种相同货品重量显示问题，重量小数点后保留两位

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

@@ -441,7 +441,8 @@ public class ProductInvoiceVO extends BaseEntity
         /** 实发重量 */
         private Double actualWeight;
 
-
+        /** 码单号 */
+        private String qrCode;
 
         public String getProductCode() {
             return productCode;
@@ -570,6 +571,14 @@ public class ProductInvoiceVO extends BaseEntity
         public void setActualWeight(Double actualWeight) {
             this.actualWeight = actualWeight;
         }
+
+        public String getQrCode() {
+            return qrCode;
+        }
+
+        public void setQrCode(String qrCode) {
+            this.qrCode = qrCode;
+        }
     }
 
 }

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

@@ -71,7 +71,7 @@ public interface ProductHandsetOutboundRecordMapper
     /**
      * 查询实发箱数、重量
      */
-    ProductHandsetOutboundRecord selectBoxNumSuttle(@Param("productId") Long productId,@Param("noticeNumber") String noticeNumber);
+    ProductHandsetOutboundRecord selectBoxNumSuttle(@Param("productId") Long productId,@Param("noticeNumber") String noticeNumber,@Param("qrCode") String qrCode);
 
 
 }

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

@@ -83,5 +83,5 @@ public interface ProductOutboundRecordMapper
      * @param noticeNumber
      * @return
      */
-    ProductOutboundRecord statisticsBoxNumSuttle(@Param("productId") Long productId,@Param("noticeNumber") String noticeNumber);
+    ProductOutboundRecord statisticsBoxNumSuttle(@Param("productId") Long productId,@Param("noticeNumber") String noticeNumber,@Param("qrCode") String qrCode);
 }

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

@@ -68,7 +68,16 @@ public class ProductCodeListServiceImpl implements IProductCodeListService
     @Override
     public List<ProductCodeListVO> selectProductCodeListList(ProductCodeListVO vo)
     {
-        return productCodeListMapper.selectProductCodeListList(vo);
+        List<ProductCodeListVO> productCodeListVOS = productCodeListMapper.selectProductCodeListList(vo);
+        for (ProductCodeListVO vo1 : productCodeListVOS){
+            vo1.setTotalSuttle(handlingWeight(vo1.getTotalSuttle()));
+        }
+        return productCodeListVOS;
+    }
+
+    public Double handlingWeight(Double weight){
+        DecimalFormat df = new DecimalFormat("0.00");
+        return Double.parseDouble(df.format(weight));
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.zkqy.business.service.impl;
 
+import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Map;
 
@@ -129,14 +130,15 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService
         }
         //表格数据
         //根据销售单编号查询货品信息
+        //销售单货品信息联查库存
         List<ProductInvoiceVO.SaleProductInfo> saleProductInfoList = saleProductsMapper.selectSaleProductsInfo(saleOrderNo);
         if(productInvoice != null){
             for (ProductInvoiceVO.SaleProductInfo saleProductInfo : saleProductInfoList){
                 //获取箱数重量
-                ProductOutboundRecord productOutboundRecord = productOutboundRecordMapper.statisticsBoxNumSuttle(saleProductInfo.getProductId(), productInvoice.getNoticeNumber());
+                ProductOutboundRecord productOutboundRecord = productOutboundRecordMapper.statisticsBoxNumSuttle(saleProductInfo.getProductId(), productInvoice.getNoticeNumber(),saleProductInfo.getQrCode());
                 if(productOutboundRecord != null){
                     saleProductInfo.setBoxNum(productOutboundRecord.getBoxNum());
-                    saleProductInfo.setWeight(productOutboundRecord.getSuttle() == null ? 0 : productOutboundRecord.getSuttle());
+                    saleProductInfo.setWeight(handlingWeight(productOutboundRecord.getSuttle() == null ? 0 : productOutboundRecord.getSuttle()));
                 }else {
                     saleProductInfo.setBoxNum(0);
                     saleProductInfo.setWeight(0.0);
@@ -155,7 +157,7 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService
         ProductInventory productInventory = productInventoryMapper.selectProductInventoryByLotNumAndProductId(productInventory1);
         if(productInventory != null){
             vo.setInventoryBoxNum(productInventory.getTotalBoxNum());
-            vo.setInventoryWeight(productInventory.getTotalSuttle());
+            vo.setInventoryWeight(handlingWeight(productInventory.getTotalSuttle()));
         }else {
             vo.setInventoryBoxNum(0);
             vo.setInventoryWeight(0.0);
@@ -178,10 +180,10 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService
         for (ProductInvoiceVO.SaleProductInfo saleProductInfo : saleProductInfoList){
             //实发箱数、重量
             ProductHandsetOutboundRecord productHandsetOutboundRecord =
-                    productHandsetOutboundRecordMapper.selectBoxNumSuttle(saleProductInfo.getProductId(), productInvoice.getNoticeNumber());
+                    productHandsetOutboundRecordMapper.selectBoxNumSuttle(saleProductInfo.getProductId(), productInvoice.getNoticeNumber(), saleProductInfo.getQrCode());
             if(productHandsetOutboundRecord != null){
                 saleProductInfo.setBoxNum(productHandsetOutboundRecord.getBoxNum());
-                saleProductInfo.setWeight(productHandsetOutboundRecord.getSuttle() == null ? 0 : productHandsetOutboundRecord.getSuttle());
+                saleProductInfo.setWeight(handlingWeight(productHandsetOutboundRecord.getSuttle() == null ? 0 : productHandsetOutboundRecord.getSuttle()));
             }
         }
 
@@ -190,4 +192,13 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService
         vo.setSaleProductInfoList(saleProductInfoList);
         return vo;
     }
+
+
+    //保留两位小数
+    public Double handlingWeight(Double weight){
+        DecimalFormat df = new DecimalFormat("0.00");
+        return Double.parseDouble(df.format(weight));
+    }
+
+
 }

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

@@ -215,7 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectBoxNumSuttle" resultType="com.zkqy.business.domain.ProductHandsetOutboundRecord">
-        select count(1) as boxNum , sum(suttle) as suttle from {DBNAME}.product_handset_outbound_record where product_id = #{productId} and notice_number = #{noticeNumber}
+        select count(1) as boxNum , sum(suttle) as suttle from {DBNAME}.product_handset_outbound_record where product_id = #{productId} and notice_number = #{noticeNumber} and qr_code = #{qrCode}
     </select>
 
 </mapper>

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

@@ -284,7 +284,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="statisticsBoxNumSuttle" resultType="com.zkqy.business.domain.ProductOutboundRecord">
-        select count(1) as boxNum , sum(suttle) as suttle from {DBNAME}.product_outbound_record where product_id = #{productId} and notice_number = #{noticeNumber}
+        select count(1) as boxNum , sum(suttle) as suttle from {DBNAME}.product_outbound_record where product_id = #{productId} and notice_number = #{noticeNumber} and qr_code = #{qrCode}
     </select>
 
 </mapper>

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

@@ -276,7 +276,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSaleProductsInfo" resultType="com.zkqy.business.domain.vo.ProductInvoiceVO$SaleProductInfo">
         SELECT
             a.*,
-            pi.levels
+            pi.levels,
+            pi.qr_code
         FROM
             (
                 SELECT