Jelajahi Sumber

保存销售明细单据时保存品牌id

liyuan 7 bulan lalu
induk
melakukan
368ec58727

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

@@ -1391,6 +1391,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					}
 					goodsName.append(goodsDesc.getCname()).append(",");
 					retrieval.append(goodsDesc.getCnameInt()).append(",");
+					item.setBrandId(goodsDesc.getBrandId());
 					item.setBrandName(goodsDesc.getBrandName());
 					item.setCostprie(item.getReturnsNumber().multiply(item.getCostpriePrice()));
 					item.setGrossProfit(item.getReturnsAmount().subtract(item.getCostprie()));
@@ -1504,6 +1505,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					item.setRebateCostprie(item.getReturnsNumber().multiply(item.getRebatePrice()));
 					item.setGrossProfit(item.getReturnsAmount().subtract(item.getCostprie()));
 					item.setRebateProfit(item.getReturnsAmount().subtract(item.getRebateCostprie()));
+					item.setBrandId(goodsDesc.getBrandId());
 					item.setBrandName(goodsDesc.getBrandName());
 				});
 				if (goodsName.length() > 0) {
@@ -3933,6 +3935,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				if (ObjectUtil.isEmpty(goodsDesc)) {
 					throw new RuntimeException("商品数据异常");
 				}
+				item.setBrandId(goodsDesc.getBrandId());
 				item.setBrandName(goodsDesc.getBrandName());
 				//计算成本
 				goodsName.append(goodsDesc.getCname()).append(",");
@@ -4914,6 +4917,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					if (ObjectUtil.isEmpty(goodsDesc)) {
 						throw new RuntimeException("商品数据异常");
 					}
+					item.setBrandId(goodsDesc.getBrandId());
 					item.setBrandName(goodsDesc.getBrandName());
 					if (!"JF".equals(order.getBsType())) {
 						if (!pjStockDescList.isEmpty()) {
@@ -5401,6 +5405,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					}
 					goodsName.append(goodsDesc.getCname()).append(",");
 					retrieval.append(goodsDesc.getCnameInt()).append(",");
+					item.setBrandId(goodsDesc.getBrandId());
 					item.setBrandName(goodsDesc.getBrandName());
 				}
 				orderItemsService.saveOrUpdateBatch(order.getOrderItemsList());