diff --git a/src/main/java/com/huaheng/api/general/service/BarCodeApiService.java b/src/main/java/com/huaheng/api/general/service/BarCodeApiService.java
index c2367f6..e8c277c 100644
--- a/src/main/java/com/huaheng/api/general/service/BarCodeApiService.java
+++ b/src/main/java/com/huaheng/api/general/service/BarCodeApiService.java
@@ -91,7 +91,6 @@ public class BarCodeApiService {
         }
         barCodeHeader.setCreatedBy(QuantityConstant.PLATFORM_MES);
         barCodeHeader.setBarCodeHeaderCode(header.getCode());
-        barCodeHeader.setReceiptNote(header.getReceiptNote());
         barCodeHeader.setEchelon(header.getEchelon());
         //barCodeHeader.setTotalQty(BigDecimal.ZERO);
         //barCodeHeader.setTotalLines(0);
@@ -120,9 +119,19 @@ public class BarCodeApiService {
             BigDecimal qty = detail.getQty();
             BigDecimal weight = detail.getWeight();
 
-            if (detail.getCode()==null || "".equals(detail.getCode())) { //没有子条码，属于拆解中的散装，只有重量没有数量，重量赋值给数量
+            //没有子条码，属于拆解中的散装，只有重量没有数量，重量赋值给数量
+            if (detail.getCode()==null || "".equals(detail.getCode())) {
                 qty=weight;
             }
+            try {
+                //ReceiptNote不为空，就把值给数量
+                if (header.getReceiptNote().trim().length()>0 || header.getReceiptNote()==null) {
+                    qty=new BigDecimal(header.getReceiptNote());
+                }
+            }catch (Exception e) {
+                throw new ServiceException("ReceiptNote字段非法异常："+header.getReceiptNote());
+            }
+
             totalQty=totalQty.add(qty);
             //totalWeight=totalWeight.add(weight);
             Material material = materialService.getOne(new LambdaQueryWrapper<Material>().eq(Material::getCode,materialCode));