From 919f610cbcfca8fabb334d5f4f3d16856426d12a Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 4 Sep 2026 13:24:42 +0800 Subject: [PATCH] =?UTF-8?q?2026-09-04=20=E9=87=87=E8=B4=AD=E5=88=B0?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E3=80=81=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82?= =?UTF-8?q?=EF=BC=9Acategory=E5=92=8Cdepartmentno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/oa/dto/PurchaseArrivalBatchRequestDto.java | 6 ++++++ .../gaotao/modules/oa/dto/SalesReturnBatchRequestDto.java | 4 ++++ .../modules/oa/service/impl/PurchaseArrivalServiceImpl.java | 6 ++++-- .../modules/oa/service/impl/SalesReturnApiServiceImpl.java | 6 ++++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gaotao/modules/oa/dto/PurchaseArrivalBatchRequestDto.java b/src/main/java/com/gaotao/modules/oa/dto/PurchaseArrivalBatchRequestDto.java index 98591ef..499e16a 100644 --- a/src/main/java/com/gaotao/modules/oa/dto/PurchaseArrivalBatchRequestDto.java +++ b/src/main/java/com/gaotao/modules/oa/dto/PurchaseArrivalBatchRequestDto.java @@ -30,6 +30,12 @@ public class PurchaseArrivalBatchRequestDto { */ private String formCode; + + private String category; + + private String departmentno; + + /** * 订单列表 */ diff --git a/src/main/java/com/gaotao/modules/oa/dto/SalesReturnBatchRequestDto.java b/src/main/java/com/gaotao/modules/oa/dto/SalesReturnBatchRequestDto.java index 578351e..7dcfc23 100644 --- a/src/main/java/com/gaotao/modules/oa/dto/SalesReturnBatchRequestDto.java +++ b/src/main/java/com/gaotao/modules/oa/dto/SalesReturnBatchRequestDto.java @@ -30,6 +30,10 @@ public class SalesReturnBatchRequestDto { */ private String formCode; + private String category; + + private String departmentno; + /** * 订单列表 */ diff --git a/src/main/java/com/gaotao/modules/oa/service/impl/PurchaseArrivalServiceImpl.java b/src/main/java/com/gaotao/modules/oa/service/impl/PurchaseArrivalServiceImpl.java index 7b18fe9..b7fb932 100644 --- a/src/main/java/com/gaotao/modules/oa/service/impl/PurchaseArrivalServiceImpl.java +++ b/src/main/java/com/gaotao/modules/oa/service/impl/PurchaseArrivalServiceImpl.java @@ -73,7 +73,7 @@ public class PurchaseArrivalServiceImpl implements PurchaseArrivalService { } // 调用存储过程处理单个订单 - processSingleOrder(request.getOrderType(), item); + processSingleOrder(request.getOrderType(), item, request.getCategory(), request.getDepartmentno()); successCount++; log.info("采购到货单项[{}/{}]处理成功，通知单号: {}", i + 1, request.getOrderList().size(), item.getOrderNo()); @@ -107,7 +107,7 @@ public class PurchaseArrivalServiceImpl implements PurchaseArrivalService { /** * 处理单个采购到货单 */ - private void processSingleOrder(String orderType, PurchaseArrivalItemDto item) throws Exception { + private void processSingleOrder(String orderType, PurchaseArrivalItemDto item, String category, String departmentno) throws Exception { // 调用存储过程执行 String site = item.getSite(); String buNo = item.getBuNo(); @@ -156,6 +156,8 @@ public class PurchaseArrivalServiceImpl implements PurchaseArrivalService { params.add(orderref4); params.add(orderref5); params.add(interfaceName); + params.add(category != null ? category : ""); + params.add(departmentno != null ? departmentno : ""); // 执行存储过程 List> resultList = procedureDao.getProcedureData("UspInsertInboundNotification", params); diff --git a/src/main/java/com/gaotao/modules/oa/service/impl/SalesReturnApiServiceImpl.java b/src/main/java/com/gaotao/modules/oa/service/impl/SalesReturnApiServiceImpl.java index c33bfed..ef3d457 100644 --- a/src/main/java/com/gaotao/modules/oa/service/impl/SalesReturnApiServiceImpl.java +++ b/src/main/java/com/gaotao/modules/oa/service/impl/SalesReturnApiServiceImpl.java @@ -73,7 +73,7 @@ public class SalesReturnApiServiceImpl implements SalesReturnApiService { } // 调用存储过程处理单个订单 - processSingleOrder(request.getOrderType(), item); + processSingleOrder(request.getOrderType(), item, request.getCategory(), request.getDepartmentno()); successCount++; log.info("销售退货单项[{}/{}]处理成功，通知单号: {}", i + 1, request.getOrderList().size(), item.getOrderNo()); @@ -107,7 +107,7 @@ public class SalesReturnApiServiceImpl implements SalesReturnApiService { /** * 处理单个销售退货单 */ - private void processSingleOrder(String orderType, SalesReturnItemDto item) throws Exception { + private void processSingleOrder(String orderType, SalesReturnItemDto item, String category, String departmentno) throws Exception { // 调用存储过程执行 String site = item.getSite(); String buNo = item.getBuNo(); @@ -156,6 +156,8 @@ public class SalesReturnApiServiceImpl implements SalesReturnApiService { params.add(orderref4); params.add(orderref5); params.add(interfaceName); + params.add(category != null ? category : ""); + params.add(departmentno != null ? departmentno : ""); // 执行存储过程 List> resultList = procedureDao.getProcedureData("UspInsertInboundNotification", params);