纪新园 пре 2 година
родитељ
комит
d1e3addc0c

+ 5 - 0
blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/DeliveryItems.java

@@ -341,6 +341,11 @@ public class DeliveryItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "库区id")
 	private Long storageId;
+	/**
+	 * 原订单数量
+	 */
+	@ApiModelProperty(value = "原订单数量")
+	private BigDecimal primaryQuantiy;
 
 	/**
 	 * 库区

+ 1 - 1
blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -675,7 +675,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			if ("CG".equals(deliveryItems.getBillType())) {
 				if ("681169".equals(AuthUtil.getTenantId())) {
 					stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().subtract(deliveryItems.getActualQuantity()));//结余数量
-					stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().add(deliveryItems.getPurchaseQuantity().subtract(deliveryItems.getActualQuantity())));//可用数量
+					stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().add(deliveryItems.getPrimaryQuantiy().subtract(deliveryItems.getActualQuantity())));//可用数量
 
 				} else {
 					//入库数量