创融峻合 2023年6月12日18:12:46

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

@@ -1081,25 +1081,6 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				delivery.setFreightTime(date);
 				delivery.setFreightUser(AuthUtil.getUserName());
 				baseMapper.updateById(delivery);
-
-				Order temp = new Order();
-				temp.setId(select.getSrcId());//销售主表id
-				if (ObjectUtils.isNotNull(orderStatus.getReceivingStatus()) && "已收货".equals(orderStatus.getReceivingStatus())) {
-					temp.setOrderStatus("已完成");
-				}
-				temp.setPurchaseStatus("已发货");
-				temp.setCreateDeliver(1);
-				temp.setCreateDeliverUser(AuthUtil.getUserId().toString());
-				temp.setCreateDeliverTime(date);
-				temp.setActualDeliveryDate(date);
-				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.getOrgId());//采购主表id
 				orderTemp.setOrderStatus("待收货");

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/SalesPolicyItemServiceImpl.java

@@ -110,11 +110,11 @@ public class SalesPolicyItemServiceImpl extends ServiceImpl<SalesPolicyItemMappe
 
 			list.forEach(salesPolicyItem -> {
 				if (ObjectUtil.isNotEmpty(updateUserList)) {
-					salesPolicyItem.setUpdateUserName(updateUserList.stream().filter(e -> e.getId().equals(salesPolicyItem.getUpdateUser())).findFirst().get().getName());
+					salesPolicyItem.setUpdateUserName(updateUserList.stream().filter(e -> e.getId().equals(salesPolicyItem.getUpdateUser())).findFirst().orElse(new User()).getName());
 				}
 
 				if (ObjectUtil.isNotEmpty(createUserList)) {
-					salesPolicyItem.setCreateUserName(createUserList.stream().filter(e -> e.getId().equals(salesPolicyItem.getCreateUser())).findFirst().get().getName());
+					salesPolicyItem.setCreateUserName(createUserList.stream().filter(e -> e.getId().equals(salesPolicyItem.getCreateUser())).findFirst().orElse(new User()).getName());
 				}
 			});
 		}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderDescClient.java

@@ -80,6 +80,7 @@ public class OrderDescClient implements IOrderDescClient {
 				if (order.getDeliverQuantity().compareTo(BigDecimal.ZERO) == 0) {
 					iOrderService.update(null, new LambdaUpdateWrapper<Order>()
 						.set(Order::getDeliverTime, null)
+						.set(Order::getActualDeliveryDate, null)
 						.eq(Order::getId, order.getId())
 					);
 				}
@@ -88,6 +89,7 @@ public class OrderDescClient implements IOrderDescClient {
 				if (order.getReceiveQuantity().compareTo(BigDecimal.ZERO) == 0) {
 					iOrderService.update(null, new LambdaUpdateWrapper<Order>()
 						.set(Order::getReceiveTime, null)
+						.set(Order::getActualDeliveryDate, null)
 						.eq(Order::getId, order.getId())
 					);
 				}
@@ -101,6 +103,7 @@ public class OrderDescClient implements IOrderDescClient {
 						iOrderService.update(null, new LambdaUpdateWrapper<Order>()
 							.set(Order::getDeliverTime, null)
 							.set(Order::getActualDeliveryDate, null)
+							.set(Order::getActualDeliveryDate, null)
 							.eq(Order::getId, order.getId())
 						);
 					}
@@ -110,6 +113,7 @@ public class OrderDescClient implements IOrderDescClient {
 						iOrderService.update(null, new LambdaUpdateWrapper<Order>()
 							.set(Order::getReceiveTime, null)
 							.set(Order::getActualDeliveryDate, null)
+							.set(Order::getActualDeliveryDate, null)
 							.eq(Order::getId, order.getId())
 						);
 					}