From 5b2a26577060af4e529bec0a88a22ca6d9a0859e Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Sat, 23 Jul 2022 14:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=80=BB=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/broad/MTKController.java     | 8 +++++++-
 .../ruoyi/web/controller/broad/ZZJXBroadController.java   | 6 +-----
 .../java/com/ruoyi/system/mapper/BroadDataMapper.java     | 4 +++-
 .../src/main/resources/mapper/system/BroadDataMapper.xml  | 6 +++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java
index abfa73a..26c6a60 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java
@@ -1,8 +1,8 @@
 package com.ruoyi.web.controller.broad;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.json.JSONObject;
 import com.ruoyi.system.domain.BaseTeam;
 import com.ruoyi.system.service.IBaseTeamService;
 import com.ruoyi.system.service.IBroadDataService;
@@ -48,4 +48,10 @@ public class MTKController {
 
         return JSONArray.toJSONString(service.mtk_selectOrderInfoBy3dTatle());
     }
+
+    @PostMapping("/selectInstoreNumByday")
+    @ApiOperation("当日入库订单统计")
+    private String mtk_selectInstoreNumByday(){
+        return JSONObject.toJSONString(service.zz_selectInstoreNumByday());
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java
index 5dbb10e..904759f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java
@@ -82,11 +82,7 @@ public class ZZJXBroadController {
         return JSONObject.toJSONString(service.zz_selectInStoreOrderInfo());
     }
 
-    @PostMapping("/selectInstoreNumByday")
-    @ApiOperation("当日入库订单统计")
-    private String zz_selectInstoreNumByday(){
-        return JSONObject.toJSONString(service.zz_selectInstoreNumByday());
-    }
+
 
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
index 454fd5e..4e21c51 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
@@ -87,6 +87,8 @@ public interface BroadDataMapper {
     BoxOutput zz_selectOneBadRateMb();
 
     List<OrderInfo> mtk_selectOrderInfoBy3d();
+
     List<OrderInfo> mtk_selectOrderInfoBy3dTatle();
-    List<OrderInfo> zz_selectInstoreNumByday();
+
+    List<OrderInfo> mtk_selectInstoreNumByday();
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 161d9f2..eb3fcbb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -615,7 +615,7 @@ from (
         where to_char(ippi.CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') and ippi. DELETE_FLAG=0
     </select>
 
-    <select id="mtk_selectOrderInfoBy3dTatle" resultType="com.ruoyi.system.domain.BoxOutput">
+    <select id="mtk_selectOrderInfoBy3dTatle" resultType="com.ruoyi.system.domain.OrderInfo">
         select sum(ORDER_QTY) as qty, '订单数量' as name
         from IMOS_PR_ORDER
         where FINISH_DATE between to_date(to_char(SYSDATE - 3, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
@@ -652,7 +652,7 @@ from (
         from IMOS_PR_PRODUCT_IN
         where to_char(CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
     </select>
-    <select id="mtk_selectOrderInfoBy3d" resultType="com.ruoyi.system.domain.BoxOutput">
+    <select id="mtk_selectOrderInfoBy3d" resultType="com.ruoyi.system.domain.OrderInfo">
         select substr(ORDER_NO, 5, length(ORDER_NO)) || '(' || substr(
                 substr(MATERIAL_NAME,
                        instr(MATERIAL_NAME, '-', 1, 1) + 1,
@@ -672,7 +672,7 @@ from (
         select * from (select rate,'不合格率目标' from haiwei.BASE_ONE_UNQUQLIFIED_RATE order by CREATE_TIME desc) where ROWNUM=1
     </select>
 
-    <select id="zz_selectInstoreNumByday" resultType="com.ruoyi.system.domain.BoxOutput">
+    <select id="mtk_selectInstoreNumByday" resultType="com.ruoyi.system.domain.OrderInfo">
         select substr(
                MATERIAL_NAME,
                instr(MATERIAL_NAME, '-', 1, 1) + 1,