From 1844819702b45492c2b1d2fdba8c65a5a016c0d2 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 21 Jan 2026 14:05:26 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-21=20=E3=80=90=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E3=80=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InboundNotificationController.java | 2 +- .../service/InboundNotificationService.java | 2 +- .../service/impl/InboundNotificationServiceImpl.java | 3 ++- .../inboundNotification/InboundNotificationHeadMapper.xml | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gaotao/modules/inboundNotification/controller/InboundNotificationController.java b/src/main/java/com/gaotao/modules/inboundNotification/controller/InboundNotificationController.java index 6882db2..a49b46d 100644 --- a/src/main/java/com/gaotao/modules/inboundNotification/controller/InboundNotificationController.java +++ b/src/main/java/com/gaotao/modules/inboundNotification/controller/InboundNotificationController.java @@ -520,7 +520,7 @@ public class InboundNotificationController extends AbstractController { } // 调用Service处理导入 - String result = inboundNotificationService.labelImport(site, buNo, orderNo, dataList); + String result = inboundNotificationService.labelImport(site, buNo, orderNo, orderType, dataList); if ("200".equals(result)) { return R.ok("导入成功，共导入 " + dataList.size() + " 条数据"); diff --git a/src/main/java/com/gaotao/modules/inboundNotification/service/InboundNotificationService.java b/src/main/java/com/gaotao/modules/inboundNotification/service/InboundNotificationService.java index 025f016..d61be38 100644 --- a/src/main/java/com/gaotao/modules/inboundNotification/service/InboundNotificationService.java +++ b/src/main/java/com/gaotao/modules/inboundNotification/service/InboundNotificationService.java @@ -138,5 +138,5 @@ public interface InboundNotificationService { * @param dataList 导入的数据列表 * @return 处理结果 "200"成功 "400"失败 */ - String labelImport(String site, String buNo, String orderNo, List> dataList); + String labelImport(String site, String buNo, String orderNo, String orderType, List> dataList); } diff --git a/src/main/java/com/gaotao/modules/inboundNotification/service/impl/InboundNotificationServiceImpl.java b/src/main/java/com/gaotao/modules/inboundNotification/service/impl/InboundNotificationServiceImpl.java index b9d70b6..0082790 100644 --- a/src/main/java/com/gaotao/modules/inboundNotification/service/impl/InboundNotificationServiceImpl.java +++ b/src/main/java/com/gaotao/modules/inboundNotification/service/impl/InboundNotificationServiceImpl.java @@ -848,7 +848,7 @@ public class InboundNotificationServiceImpl implements InboundNotificationServic */ @Override @Transactional - public String labelImport(String site, String buNo, String orderNo, List> dataList) { + public String labelImport(String site, String buNo, String orderNo, String orderType, List> dataList) { try { // 1. 清空临时表中该单据的数据 headMapper.deleteLabelImportTemp(site, buNo, orderNo); @@ -863,6 +863,7 @@ public class InboundNotificationServiceImpl implements InboundNotificationServic params.put("site", site); params.put("buNo", buNo); params.put("orderNo", orderNo); + params.put("orderType", orderType); headMapper.callUspImportRoll(params); diff --git a/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml b/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml index 2595697..421e472 100644 --- a/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml +++ b/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml @@ -288,6 +288,7 @@ #{site, mode=IN, jdbcType=VARCHAR}, #{buNo, mode=IN, jdbcType=VARCHAR}, #{orderNo, mode=IN, jdbcType=VARCHAR}, + #{orderType, mode=IN, jdbcType=VARCHAR}, #{resultCode, mode=OUT, jdbcType=VARCHAR}, #{resultMsg, mode=OUT, jdbcType=VARCHAR} )}