Merge branch 'master' of http://139.196.39.194:9021/cuidian/sen-yu-new-service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/PurchaseDeliverDetailVo.java

@@ -64,6 +64,8 @@ public class PurchaseDeliverDetailVo {
     private String syPackingDetailId;
     // 报关数量
     private BigDecimal actualDeclaredQuantity;
+    @ApiModelProperty(value = "批号")
+    private String batchNo;
 
     /**
      * 从面辅料装箱单生成
@@ -92,6 +94,7 @@ public class PurchaseDeliverDetailVo {
         syPackingDetailId = syPackingListFabricItem.getId();
         declarationUnit = syDeclarationElements.getDeclarationUnit();
         declarationName = syDeclarationElements.getDeclarationName();
+        batchNo = syPackingListFabricItem.getDyelotNumber();
     }
 
 }