Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MTKController.java

@@ -36,10 +36,16 @@ public class MTKController {
         List<BaseTeam> list = baseTeamService.selectBaseTeamList(null);
         return JSONArray.toJSONString(list);
     }
-    @PostMapping("/inStore3d")
-    @ApiOperation("3天入库量查询")
-    public String mtk_inStore3d() {
+    @PostMapping("/selectOrderInfoBy3d")
+    @ApiOperation("3日订单执行情况")
+    public String mtk_selectOrderInfoBy3d() {
 
-        return JSONArray.toJSONString(service.mtk_selectInStore3d());
+        return JSONArray.toJSONString(service.mtk_selectOrderInfoBy3d());
+    }
+    @PostMapping("/mtk_selectOrderInfoBy3dTatle")
+    @ApiOperation("3日订单执行情况标题栏")
+    public String mtk_selectOrderInfoBy3dTatle() {
+
+        return JSONArray.toJSONString(service.mtk_selectOrderInfoBy3dTatle());
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java

@@ -85,4 +85,7 @@ public interface BroadDataMapper {
     List<OrderInfo> zz_selectInStoreOrderInfo();
 
     BoxOutput zz_selectOneBadRateMb();
+
+    List<OrderInfo> mtk_selectOrderInfoBy3d();
+    List<OrderInfo> mtk_selectOrderInfoBy3dTatle();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java

@@ -67,4 +67,8 @@ public interface IBroadDataService {
     List<OrderInfo> zz_selectInStoreOrderInfo();
 
     BoxOutput zz_selectOneBadRateMb();
+
+    List<OrderInfo> mtk_selectOrderInfoBy3d();
+
+    List<OrderInfo> mtk_selectOrderInfoBy3dTatle();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java

@@ -120,6 +120,14 @@ public class BroadDataServiceImpl implements IBroadDataService
         return mapper.mtk_selectInStore3d();
     }
 
+    @Override
+    public List<OrderInfo> mtk_selectOrderInfoBy3d() {
+        return mapper.mtk_selectOrderInfoBy3d();
+    }
+    @Override
+    public List<OrderInfo> mtk_selectOrderInfoBy3dTatle() {
+        return mapper.mtk_selectOrderInfoBy3dTatle();
+    }
     ///////////////////////////////////////////////////////////////////////////
     // 总装
     ///////////////////////////////////////////////////////////////////////////

ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml

@@ -615,7 +615,59 @@ 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 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')
+        and to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+        union
+        select sum(ACTUAL_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')
+        and to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+        union
+        select round(
+        (
+        select count(1)
+        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')
+        and to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '00:00:00',
+        'yyyy-MM-dd hh24:mi:ss')
+        and ORDER_QTY - ACTUAL_QTY &lt; 6
+        ) /
+        (
+        select count(1)
+        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')
+        and to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '00:00:00',
+        'yyyy-MM-dd hh24:mi:ss')
+        ) * 100, 2) as qty,
+        '清单率'                       as name
+        from DUAL
+    </select>
+    <select id="mtk_selectOrderInfoBy3d" resultType="com.ruoyi.system.domain.BoxOutput">
+        select substr(ORDER_NO, 5, length(ORDER_NO)) || '(' || substr(
+                substr(MATERIAL_NAME,
+                       instr(MATERIAL_NAME, '-', 1, 1) + 1,
+                       length(MATERIAL_NAME)),
+                0,
+                instr(
+                        substr(MATERIAL_NAME,
+                               instr(MATERIAL_NAME, '-', 1, 1) + 1,
+                               length(MATERIAL_NAME)), ',', 1, 1) - 1) || ')' as name
+                ,
+               round(ACTUAL_QTY / ORDER_QTY * 100, 2)                         as qty
+        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')
+                  and to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
+    </select>
     <select id="zz_selectOneBadRateMb" resultType="com.ruoyi.system.domain.BoxOutput">
         select * from (select rate,'不合格率目标' from haiwei.BASE_ONE_UNQUQLIFIED_RATE order by CREATE_TIME desc) where ROWNUM=1
     </select>
+
+
 </mapper>