2024年7月16日13:32:02

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -1669,7 +1669,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		} else if (OrderTypeEnum.EXPORT.getType().equals(order.getTradeType())) {
 			if (OrderTypeEnum.SALES.getType().equals(order.getBillType())) {
 				this.paymentApplyFD(order, "收费", "销售");
-				if (ObjectUtils.isNotNull(order.getProductionScheduling())) {
+				if (ObjectUtils.isNull(order.getProductionScheduling())) {
 					LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 					lambdaQueryWrapper.eq(OrderItems::getPid, order.getId()).eq(OrderItems::getIsDeleted, 0).eq(OrderItems::getTenantId, AuthUtil.getTenantId());
 					// 获取销售单明细数据
@@ -1724,7 +1724,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						throw new SecurityException("发送消息失败");
 					}
 				}
-				if (ObjectUtils.isNotNull(order.getDocumentaryDate()) && ObjectUtils.isNotNull(order.getDeliverQuantity())) {
+				if (ObjectUtils.isNull(order.getDocumentaryDate()) && ObjectUtils.isNull(order.getDeliverQuantity())) {
 					LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 					lambdaQueryWrapper.eq(OrderItems::getPid, order.getId()).eq(OrderItems::getIsDeleted, 0).eq(OrderItems::getTenantId, AuthUtil.getTenantId());
 					// 获取销售单明细数据
@@ -5693,7 +5693,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		Order selectOrder = baseMapper.selectById(order.getId());
 		if (ObjectUtils.isNotNull(selectOrder)) {
-			if (ObjectUtils.isNotNull(selectOrder.getProductionScheduling())) {
+			if (ObjectUtils.isNull(selectOrder.getProductionScheduling())) {
 				LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 				lambdaQueryWrapper.eq(OrderItems::getPid, selectOrder.getId()).eq(OrderItems::getIsDeleted, 0).eq(OrderItems::getTenantId, AuthUtil.getTenantId());
 				// 获取销售单明细数据