diff --git 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
index e20cc6d..ddeec95 100644
--- 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
@@ -25,6 +25,7 @@ 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.EmisSettleSubBill;
 import com.xdadan.erp.oms.service.svc.IRpcSettleBillSvc;
 import com.xdadan.erp.oms.service.svc.IRpcWaybillSvc;
 import org.apache.commons.io.IOUtils;
@@ -101,11 +102,58 @@ public class Oms2cSettleBillController extends BaseController
     {
 //        SysOmsUser sysOmsUser=SecurityUtils.getLoginUser().getUser();
 //        sysOmsUser.getCustomerCode(),
-
         return iRpcSettleBillSvc.getInfoBySettleBillNo(settleBillNo);
 
     }
 
+
+    @GetMapping(value = "/getSimpleInfoBySettleBillNo")
+    public AjaxResult getSimpleInfoBySettleBillNo(String settleBillNo)
+    {
+//        SysOmsUser sysOmsUser=SecurityUtils.getLoginUser().getUser();
+//        sysOmsUser.getCustomerCode(),
+
+        return iRpcSettleBillSvc.getSimpleInfoBySettleBillNo(settleBillNo);
+
+    }
+
+
+    /**
+     * 查询结算子账单列表
+     */
+    @GetMapping("/listSubBill")
+    public AjaxResult listSubBill(EmisSettleSubBill emisSettleSubBill)
+    {
+        SysOmsUser sysOmsUser= SecurityUtils.getLoginUser().getUser();
+
+        String jsonString = JSON.toJSONString(emisSettleSubBill);
+
+        Map params = JSON.parseObject(jsonString, Map.class);
+        params.remove("params");
+
+        Map<String, Object>  paramsMap = emisSettleSubBill.getParams();
+        if( paramsMap!=null&& paramsMap.size() >0){
+            for (Map.Entry<String, Object> entry : paramsMap.entrySet()) {
+                params.put("params["+entry.getKey()+"]",entry.getValue());
+            }
+        }
+
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        if(pageNum==null){
+            pageNum=1;
+        }
+
+        if(pageSize==null){
+            pageSize=10;
+        }
+
+        return iRpcSettleBillSvc.listSubBill(sysOmsUser.getCustomerCode(),params, pageNum,pageSize);
+
+    }
+
+
     @GetMapping(value = "/checkCanOnlinePay")
     public AjaxResult checkCanOnlinePay(String settleBillNo)
     {
diff --git 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
deleted file mode 100644
index 229ad7f..0000000
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cSettleSubBillController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-
-/** 
-  * @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;
-    }
-
-
-}
diff --git 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
index 40ee281..150a84c 100644
--- 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
@@ -44,6 +44,7 @@ public interface IRpcSettleBillSvc {
     @GetMapping("/apiweb/emisSettleBill/getInfoBySettleBillNo")
     public AjaxResult getInfoBySettleBillNo(@RequestParam("settleBillNo") String settleBillNo);
 
+
     @GetMapping("/apiweb/emisSettleBill/checkCanOnlinePay")
     public AjaxResult checkCanOnlinePay(@RequestParam("settleBillNo") String settleBillNo);
 
@@ -54,4 +55,15 @@ public interface IRpcSettleBillSvc {
     public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill);
 
 
+    // 获取新
+    @GetMapping("/apiweb/emisSettleBill/getSimpleInfoBySettleBillNo")
+    public AjaxResult getSimpleInfoBySettleBillNo(@RequestParam("settleBillNo") String settleBillNo);
+
+    @GetMapping("/apiweb/emisSettleBill/listSubBill")
+    public AjaxResult listSubBill(
+            @RequestParam("customerCode") String customerCode,
+            @SpringQueryMap Map queryMap,
+            @RequestParam("pageNum") Integer pageNum,
+            @RequestParam("pageSize") Integer pageSize);
+
 }
\ No newline at end of file