From 6b12037ae82999d745b070d65d1814d553598612 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 27 Jul 2024 12:37:07 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/apiweb/WaybillController.java  | 28 +++++++++++++++++++
 .../erp/apiweb/WmsWarehouseController.java    | 18 +++++++++---
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
index d31af3b..4950eaf 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
@@ -257,6 +257,34 @@ public class WaybillController extends BaseController
         }
     }
 
+    /**
+     * 导出进仓单模板
+     * @param response
+     * @return
+     */
+    @Log(title = "导出进仓单", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportWarehouseInTpl")
+    public AjaxResult exportWarehouseInTpl(HttpServletResponse response,WaybillOrder waybillOrder)  {
+
+        try{
+            emisWaybillService.genWarehouseInTplFile(response,waybillOrder.getOrderSn());
+            return AjaxResult.success("下载成功");
+        }
+        catch(EmisBizError ex){
+            ex.printStackTrace();
+            return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage());
+        }
+        catch (Exception ex){
+            ex.printStackTrace();
+            // 返回子定义异常
+            if(ex instanceof EmisBizError){
+                return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
+            }
+
+            return AjaxResult.error("服务器异常，联系客服");
+        }
+    }
+
     @Log(title = "运费试算", businessType = BusinessType.OTHER)
     @PostMapping(value = "/preCalcWaybillFeeByOms")
     public AjaxResult preCalcWaybillFeeByOms(@RequestBody WaybillOrder waybillOrder)
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 3bb5591..aedf0a8 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
@@ -18,6 +18,8 @@ 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.emis.domain.EmisDestination;
+import com.xdadan.erp.emis.domain.EmisSite;
+import com.xdadan.erp.emis.service.IEmisSiteService;
 import com.xdadan.erp.wms.domain.WmsWarehouse;
 import com.xdadan.erp.wms.service.IWmsWarehouseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 仓库Controller
@@ -40,6 +43,9 @@ public class WmsWarehouseController extends BaseController
     @Autowired
     private IWmsWarehouseService wmsWarehouseService;
 
+    @Autowired
+    private IEmisSiteService emisSiteService;
+
     /**
      * 查询仓库列表
      */
@@ -48,7 +54,7 @@ public class WmsWarehouseController extends BaseController
             "code","name","contact",
             "tel","address",
     },value= WmsWarehouse.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
-    public TableDataInfo listWmsWarehouse(String searchValue)
+    public TableDataInfo listWmsWarehouse(EmisSite emisSite)
     {
 
 //        "code": "仓库编码",
@@ -58,9 +64,13 @@ public class WmsWarehouseController extends BaseController
 //            "address": "地址"
 
         startPage();
-        WmsWarehouse wmsWarehouse = new WmsWarehouse();
-        wmsWarehouse.setSearchValue(searchValue);
-        List<WmsWarehouse> list = wmsWarehouseService.selectWmsWarehouseList(wmsWarehouse);
+//        WmsWarehouse wmsWarehouse = new WmsWarehouse();
+//        wmsWarehouse.setSearchValue(searchValue);
+//        List<WmsWarehouse> list = wmsWarehouseService.selectWmsWarehouseList(wmsWarehouse);
+        // 使用网点作为仓库
+
+        List<Map> list = emisSiteService.selectEmisSiteListAsWarehouse(emisSite);
+
         return getDataTable(list);
     }