From 30303f1e09320216877102bcfa17b8e1c5bedd74 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 19 Jun 2025 18:57:06 +0800
Subject: [PATCH] md

---
 .../erp/oms/web/Oms2cCommonController.java    | 21 +++++++++++++++----
 .../oms/service/svc/IRpcSettleBillSvc.java    |  3 ---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
index ea4f829..00a8962 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
@@ -20,17 +20,16 @@ import com.google.gson.JsonObject;
 import com.xdadan.erp.oms.common.annotation.Log;
 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.redis.RedissonService;
 import com.xdadan.erp.oms.common.enums.BusinessType;
 import com.xdadan.erp.oms.common.utils.DateUtils;
+import com.xdadan.erp.oms.common.utils.SecurityUtils;
 import com.xdadan.erp.oms.domain.EmisSmsSendRecord;
 import com.xdadan.erp.oms.domain.exception.EmisBizError;
 import com.xdadan.erp.oms.domain.vo.AddressParseResult;
 import com.xdadan.erp.oms.service.*;
-import com.xdadan.erp.oms.service.svc.IApiwebSvc;
-import com.xdadan.erp.oms.service.svc.IRpcCommonSvc;
-import com.xdadan.erp.oms.service.svc.IRpcWarehouseInSvc;
-import com.xdadan.erp.oms.service.svc.IRpcWaybillSvc;
+import com.xdadan.erp.oms.service.svc.*;
 import com.xdadan.erp.oms.system.service.ISysConfigService;
 import com.xdadan.erp.oms.utils.TraceUtils;
 import feign.Response;
@@ -64,6 +63,8 @@ public class Oms2cCommonController extends BaseController
     @Autowired
     private IRpcWarehouseInSvc iRpcWarehouseInSvc;
 
+    @Autowired
+    private IRpcSettleBillSvc iRpcSettleBillSvc;
 
     @Autowired
     RedissonService redissonService;
@@ -384,6 +385,18 @@ public class Oms2cCommonController extends BaseController
 
     }
 
+    /**
+     * 获取结算总账单详细信息
+     */
+    @GetMapping(value = "/getBillPayInfo")
+    public AjaxResult getBillPayInfo(String settleBillNo)
+    {
+        SysOmsUser sysOmsUser= SecurityUtils.getLoginUser().getUser();
+
+        return iRpcSettleBillSvc.getBillPayInfo(settleBillNo);
+
+    }
+
 
 
 }
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 90ff878..6144350 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
@@ -40,9 +40,6 @@ public interface IRpcSettleBillSvc {
             @RequestParam("pageSize") Integer pageSize);
 
 
-
-
-
     @GetMapping("/apiweb/emisSettleBill/getInfoBySettleBillNo")
     public AjaxResult getInfoBySettleBillNo(@RequestParam("customerCode") String customerCode, @RequestParam("settleBillNo") String settleBillNo);