2023年7月27日17:43:46

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

@@ -667,8 +667,9 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		} else {
 			if ("CG".equals(deliveryItems.getBillType())) {
 				if ("681169".equals(AuthUtil.getTenantId())) {
-					stockGoods.setBalanceQuantity(stockGoods.getSurplusRouteQuantity().subtract(deliveryItems.getArrivalQuantity()));//结余数量
-					stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().subtract(deliveryItems.getArrivalQuantity()));//可用数量
+					stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().subtract(deliveryItems.getArrivalQuantity()));//结余数量
+					stockGoods.setSurplusRouteQuantity(stockGoods.getBalanceQuantity().subtract(stockGoods.getLockingQuantity()));//可用数量
+
 				} else {
 					//入库数量
 					stockGoods.setInDate(new Date());//入库日期
@@ -691,7 +692,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				}
 			}else{
 				if ("681169".equals(AuthUtil.getTenantId())) {
-					stockGoods.setBalanceQuantity(stockGoods.getSurplusRouteQuantity().subtract(deliveryItems.getArrivalQuantity()));//结余数量
+					stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().subtract(deliveryItems.getArrivalQuantity()));//结余数量
 					stockGoods.setSurplusRouteQuantity(stockGoods.getBalanceQuantity().subtract(stockGoods.getLockingQuantity()));//可用数量
 				}
 			}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -848,7 +848,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 						StockGoods stock = model;
 						//达沃特新需求-禅道860中体现-国内-采购确认-不增加库存
 						if (ObjectUtils.isNotNull(sysClient.getParamService("inventory")) && "1".equals(sysClient.getParamService("inventory"))) {
-							//修改库存单 只修改库存  添加库存在上边
+							//修改库存单 只修改库存  添加库存在下边
 							if (stock != null) {
 								StockGoods stockGoods = iDeliveryItemsService.receivingInventory(stock, e);
 								stockGoods.setVersion(stock.getVersion());