2026-02-02

销售订单接口传参修改

src/main/java/com/gaotao/modules/oa/controller/SalesOrderController.java

@@ -37,8 +37,8 @@ public class SalesOrderController {
     @PostMapping(value = "/sales-order", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     public OaResponseDto receiveSalesOrder(@Valid @RequestBody SalesOrderBatchRequestDto request, BindingResult bindingResult) {
         try {
-            log.info("收到销售订单批量推送请求，订单类型: {}, 销售订单号: {}, 订单数量: {}", 
-                    request.getOrderType(), request.getRelatedOrderNo(), 
+            log.info("收到销售订单批量推送请求，订单类型: {}, 订单数量: {}",
+                    request.getOrderType(),
                     request.getOrderList() != null ? request.getOrderList().size() : 0);
 
             // 检查参数验证结果
@@ -54,7 +54,7 @@ public class SalesOrderController {
             // 处理销售订单批量推送
             OaResponseDto response = salesOrderService.processSalesOrder(request);
             
-            log.info("销售订单批量推送处理完成，销售订单号: {}, 结果: {}", request.getRelatedOrderNo(), response.getCode());
+            log.info("销售订单批量推送处理完成， 结果: {}", response.getCode());
 
             return response;
 

src/main/java/com/gaotao/modules/oa/dto/SalesOrderBatchRequestDto.java

@@ -19,10 +19,6 @@ public class SalesOrderBatchRequestDto {
     @NotBlank(message = "订单类型不能为空")
     private String orderType;
 
-    /**
-     * 销售订单号
-     */
-    private String relatedOrderNo;
 
     /**
      * 表单编码

src/main/java/com/gaotao/modules/oa/dto/SalesOrderItemDto.java

@@ -37,6 +37,11 @@ public class SalesOrderItemDto {
     @NotBlank(message = "销售通知单号不能为空")
     private String orderNo;
 
+    /**
+     * 销售订单号
+     */
+    private String relatedOrderNo;
+
     /**
      * 销售订单行号
      */

src/main/java/com/gaotao/modules/oa/service/impl/SalesOrderServiceImpl.java

@@ -44,8 +44,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     @Transactional
     public OaResponseDto processSalesOrder(SalesOrderBatchRequestDto request) {
         try {
-            log.info("开始批量处理销售订单推送请求，订单类型: {}, 销售订单号: {}, 订单数量: {}", 
-                    request.getOrderType(), request.getRelatedOrderNo(), request.getOrderList().size());
+            log.info("开始批量处理销售订单推送请求，订单类型: {}, 订单数量: {}",
+                    request.getOrderType(), request.getOrderList().size());
 
             // 1. 参数验证
             if (!StringUtils.hasText(request.getOrderType()) ||
@@ -72,7 +72,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     }
 
                     // 调用存储过程处理单个订单
-                    processSingleOrder(request.getOrderType(), request.getRelatedOrderNo(), item);
+                    processSingleOrder(request.getOrderType(), item);
                     successCount++;
                     log.info("销售订单项[{}/{}]处理成功，通知单号: {}", i + 1, request.getOrderList().size(), item.getOrderNo());
 
@@ -106,7 +106,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     /**
      * 处理单个销售订单
      */
-    private void processSingleOrder(String orderType, String relatedOrderNo, SalesOrderItemDto item) throws Exception {
+    private void processSingleOrder(String orderType, SalesOrderItemDto item) throws Exception {
         // 调用存储过程执行
         String site = item.getSite();
         String buNo = item.getBuNo();
@@ -129,12 +129,14 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         String interfaceName = "销售订单接口";
         String stdPackingQty = item.getStdPackingQty() == null ? "" : String.valueOf(item.getStdPackingQty()); // 标准装箱数量
         String oaOrderNo = item.getOaOrderNo() == null ? "" : item.getOaOrderNo(); // OA订单号
-        
+        String relatedOrderNo = item.getRelatedOrderNo() != null ? item.getRelatedOrderNo() : "";
+
+
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(buNo);
         params.add(orderNo);
-        params.add(relatedOrderNo != null ? relatedOrderNo : "");
+        params.add(relatedOrderNo);
         params.add(relatedOrderLineNo);
         params.add(needDate);
         params.add(orderType);