Browse Source

轮胎商城:1.确认盘点增加判断参数是否开启融资
2.确认调拨提示信息增加具体商品

纪新园 8 months ago
parent
commit
0af68a758e

+ 7 - 2
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -1117,6 +1117,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			List<PjGoodsDesc> finalPjGoodsDescList = pjGoodsDescList;
 			List<PjStockDesc> finalPjStockDescList = pjStockDescList;
 			List<PjProductLaunch> finalPjProductLaunchList = pjProductLaunchList;
+			String status = sysClient.getParamService("whether.financing");
 			order.getOrderItemsList().forEach(item -> {
 				item.setStatus(order.getStatus());
 				//获得商品
@@ -1140,8 +1141,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				}
 				if (stockOne != null) {
 					stockOne.setBalanceQuantity(item.getSendNum());
-					stockOne.setBalanceQuantityHave(item.getSendNumHave());
-					stockOne.setBalanceQuantityFinancing(item.getSendNumFinancing());
+					if (!"1".equals(status)) {
+						stockOne.setBalanceQuantityHave(item.getSendNum());
+					} else {
+						stockOne.setBalanceQuantityHave(item.getSendNumHave());
+						stockOne.setBalanceQuantityFinancing(item.getSendNumFinancing());
+					}
 					stockOne.setStoreInventory(stockOne.getBalanceQuantity());
 					stockOne.setInventoryAmount(item.getSubTotalMoney());
 					stockOne.setRebateInventoryAmount(item.getSendNum().multiply(stockOne.getRebatePrice()));

+ 3 - 3
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -3168,7 +3168,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					stockOneC.setVersion(stockOneC.getVersion());
 					pjStockDescArrayList.add(stockOneC);
 				} else {
-					throw new RuntimeException("未查到库存账");
+					throw new RuntimeException("商品:" + goodsDesc.getCname() + ",未查到库存账");
 				}
 				//调拨入库
 				LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapperR = new LambdaQueryWrapper<>();
@@ -3310,7 +3310,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					stockOneC.setVersion(stockOneC.getVersion());
 					pjStockDescArrayList.add(stockOneC);
 				} else {
-					throw new RuntimeException("未查到库存账");
+					throw new RuntimeException("商品:" + goodsDesc.getCname() + ",未查到库存账");
 				}
 				//调拨入库
 				LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapperR = new LambdaQueryWrapper<>();
@@ -3366,7 +3366,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					stockOneR.setVersion(stockOneR.getVersion());
 					pjStockDescArrayList.add(stockOneR);
 				} else {
-					throw new RuntimeException("未查到库存账");
+					throw new RuntimeException("商品:" + goodsDesc.getCname() + ",未查到库存账");
 				}
 				count++;
 			}