2022年10月27 19:13

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

@@ -788,8 +788,9 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			baseMapper.updateById(delivery);
 
 			Order temp = new Order();
-			temp.setId(select.getOrgId());
+			temp.setId(select.getOrgId());//采购主表id
 			temp.setOrderStatus("待收货");
+			temp.setActualDeliveryDate(select.getBusinessDate());
 			if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0){
 				temp.setDeliverQuantity(select.getTotalQuantity());
 			}else {
@@ -799,12 +800,13 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			orderDescClient.updateOrder(temp);
 
 			Order orderTemp = new Order();
-			orderTemp.setId(select.getSrcId());
+			orderTemp.setId(select.getSrcId());//销售主表id
 			orderTemp.setOrderStatus("待收货");
+			orderTemp.setActualDeliveryDate(select.getBusinessDate());
 			if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0){
-				temp.setDeliverQuantity(select.getTotalQuantity());
+				orderTemp.setDeliverQuantity(select.getTotalQuantity());
 			}else {
-				temp.setDeliverQuantity(BigDecimal.ZERO);
+				orderTemp.setDeliverQuantity(BigDecimal.ZERO);
 			}
 			orderTemp.setDeliverTime(date);
 			orderDescClient.updateOrder(orderTemp);
@@ -819,14 +821,24 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			Order temp = new Order();
 			temp.setId(select.getOrgId());
 			temp.setOrderStatus("待发货");
-			temp.setDeliverQuantity(select.getTotalQuantity());
+			temp.setActualDeliveryDate(select.getBusinessDate());
+			if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0){
+				temp.setDeliverQuantity(select.getTotalQuantity());
+			}else {
+				temp.setDeliverQuantity(BigDecimal.ZERO);
+			}
 			temp.setDeliverTime(date);
 			orderDescClient.updateOrder(temp);
 
 			Order orderTemp = new Order();
 			orderTemp.setId(select.getSrcId());
 			orderTemp.setOrderStatus("已发货");
-			orderTemp.setDeliverQuantity(select.getTotalQuantity());
+			orderTemp.setActualDeliveryDate(select.getBusinessDate());
+			if (select.getTotalQuantity().compareTo(BigDecimal.ZERO) == 0){
+				orderTemp.setDeliverQuantity(select.getTotalQuantity());
+			}else {
+				orderTemp.setDeliverQuantity(BigDecimal.ZERO);
+			}
 			orderTemp.setDeliverTime(date);
 			orderDescClient.updateOrder(orderTemp);
 		}