From dec6fc28df50a9e1be59a1210cc050ee0d309002 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Fri, 10 Jan 2025 16:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E8=B4=B4=E6=81=AF=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java | 1 + .../api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java | 1 + .../biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java index c300a38cb5..c559cfd546 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListVo.java @@ -46,5 +46,6 @@ public class AdjustVehListVo { private String nowDiffAmount; // 当前差异金额 @ApiModelProperty("单车返利管理sid") private String rebateSid; // 单车返利管理sid + private String salesOrderSid; // 销售订单sid } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java index f1e6cc5ac2..cc84e7c207 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetails.java @@ -90,5 +90,6 @@ public class ScmFinanceAdjustDetails extends BaseEntity { private BigDecimal nowDiffAmount; // 当前差异金额 @ApiModelProperty("单车返利管理sid") private String rebateSid; // 单车返利管理sid + private String salesOrderSid; // 销售订单sid } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml index cfeb1abf87..7c65cb8bcb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml @@ -42,7 +42,7 @@ SELECT n.*, - bo.contractNo,bo.customerSid,bo.customerName, + bo.contractNo,bo.customerSid,bo.customerName,bo.sid salesOrderSid, CASE WHEN n.alreadyMoney = 0 THEN'未调整' WHEN n.alreadyMoney != 0 AND n.nowDiffAmount != 0 THEN '部分调整'