From a597288b2a1318628d336599dd7022f0436c1966 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 8 May 2024 18:31:07 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisCommonToolsController.java   | 83 +++++++++++++++++++
 .../web/emis/EmisTmsScanRecordController.java | 11 +++
 .../erp/emis/service/IEmisWaybillService.java | 10 +++
 3 files changed, 104 insertions(+)
 create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java
new file mode 100644
index 000000000..b7cc06a46
--- /dev/null
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java
@@ -0,0 +1,83 @@
+
+/** 
+  * @Project: emis
+  * @Title: EmisBrandController.java
+  * @author linfso
+  * @date 2023-12-14 13:02:48
+  * @Copyright: ShangHai Duta 2022 All rights reserved.
+  * @version v1.0  
+  * @Description: <p> 品牌 控制器 </p>
+ */
+
+package com.xdadan.erp.web.emis;
+
+import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+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.emis.domain.EmisSite;
+import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.emis.domain.vo.AddressParseResult;
+import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.emis.service.IEmisElectronicPagService;
+import com.xdadan.erp.emis.service.IEmisRegionService;
+import com.xdadan.erp.emis.service.IEmisWaybillService;
+import com.xdadan.erp.system.domain.SysNotice;
+import com.xdadan.erp.system.service.ISysNoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Statistics 公共 Controller
+ * 
+ * @author linfso
+ * @date 2023-12-14 13:02:48
+ */
+@RestController
+@RequestMapping("/emis/commonTools")
+public class EmisCommonToolsController extends BaseController
+{
+
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    @Autowired
+    private IEmisWaybillService emisWaybillService;
+
+    /**
+     * 获取app首页统计
+     */
+    @RequestMapping(value = "/getAppHomeStatData")
+    public AjaxResult getAppHomeStatData()
+    {
+        try {
+            //
+            // 获取基本订单的统计数据
+
+            emisWaybillService.getWaybillDetail()
+            return AjaxResult.success("处理成功");
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return AjaxResult.error(ex.getMessage());
+        }
+    }
+
+
+    @RequestMapping(value = "/getLatestNotices")
+    @JacksonFilter(include= {"noticeId","noticeTitle","noticeType","noticeContent","createTime"},value= SysNotice.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    public TableDataInfo getLatestNotices(SysNotice notice)
+    {
+        startPage();
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
+        return getDataTable(list);
+
+    }
+
+
+
+
+}
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index 3ed5b9663..fd8d7996f 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -110,6 +110,17 @@ public class EmisTmsScanRecordController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/getPreStationList")
+    @JacksonFilter(include= {"startSite","destSite","startSiteName","destSiteName"},value= EmisTmsTransPlanDtl.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    public TableDataInfo getPreStationList()
+    {
+        startPage();
+        EmisTmsTransPlanDtl queryObj = new EmisTmsTransPlanDtl();
+        queryObj.setDestSite(getLoginUser().getUser().getOwnerSiteCode());
+        List<EmisTmsTransPlanDtl> list = emisTmsTransPlanDtlService.selectEmisTmsTransPlanDtlList(queryObj);
+        return getDataTable(list);
+    }
+
 
 
     /**
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
index 754cb184a..36bb9c474 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
@@ -10,6 +10,8 @@
 package com.xdadan.erp.emis.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.AddressParseResult;
@@ -103,6 +105,14 @@ public interface IEmisWaybillService
     public WaybillOrder getWaybillDetailByOrderSn(String orderSn);
 
 
+    /**
+     * 根据员工获取编号获取统计统计数据
+     * @param empNo
+     * @return
+     */
+    public Map getStatInfoByEmp(String empNo);
+
+
     // 账单保存
     public int realSubmitOrder(EmisWaybill emisWaybill) throws EmisBizError;