From fd8be38f7e173b7b6a569211b7b0972d3d42de9b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 27 Jan 2026 13:43:18 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-27=20=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E4=B8=8D=E5=9C=A8=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E5=92=8C=E8=AE=A2=E5=8D=95=E8=A1=8C?=
 =?UTF-8?q?=E5=8F=B7=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/oa/dto/SalesOrderBatchRequestDto.java    | 1 -
 .../java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java   | 1 -
 .../modules/oa/service/impl/SalesOrderServiceImpl.java      | 6 ++----
 3 files changed, 2 insertions(+), 6 deletions(-)

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 ||