diff --git a/src/main/java/com/gaotao/modules/oa/dto/SalesOrderBatchRequestDto.java b/src/main/java/com/gaotao/modules/oa/dto/SalesOrderBatchRequestDto.java index 7319bf5..420fb7c 100644 --- a/src/main/java/com/gaotao/modules/oa/dto/SalesOrderBatchRequestDto.java +++ b/src/main/java/com/gaotao/modules/oa/dto/SalesOrderBatchRequestDto.java @@ -22,7 +22,6 @@ public class SalesOrderBatchRequestDto { /** * 销售订单号 */ - @NotBlank(message = "销售订单号不能为空") private String relatedOrderNo; /** diff --git a/src/main/java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java b/src/main/java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java index f3ac6ba..f602135 100644 --- a/src/main/java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java +++ b/src/main/java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java @@ -40,7 +40,6 @@ public class SalesOrderItemDto { /** * 销售订单行号 */ - @NotBlank(message = "销售订单行号不能为空") private String relatedOrderLineNo; /** diff --git a/src/main/java/com/gaotao/modules/oa/service/impl/SalesOrderServiceImpl.java b/src/main/java/com/gaotao/modules/oa/service/impl/SalesOrderServiceImpl.java index 456e419..c6165f3 100644 --- a/src/main/java/com/gaotao/modules/oa/service/impl/SalesOrderServiceImpl.java +++ b/src/main/java/com/gaotao/modules/oa/service/impl/SalesOrderServiceImpl.java @@ -49,7 +49,6 @@ public class SalesOrderServiceImpl implements SalesOrderService { // 1. 参数验证 if (!StringUtils.hasText(request.getOrderType()) || - !StringUtils.hasText(request.getRelatedOrderNo()) || !StringUtils.hasText(request.getFormCode()) || request.getOrderList() == null || request.getOrderList().isEmpty()) { return OaResponseDto.failure("批量请求参数验证失败"); @@ -112,7 +111,7 @@ public class SalesOrderServiceImpl implements SalesOrderService { String site = item.getSite(); String buNo = item.getBuNo(); String orderNo = item.getOrderNo(); - String relatedOrderLineNo = item.getRelatedOrderLineNo(); + String relatedOrderLineNo = item.getRelatedOrderLineNo() != null ? item.getRelatedOrderLineNo() : ""; String needDate = DateUtils.format(item.getNeedDate()); String orderStatus = item.getOrderStatus(); String customerId = item.getCustomerId(); @@ -135,7 +134,7 @@ public class SalesOrderServiceImpl implements SalesOrderService { params.add(site); params.add(buNo); params.add(orderNo); - params.add(relatedOrderNo); + params.add(relatedOrderNo != null ? relatedOrderNo : ""); params.add(relatedOrderLineNo); params.add(needDate); params.add(orderType); @@ -175,7 +174,6 @@ public class SalesOrderServiceImpl implements SalesOrderService { !StringUtils.hasText(item.getSite()) || !StringUtils.hasText(item.getBuNo()) || !StringUtils.hasText(item.getOrderNo()) || - !StringUtils.hasText(item.getRelatedOrderLineNo()) || !StringUtils.hasText(item.getPartNo()) || !StringUtils.hasText(item.getCustomerId()) || item.getNeedDate() == null ||