2022年11月4 13:33

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

@@ -400,7 +400,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			delivery.setUpdateTime(new Date());
 
 			Order orderTemp = new Order();
-			orderTemp.setId(select.getSrcId());
+			orderTemp.setId(select.getOrgId());
 			if (delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType())) {
 				Date date = new Date();
 				delivery.setFreightQuantity(delivery.getTotalQuantity());
@@ -789,7 +789,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			baseMapper.updateById(delivery);
 
 			Order temp = new Order();
-			temp.setId(select.getOrgId());//采购主表id
+			temp.setId(select.getOrgId());//销售主表id
 			temp.setOrderStatus("待收货");
 			temp.setActualDeliveryDate(select.getBusinessDate());
 			if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0){
@@ -801,7 +801,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			orderDescClient.updateOrder(temp);
 
 			Order orderTemp = new Order();
-			orderTemp.setId(select.getSrcId());//销售主表id
+			orderTemp.setId(select.getSrcId());//采购主表id
 			orderTemp.setOrderStatus("待收货");
 			orderTemp.setCreateDeliver(1);
 			orderTemp.setCreateDeliverUser(AuthUtil.getUserId().toString());

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -1767,7 +1767,7 @@ ORDER BY
             SUM( BOI.quantity ) AS quantity,
             SUM( BO.this_used_profit ) AS thisUsedProfit,
             ( SUM( BO.debit_amount ) / SUM( BOI.quantity ) ) AS price,
-            SUM( BO.gross_profit ) + (-SUM( BO.this_used_profit )) / SUM( BOI.quantity ) AS singleGrossProfit,
+            (SUM( BO.gross_profit ) + (-SUM( BO.this_used_profit ))) / SUM( BOI.quantity ) AS singleGrossProfit,
             SUM( BO.predict_ocean_freight ) AS predictOceanFreight,
             SUM( BO.gross_profit )  AS netGrossProfit,
             SUM( BO.gross_profit ) + (-SUM( BO.this_used_profit )) AS grossProfit,