md

2024-12-01 10:40:06 +08:00 · 2024-12-01 10:40:06 +08:00 · 68514e65e7
commit 68514e65e7
parent 5c21e6344e
12 changed files with 705 additions and 41 deletions
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cSettleBillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cSettleBillController.java
@ -11,15 +11,21 @@

 package com.xdadan.erp.oms.web;

+import cn.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson.JSON;
+
+import com.alibaba.fastjson.JSONObject;
 import com.xdadan.erp.oms.common.core.controller.BaseController;
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.domain.entity.SysOmsUser;
 import com.xdadan.erp.oms.common.core.page.PageDomain;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.oms.common.core.page.TableSupport;
+import com.xdadan.erp.oms.common.utils.SecurityUtils;
 import com.xdadan.erp.oms.domain.EmisSettleBill;
-import com.xdadan.erp.oms.domain.EmisWarehouseIn;
 import com.xdadan.erp.oms.service.svc.IRpcSettleBillSvc;
-import com.xdadan.erp.oms.service.svc.IRpcWarehouseInSvc;
-import com.xdadan.erp.oms.utils.WaybillHelper;
+import com.xdadan.erp.oms.service.svc.IRpcWaybillSvc;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@ -49,52 +55,46 @@ public class Oms2cSettleBillController extends BaseController

    @Autowired
    private IRpcSettleBillSvc iRpcSettleBillSvc;
-
    /**
     * 查询结算总账单列表
     */
-    @GetMapping(value = "/listSimple")
+    @GetMapping("/listSimple")
    public AjaxResult listSimple(EmisSettleBill emisSettleBill)
    {
+        SysOmsUser sysOmsUser=SecurityUtils.getLoginUser().getUser();
+
+        String jsonString = JSON.toJSONString(emisSettleBill);
+
+        Map params = JSON.parseObject(jsonString, Map.class);
+
        PageDomain pageDomain = TableSupport.buildPageRequest();
        Integer pageNum = pageDomain.getPageNum();
        Integer pageSize = pageDomain.getPageSize();
-
-        if(emisSettleBill.getParams()==null){
-            emisSettleBill.setParams(new HashMap<>());
+        if(pageNum==null){
+            pageNum=1;
        }

-        String customerCode=getLoginUser().getUser().getCustomerCode();
+        if(pageSize==null){
+            pageSize=10;
+        }

-        return iRpcSettleBillSvc.listSimple(customerCode,emisSettleBill.getParams(),emisSettleBill.getSearchValue(),pageNum,pageSize);
+        return iRpcSettleBillSvc.listSimple(sysOmsUser.getCustomerCode(),params,
+                emisSettleBill.getSalesmen(),pageNum,pageSize);
    }

+
    /**
     * 获取结算总账单详细信息
     */
    @GetMapping(value = "/getInfoBySettleBillNo")
    public AjaxResult getInfoBySettleBillNo(String settleBillNo)
    {
-        String customerCode=getLoginUser().getUser().getCustomerCode();
-        return iRpcSettleBillSvc.getInfoBySettleBillNo(customerCode,settleBillNo);
+        SysOmsUser sysOmsUser=SecurityUtils.getLoginUser().getUser();
+
+        return iRpcSettleBillSvc.getInfoBySettleBillNo(sysOmsUser.getCustomerCode(),settleBillNo);
+
    }


-    @GetMapping(value = "/getWxPayQrCode")
-    public AjaxResult getWxPayQrCode(String settleBillNo)
-    {
-        String customerCode=getLoginUser().getUser().getCustomerCode();
-        return iRpcSettleBillSvc.getWxPayQrCode(customerCode,settleBillNo);
-    }
-
-
-    @PostMapping(value = "/sumbitWxPay")
-    public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill)
-    {
-        String customerCode=getLoginUser().getUser().getCustomerCode();
-        emisSettleBill.setCustomerCode(customerCode);
-        return iRpcSettleBillSvc.sumbitWxPay(emisSettleBill);
-    }
-

 }
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cSettleSubBillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cSettleSubBillController.java
@ -0,0 +1,48 @@
+
+/** 
+  * @Project: emis
+  * @Title: EmisSettleSubBillController.java
+  * @author linfso
+  * @date 2024-07-03 18:54:52
+  * @Copyright: ShangHai Duta 2022 All rights reserved.
+  * @version v1.0  
+  * @Description: <p> 结算子账单 控制器 </p>
+ */
+
+package com.xdadan.erp.oms.web;
+
+
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.domain.EmisSettleSubBill;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * 结算子账单Controller
+ * 
+ * @author linfso
+ * @date 2024-07-03 18:54:52
+ */
+@RestController
+@RequestMapping("/oms2c/emisSettleSubBill")
+public class Oms2cSettleSubBillController extends BaseController
+{
+
+    /**
+     * 查询结算子账单列表
+     */
+    @GetMapping("/listOmsUserSubBill")
+    public TableDataInfo list(EmisSettleSubBill emisSettleSubBill)
+    {
+      return null;
+    }
+
+
+}
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
@ -230,7 +230,7 @@ public class Oms2cWaybillController extends BaseController
        }

        if(pageSize==null){
-            pageNum=10;
+            pageSize=10;
        }
        return iRpcWmsWarehouseSvc.listWmsWarehouse(wmsWarehouse.getSearchValue(),wmsWarehouse.getParams(),pageNum,pageSize);
    }
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleBill.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleBill.java
@ -28,7 +28,6 @@ import java.util.List;
 @Data
 public class EmisSettleBill extends BaseEntity
 {
-
    private static final long serialVersionUID = 1L;

    /* id */
@ -40,10 +39,10 @@ public class EmisSettleBill extends BaseEntity
    /* 结算账单类型 1-现金 2-月结 */
    private String settleType;
    /* 结算开始时间 */
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date settleStartDate;
    /* 结算结束时间 */
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date settleEndDate;
    /* 账单月份 202402 */
    private String billMonth;
@ -51,6 +50,8 @@ public class EmisSettleBill extends BaseEntity
    private BigDecimal recMoney;
    /* 已收款金额 */
    private BigDecimal recedMoney;
+    /* 已开票金额 */
+    private BigDecimal invoicedMoney;
    /* 月结编号 */
    private String custNo;
    /* 月结账户名称 */
@ -63,17 +64,17 @@ public class EmisSettleBill extends BaseEntity
    private String siteCode;
    /* 结算站点名称 */
    private String siteName;
-    /* 安全金额 */
+    /* 理赔金额 */
    private BigDecimal satisfyMoney;
-    /* 允许金额 */
+    /* 折让金额 */
    private BigDecimal allowanceMoney;
    /* 抵扣金额 */
    private BigDecimal deductionMoney;
    /* 其他金额 */
    private BigDecimal otherMoney;
-    /* 安全原因 */
+    /* 理赔原因 */
    private String satisfyReason;
-    /* 允许原因 */
+    /* 折让原因 */
    private String allowanceReason;
    /* 抵扣原因 */
    private String deductionReason;
@ -99,16 +100,26 @@ public class EmisSettleBill extends BaseEntity
    private BigDecimal refundAmount;
    /* 退款金额 */
    private BigDecimal refundMoney;
-    /* 销售回款人 */
+    /* 回款联系人 */
    private String payee;
    /* 销售联系人 */
    private String salesmen;
+    /* 付款期 默认10天 */
+    private BigDecimal creditPeriod;
+    /* 付款期类型 1-天 2-月 */
+
+    private String creditPeriodType;
+    /* 账单日 1-31 */
+    private Integer settleDay;
+    /* 最后回款日 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date paymentDueDate;
    /* 推送oms */
    private String blSendOms;
    /* 财务确认状态 0-待确认 1-已确认 2-驳回  */
    private String blConfirmCenter;
    /* 财务确认日期 */
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date confirmCenterDate;
    /* 财务确认备注 */
    private String confirmCenterNote;
@ -116,10 +127,10 @@ public class EmisSettleBill extends BaseEntity
    private String confirmCenterManCode;
    /* 财务确认站点 */
    private String confirmCenterCode;
-    /* 站点确认状态 0-待确认 1-已确认 2-驳回 3-账单异常  */
+    /* 站点确认状态 0-待确认 1-已确认 2-驳回  */
    private String blConfirmSite;
    /* 站点确认日期 */
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date confirmSiteDate;
    /* 站点确认人 */
    private String confirmSiteManCode;
@ -137,6 +148,12 @@ public class EmisSettleBill extends BaseEntity
    private String confirmSiteManName;
    private String confirmSiteName;

+    // 本次支付金额=应收金额-已收金额
+    private BigDecimal thisPayMoney;
+
+    // 支付二维码图片
+    private String qrCodePayPicUrl;
+

    List<EmisSettleSubBill> subBillList;

--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleBillPayLog.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleBillPayLog.java
@ -0,0 +1,90 @@
+/** 
+ * @Project: emis
+ * @Title: EmisSettleBillPayLog.java
+ * @author linfso
+ * @date 2024-08-31 12:20:03
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 支付订单表 实体类 </p>
+ */
+
+package com.xdadan.erp.oms.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xdadan.erp.oms.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * @ClassName EmisSettleBillPayLog
+ * @Description 支付订单表
+ * @author linfso
+ * @date 2024-08-31 12:20:03
+ */
+ @Data
+public class EmisSettleBillPayLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* id */
+    private Long id;
+    /* 账单号 */
+    private String settleBillNo;
+    /* 支付序号 */
+    private String payId;
+    /* 支付金额,单位分 */
+    private Integer amount;
+    /* 手续费,单位分 */
+    private Integer fee;
+    /* 三位货币代码,人民币:cny */
+    private String currency;
+    /* 支付状态,0-订单生成,10-支付中,20-支付成功,30-业务处理完成,40-支付失败 50-已退款 */
+    private Integer status;
+    /* 状态描述 */
+    private String statusDesc;
+    /* 商品标题 */
+    private String subject;
+    /* 商品描述信息 */
+    private String body;
+    /* 特定渠道发起额外参数 */
+    private String extra;
+    /* 元数据 */
+    private String metadata;
+    /* 上游支付流水号 */
+    private String transactionNo;
+    /* 上游商户ID */
+    private String upMchId;
+    /* 上游订单号 */
+    private String upOrderNo;
+    /* 上游数据包 */
+    private String upAttach;
+    /* 是否退款,0-未退款,1-退款 */
+    private Integer isRefund;
+    /* 退款次数 */
+    private Integer refundTimes;
+    /* 成功退款金额,单位分 */
+    private Long successRefundAmount;
+    /* 上游失败代码 */
+    private String failureCode;
+    /* 上游失败信息 */
+    private String failureMsg;
+    /* 支付类型 weixin alipay */
+    private String payType;
+    /* 是否支付 0-未支付 1-已支付 */
+    private Integer paid;
+    /* 跳转地址 */
+    private String returnUrl;
+    /* 订单失效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date expireTime;
+    /* 订单支付成功时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date paySuccTime;
+    /* 支付返回信息 */
+    private String credential;
+    /* 返回扩展 */
+    private String responseExtra;
+
+}
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleInvoiceChRecord.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleInvoiceChRecord.java
@ -0,0 +1,120 @@
+/** 
+ * @Project: emis
+ * @Title: EmisSettleInvoiceChRecord.java
+ * @author linfso
+ * @date 2024-07-24 23:39:08
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 渠道开票记录表 实体类 </p>
+ */
+
+package com.xdadan.erp.oms.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xdadan.erp.oms.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * @ClassName EmisSettleInvoiceChRecord
+ * @Description 渠道开票记录表
+ * @author linfso
+ * @date 2024-07-24 23:39:08
+ */
+ @Data
+public class EmisSettleInvoiceChRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* id */
+    private Long id;
+    /* 渠道请求号 */
+    private String reqNo;
+    /* 发票申请序号 */
+    private String applySeqNo;
+    /* 是否电子发票 1-电子发票 2-纸质发票 */
+    private String blEcinv;
+    /* 开票类型 1-增值电子 */
+    private String invoiceType;
+    /* 实际开票类型 1-增值电子 */
+    private String realInvoiceType;
+    /* 开票名称 */
+    private String companyName;
+    /* 开票税号 */
+    private String companyTaxNo;
+    /* 开票电话 */
+    private String companyTel;
+    /* 开票地址 */
+    private String companyAddress;
+    /* 开户行 */
+    private String bankName;
+    /* 开户账号 */
+    private String bankAccNo;
+    /* 联系人 */
+    private String contact;
+    /* 联系电话 */
+    private String phone;
+    /* 税率 */
+    private String taxRate;
+    /* 开票金额 */
+    private BigDecimal openMoney;
+    /* 发票投递邮箱 */
+    private String email;
+    /* 销方开票名称 */
+    private String salerCompanyName;
+    /* 销方开票税号 */
+    private String salerCompanyTaxNo;
+    /* 销方开票电话 */
+    private String salerCompanyTel;
+    /* 销方开票地址 */
+    private String salerCompanyAddress;
+    /* 销方开户行 */
+    private String salerBankName;
+    /* 销方开户账号 */
+    private String salerBankAccNo;
+    /* 销方联系人 */
+    private String salerContact;
+    /* 销方联系电话 */
+    private String salerPhone;
+    /* 销方复核人 */
+    private String salerChecker;
+    /* 销方收款人 */
+    private String salerPayee;
+    /* 发票号 */
+    private String invoiceNo;
+    /* pdf下载路径 */
+    private String filePath;
+    /* qr路径 */
+    private String qrPath;
+    /* 操作人 */
+    private String opManCode;
+    /* 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date opDate;
+    /* 操作站点 */
+    private String opSiteCode;
+    /* 开票渠道编号 code  -航信 HX */
+    private String openChId;
+    /* 开票渠道状态 0-待开票 1-已开票 2-拒绝开票 */
+    private String openChStatus;
+    /* 开票渠道描述 */
+    private String openChStatusDesc;
+    /* 使用的开票企业代码 */
+    private String openComCode;
+    /* 扩展信息，货物名称 */
+    private String extData;
+
+//    扩展字段
+    // 账期
+    private String billMonth;
+    // 面单号
+    private String billCode;
+    // 销售员
+    private String salesmen;
+    // 申请备注
+    private String applyRemark;
+
+}
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleInvoiceRecord.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleInvoiceRecord.java
@ -0,0 +1,143 @@
+/**
+ * @Project: emis
+ * @Title: EmisSettleInvoiceRecord.java
+ * @author linfso
+ * @date 2024-07-21 14:33:40
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0
+ * @Description: <p> 开票记录表 实体类 </p>
+ */
+
+package com.xdadan.erp.oms.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xdadan.erp.oms.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @ClassName EmisSettleInvoiceRecord
+ * @Description 开票记录表
+ * @author linfso
+ * @date 2024-07-21 14:33:40
+ */
+@Data
+public class EmisSettleInvoiceRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* id */
+    private Long id;
+    /* 申请序号 */
+    private String applySeqNo;
+    /* 申请时间 */
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date applyDate;
+    /* 审核人 */
+    private String applyManCode;
+    /* 审核站点 */
+    private String applySiteCode;
+    /* 客户编码 */
+    private String customerCode;
+    /* 客户名称 */
+    private String customerName;
+    /* 账单号编号 */
+    private String settleBillNo;
+    /* 账单名称 */
+    private String settleBillName;
+    /* 申请开票金额=增加的税点金额和额外的附件费用 */
+    private BigDecimal applyMoney;
+    /* 开票类型 1-增值电子 */
+    private String invoiceType;
+    /* 开票范围 1-全部 0-部分 */
+    private String openbillScope;
+    /* 开票名称 */
+    private String companyName;
+    /* 开票税号 */
+    private String companyTaxNo;
+    /* 开票电话 */
+    private String companyTel;
+    /* 开票地址 */
+    private String companyAddress;
+    /* 开票备注 */
+    private String invioceRemark;
+    /* 开户行 */
+    private String bankName;
+    /* 开户账号 */
+    private String bankAccNo;
+    /* 联系人 */
+    private String contact;
+    /* 联系电话 */
+    private String phone;
+    /* 税类型 1-免税 2-增值税 */
+    private String realTaxType;
+    /* 原始开票金额 */
+    private BigDecimal origOpenMoney;
+    /* 额外增加的税点 0.0/0.06/0.09 */
+    private BigDecimal addTaxRate;
+    /* 额外增加的开票金额 */
+    private BigDecimal addOpenMoney;
+    /* 开票上限 */
+    private BigDecimal openMoneyMax;
+    /* 开票金额 */
+    private BigDecimal openMoney;
+    /* 发票号 */
+    private String invoiceNo;
+    /* 开票状态 0-待开票 1-已开票 2-拒绝开票 */
+    private String invoiceStatus;
+    /* 开票状态描述 */
+    private String invoiceStatusDesc;
+    /* 纸质发票邮寄地址 */
+    private String recieveAddress;
+    /* 发票投递邮箱 */
+    private String email;
+    /* 发票下载路径 */
+    private String filePath;
+    /* 审核状态 0-未审核 1-已审核 */
+    private String blAudit;
+    /* 审核日期 */
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date auditDate;
+    /* 审核人 */
+    private String auditManCode;
+    /* 审核站点 */
+    private String auditSiteCode;
+    /* 审核异常原因 */
+    private String auditNote;
+    /* 操作人 */
+    private String opManCode;
+    /* 操作时间 */
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date opDate;
+    /* 操作站点 */
+    private String opSiteCode;
+    /* 开票渠道编号 code  -航信 HX */
+    private String openChId;
+    /* 开票渠道状态 0-待开票 1-已开票 2-拒绝开票 */
+    private String openChStatus;
+    /* 开票渠道描述 */
+    private String openChStatusDesc;
+    /* 使用的开票企业代码 */
+    private String openComCode;
+
+//  扩展信息
+    /* 申请 */
+    private String applyManName;
+    private String applySiteName;
+
+    /* 审核 */
+    private String auditManName;
+    private String auditSiteName;
+
+    private String opManName;
+    private String opSiteName;
+
+
+    List<EmisSettleInvoiceRel> invoiceRelList;
+
+
+}
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleInvoiceRel.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleInvoiceRel.java
@ -0,0 +1,44 @@
+/** 
+ * @Project: emis
+ * @Title: EmisSettleInvoiceRel.java
+ * @author linfso
+ * @date 2024-07-21 13:31:27
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 开票子账单关联表 实体类 </p>
+ */
+
+package com.xdadan.erp.oms.domain;
+
+import com.xdadan.erp.oms.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @ClassName EmisSettleInvoiceRel
+ * @Description 开票子账单关联表
+ * @author linfso
+ * @date 2024-07-21 13:31:27
+ */
+ @Data
+public class EmisSettleInvoiceRel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* id */
+    private Long id;
+    /* 申请序号 */
+    private String applySeqNo;
+    /* 支付序号 */
+    private String payId;
+    /* 分账单号 */
+    private String billNo;
+    /* 申请开票金额 */
+    private BigDecimal money;
+
+    //   扩展参数
+    private EmisWaybill waybillDetail;
+
+}
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettlePayRecord.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettlePayRecord.java
@ -0,0 +1,119 @@
+/** 
+ * @Project: emis
+ * @Title: EmisSettlePayRecord.java
+ * @author linfso
+ * @date 2024-07-21 13:31:23
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 账单收退款记录 实体类 </p>
+ */
+
+package com.xdadan.erp.oms.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xdadan.erp.oms.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @ClassName EmisSettlePayRecord
+ * @Description 账单收退款记录
+ * @author linfso
+ * @date 2024-07-21 13:31:23
+ */
+ @Data
+public class EmisSettlePayRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* id */
+    private Long id;
+    /* 支付序号 */
+    private String payId;
+    /* 支付类型 1-微信支付2支付宝  3-对公 */
+    private String payType;
+    /* 收付类型 1-收款 2-退款 */
+    private String recType;
+    /* 支付人名称 */
+    private String payMan;
+    /* 支付人编码 */
+    private String payManCode;
+    /* 总账单号 */
+    private String settleBillNo;
+    /* 审核状态 0-未审核 1-已审核 */
+    private String blAudit;
+    /* 审核日期 */
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date auditDate;
+    /* 审核人 */
+    private String auditManCode;
+    /* 审核站点 */
+    private String auditSiteCode;
+    /* 客户编码 */
+    private String customerCode;
+    /* 客户名称 */
+    private String customerName;
+    /* 金额 */
+    private BigDecimal payMoney;
+    /* 支付状态 0-待支付 1-支付成功 2-支付失败 */
+    private String payStatus;
+    /* 支付状态描述 */
+    private String payStatusDesc;
+    /* break_type */
+    private String breakType;
+    /* break_reason */
+    private String breakReason;
+    /* break_emp_code */
+    private String breakEmpCode;
+    /* 收款人代码 */
+    private String recManCode;
+    /* 结算类型 1-现金 2-月结 */
+    private String settleType;
+    /* 退款日期 */
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date refundDate;
+    /* 退款人 */
+    private String refundManCode;
+    /* 退款序号 */
+    private String refundSeq;
+    /* 退款模式 1-原路返回 2-线下支付 */
+    private String refundMode;
+    /* 退款金额 */
+    private BigDecimal refundMoney;
+    /* 退款原因 */
+    private String refundReason;
+    /* 退款备注 */
+    private String refundRemark;
+    /* 退款操作人 */
+    private String refundOpManCode;
+    /* 退款登记站点 */
+    private String refundRegisterSiteCode;
+    /* 退款登记人 */
+    private String refundRegisterManCode;
+    /* 安全金额 */
+    private BigDecimal satisfyMoney;
+    /* 安全原因 */
+    private String satisfyReason;
+    /* allowance_money */
+    private BigDecimal allowanceMoney;
+    /* allowance_reason */
+    private String allowanceReason;
+    /* deduction_money */
+    private BigDecimal deductionMoney;
+    /* deduction_reason */
+    private String deductionReason;
+    /* other_money */
+    private BigDecimal otherMoney;
+    /* other_reason */
+    private String otherReason;
+    /* 交易时间 */
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date tradeDate;
+
+    List<EmisSettlePayRel> payRelList;
+
+}
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettlePayRel.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettlePayRel.java
@ -0,0 +1,41 @@
+/** 
+ * @Project: emis
+ * @Title: EmisSettlePayRel.java
+ * @author linfso
+ * @date 2024-07-21 13:31:24
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 支付子账单关联表 实体类 </p>
+ */
+
+package com.xdadan.erp.oms.domain;
+
+import com.xdadan.erp.oms.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName EmisSettlePayRel
+ * @Description 支付子账单关联表
+ * @author linfso
+ * @date 2024-07-21 13:31:24
+ */
+ @Data
+public class EmisSettlePayRel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* id */
+    private Long id;
+    /* 支付序号 */
+    private String payId;
+    /* 分账单号 */
+    private String billNo;
+    /* 金额 */
+    private BigDecimal payMoney;
+
+    //   扩展参数
+    private EmisWaybill waybillDetail;
+
+}
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleSubBill.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleSubBill.java
@ -38,6 +38,7 @@ public class EmisSettleSubBill extends BaseEntity
    /* 父账单号 */
    private String parentBillNo;
    /* 总结算账单号 */
+    // @DataAuditField(fieldComment = "账单编号")
    private String settleBillNo;
    /* 运单号 */
    private String billCode;
@ -45,41 +46,80 @@ public class EmisSettleSubBill extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date billDate;
    /* 账单费用 */
+    // @DataAuditField(fieldComment = "出账费用")
    private BigDecimal billFee;
    /* 费用币种 */
    private String currency;
    /* 结算账单类型 1-现金 2-月结 */
+    // @DataAuditField(fieldComment = "出账类型")
    private String settleType;
    /* 是否已拆单 0-否 1-是 */
    private String blSplit;
    /* 是否已合账 */
+    // @DataAuditField(fieldComment = "是否定制账单")
    private String blMerge;
    /* 账单月份 202402 */
+    // @DataAuditField(fieldComment = "账单月份")
    private String billMonth;
    /* 月结编号 */
+    // @DataAuditField(fieldComment = "月结账号")
    private String custNo;
    /* 月结客户名称 */
+    // @DataAuditField(fieldComment = "月结客户")
    private String custName;
    /* 客户编码 */
    private String customerCode;
    /* 客户名称 */
    private String customerName;
+
+    /* 已开票金额 */
+    private BigDecimal invoicedMoney;
+    /* 已收款金额 */
+    private BigDecimal recedMoney;
+    /* 安全金额 */
+    private BigDecimal satisfyMoney;
+    /* 允许金额 */
+    private BigDecimal allowanceMoney;
+    /* 抵扣金额 */
+    private BigDecimal deductionMoney;
+    /* 其他金额 */
+    private BigDecimal otherMoney;
+    /* 安全原因 */
+    private String satisfyReason;
+    /* 允许原因 */
+    private String allowanceReason;
+    /* 抵扣原因 */
+    private String deductionReason;
+    /* 其他原因 */
+    private String otherReason;
+    /* 开票状态 0-未开票 1-已开票 2-部分开票 3-不开票 */
+    private String openBillStatus;
+    /* 付款状态 0-未付款  1-已付款 2-部分付款  */
+    private String paymentStatus;
+    /* 核销状态 0-未核销1-已核销 */
+    private String chargeStatus;
+
    /* 销售回款人 */
+    // @DataAuditField(fieldComment = "回款联系人")
    private String payee;
    /* 销售联系人 */
+    // @DataAuditField(fieldComment = "销售回款人")
    private String salesmen;
    /* 是否特殊报价 */
    private String blSpecialQuote;
    /* 是否敏感物 */
    private String blSensitive;
    /* 财务确认状态 0-待确认 1-已确认 2-驳回  */
+    // @DataAuditField(fieldComment = "财务确认状态")
    private String blConfirmCenter;
    /* 财务确认日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date confirmCenterDate;
    /* 财务确认备注 */
+    // @DataAuditField(fieldComment = "财务确认备注")
    private String confirmCenterNote;
    /* 财务确认人 */
+    // @DataAuditField(fieldComment = "财务确认人")
    private String confirmCenterManCode;
    /* 财务确认站点 */
    private String confirmCenterCode;
@ -89,8 +129,10 @@ public class EmisSettleSubBill extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date confirmSiteDate;
    /* 站点确认人 */
+    // @DataAuditField(fieldComment = "业务确认人")
    private String confirmSiteManCode;
    /* 网点确认备注 */
+    // @DataAuditField(fieldComment = "业务确认备注")
    private String confirmSiteNote;
    /* 确认网点代码 */
    private String confirmSiteCode;
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcSettleBillSvc.java
@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.Map;

 /**
- * 仓库对货接口
+ * 账单对货接口
 */
@FeignClient(name = "SettleBill",url = "${service.provider.url}",configuration = {FeignErrorDecoder.class})
 public interface IRpcSettleBillSvc {