From 55e366973f235179eac4cae73c62159f445510cf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 31 Aug 2024 16:06:41 +0800
Subject: [PATCH] md

---
 .../erp/apiweb/SettleBillController.java      | 125 ++++++++++++++++++
 .../erp/apiweb/WmsWarehouseController.java    |   7 +-
 2 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java

diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java
new file mode 100644
index 0000000..a3d422e
--- /dev/null
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java
@@ -0,0 +1,125 @@
+
+/** 
+  * @Project: emis
+  * @Title: EmisSettleBillController.java
+  * @author linfso
+  * @date 2024-07-03 18:54:51
+  * @Copyright: ShangHai Duta 2022 All rights reserved.
+  * @version v1.0  
+  * @Description: <p> 结算总账单 控制器 </p>
+ */
+
+package com.xdadan.erp.apiweb;
+
+import cn.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.excel.util.MapUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.fill.FillConfig;
+import com.alibaba.fastjson.JSON;
+import com.xdadan.erp.common.annotation.Log;
+import com.xdadan.erp.common.core.controller.BaseController;
+import com.xdadan.erp.common.core.domain.AjaxResult;
+import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.common.enums.BusinessType;
+import com.xdadan.erp.common.utils.DateUtils;
+import com.xdadan.erp.common.utils.DictUtils;
+import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.emis.domain.EmisSettleBill;
+import com.xdadan.erp.emis.domain.EmisSettleSubBill;
+import com.xdadan.erp.emis.domain.EmisSettleSubBillFeeitem;
+import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.emis.service.IEmisSettleBillService;
+import com.xdadan.erp.emis.utils.WaybillHelper;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+/**
+ * 结算总账单Controller
+ * 
+ * @author linfso
+ * @date 2024-07-03 18:54:51
+ */
+@RestController
+@RequestMapping("/apiweb/emisSettleBill")
+public class SettleBillController extends BaseController
+{
+    @Autowired
+    private IEmisSettleBillService emisSettleBillService;
+
+    @Autowired
+    private EmisBaseService emisBaseService;
+
+
+    /**
+     * 查询结算总账单列表
+     */
+    @GetMapping("/listSimple")
+    public TableDataInfo listSimple(EmisSettleBill emisSettleBill)
+    {
+        startPage();
+
+        setPrivParams(emisSettleBill);
+
+        String billCodeStr = MapUtil.getStr(emisSettleBill.getParams(),"billCode");
+        if(!StringUtils.isEmpty(billCodeStr)){
+            emisSettleBill.getParams().put("billCode", WaybillHelper.formatQueryValue(billCodeStr));
+            String[] billCodeSortList = billCodeStr.split(",");
+            if(billCodeSortList.length>1){
+                emisSettleBill.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList));
+            }
+        }
+
+        if(!StringUtils.isEmpty(emisSettleBill.getSettleBillNo())){
+            emisSettleBill.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettleBill.getSettleBillNo()));
+            String[] settleBillNoSortList = emisSettleBill.getSettleBillNo().split(",");
+            if(settleBillNoSortList.length>1){
+                emisSettleBill.getParams().put("settleBillNoSortList",Arrays.asList(settleBillNoSortList));
+            }
+        }
+
+        List<EmisSettleBill> list = emisSettleBillService.selectEmisSettleBillList(emisSettleBill);
+        return getDataTable(list);
+    }
+
+
+
+
+    /**
+     * 获取结算总账单详细信息
+     */
+//    @PreAuthorize("@ss.hasPermi('emis:emisSettleBill:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(emisSettleBillService.selectEmisSettleBillById(id));
+    }
+
+    /**
+     * 获取结算总账单详细信息
+     */
+    @GetMapping(value = "/getInfoBySettleBillNo")
+    public AjaxResult getInfoBySettleBillNo(String settleBillNo)
+    {
+        return AjaxResult.success(emisBaseService.getSettleBillBySettleBillNo(settleBillNo));
+    }
+
+
+}
diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java
index 994118b..febedd5 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java
@@ -66,13 +66,14 @@ public class WmsWarehouseController extends BaseController
 
         startPage();
 
-
         // 使用网点作为仓库
         EmisSite emisSite = new EmisSite();
         emisSite.setSearchValue(wmsWarehouse.getSearchValue());
 
-        String transLine= MapUtil.getStr(wmsWarehouse.getParams(),"transLine");
-        emisSite.setTransTypeId(transLine);
+//        String transLine= MapUtil.getStr(wmsWarehouse.getParams(),"transLine");
+//        emisSite.setTransTypeId(transLine);
+
+        emisSite.setParams(wmsWarehouse.getParams());
 
         List<Map> list = emisSiteService.selectEmisSiteListAsWarehouse(emisSite);