面料改动

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabricItem.java

@@ -175,15 +175,15 @@ public class SyPackingListFabricItem implements Serializable {
     @Excel(name = "超发", width = 15)
 	@ApiModelProperty(value = "超发")
 	private java.math.BigDecimal excessQuantity;
-	/**剩余数量*/
-	@Excel(name = "剩余数量", width = 15)
-	@ApiModelProperty(value = "剩余数量")
+	/**发运明细剩余数量*/
+	@Excel(name = "发运明细剩余数量", width = 15)
+	@ApiModelProperty(value = "发运明细剩余数量")
 	private java.math.BigDecimal remainingQuantity;
-	/**剩余数量*/
+	/**计划数量*/
 	@Excel(name = "计划数量", width = 15)
 	@ApiModelProperty(value = "计划数量")
 	private java.math.BigDecimal planQuantity;
-	/**剩余数量*/
+	/**实际数量*/
 	@Excel(name = "实际数量", width = 15)
 	@ApiModelProperty(value = "实际数量")
 	private java.math.BigDecimal actualPackingQty;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -102,6 +102,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			entity.setPreDeliveryDate(detailsItem.getPreDeliveryDate());//hod
 			entity.setOrderNumber(detailsItem.getOrderNumber());//获取订单号
 			entity.setSmallPo(detailsItem.getSmallPo());//小po
+			entity.setInventoryQuantity(entity.getActualDeclaredQuantity());//入库数量=实际报关数量
 			entity.setDistributionPoint(detailsItem.getDistributionPoint());//分销点
 			entity.setPurOrSubOrder(detailsItem.getPurOrSubOrder());//采购委外订单号
 			entity.setFactoryUnitPrice(detailsItem.getFactoryUnitPrice());//工厂单价
@@ -127,6 +128,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			entity.setDelFlag("0");
 			//外键设置
 			entity.setSyPackingListFabricId(syPackingListFabric.getId());
+			entity.setInventoryQuantity(entity.getActualDeclaredQuantity());//入库数量=实际报关数量
 			if(entity.getIsAdd()>0){//大于1就是新增数据
 				entity.setId(null);
 				syPackingListFabricItemMapper.insert(entity);