修改 总装

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

@@ -29,13 +29,6 @@ public class BeforeLibraryController {
 
 
 
-//    @PostMapping("/selectProductInStore")
-//    @ApiOperation("泡前库   成品入库")
-//    @ResponseBody
-//    public String pqk_selectProductInStore() {
-//        List<BoxOutput> list = service.pqk_selectProductInStore();
-//        return JSONArray.toJSONString(list);
-//    }
 
     @PostMapping("/selectOrderInfo")
     @ApiOperation("泡前库 订单情况、完成率")
@@ -45,12 +38,7 @@ public class BeforeLibraryController {
         return JSONArray.toJSONString(list);
     }
 
-//    @PostMapping("/selectQualityItem")
+
-//    @ApiOperation("泡前库-质量统计")
-//    @ResponseBody
-//    public String pqk_selectQualityItem(){
-//        return JSONArray.toJSONString(service.pqk_selectQualityItem());
-//    }
 
     @PostMapping("/selectQualityInfo")
     @ApiOperation("泡前库-成品质检详情")
@@ -60,6 +48,21 @@ public class BeforeLibraryController {
         return JSONArray.toJSONString(list);
     }
 
+//    @PostMapping("/selectProductInStore")
+//    @ApiOperation("泡前库   成品入库")
+//    @ResponseBody
+//    public String pqk_selectProductInStore() {
+//        List<BoxOutput> list = service.pqk_selectProductInStore();
+//        return JSONArray.toJSONString(list);
+//    }
+
+
+    //    @PostMapping("/selectQualityItem")
+//    @ApiOperation("泡前库-质量统计")
+//    @ResponseBody
+//    public String pqk_selectQualityItem(){
+//        return JSONArray.toJSONString(service.pqk_selectQualityItem());
+//    }
 
 
 }

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

@@ -0,0 +1,45 @@
+package com.ruoyi.web.controller.broad;
+
+import com.alibaba.fastjson.JSONArray;
+import com.ruoyi.system.domain.OrderInfo;
+import com.ruoyi.system.domain.QualityInfo;
+import com.ruoyi.system.service.IBroadDataService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ *
+ */
+@Controller
+@RequestMapping("/broad/zhou")
+@ApiOperation("周看板98寸")
+public class ZhouController {
+
+    @Autowired
+    private IBroadDataService service;
+
+    @PostMapping("/selectProductInStore")
+    @ApiOperation("周产量统计")
+    @ResponseBody
+    public String zhou_selectProductInStore() {
+
+//        IMOS_PR_PRODUCT_BARCODE
+        return JSONArray.toJSONString( service.zhou_selectProductInStore());
+    }
+
+
+    @PostMapping("/selectOrderRateInfo")
+    @ApiOperation("周订单执行情况")
+    @ResponseBody
+    public String zhou_selectOrderRateInfo() {
+        return JSONArray.toJSONString(service.zhou_selectOrderRateInfo());
+    }
+
+
+}

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

@@ -32,12 +32,11 @@ public interface BroadDataMapper {
     // 泡前库
     ///////////////////////////////////////////////////////////////////////////
 
-    //    成品入库
+
-    List<BoxOutput> pqk_selectProductInStore();
 
     List<OrderInfo> pqk_selectOrderInfo();
 
-    List<BoxOutput> pqk_selectQualityItem();
+    List<OrderInfo> zhou_selectOrderRateInfo();
 
     List<QualityInfo> pqk_selectQualityInfo();
 
@@ -96,4 +95,9 @@ public interface BroadDataMapper {
     List<MTKBeen> mtk_sselectQATop3();
 
     List<BoxOutput> mtk_selectQAZD();
+
+    ///////////////////////////////////////////////////////////////////////////
+    // 周看板
+    ///////////////////////////////////////////////////////////////////////////
+    List<MTKBeen> zhou_selectProductInStore();
 }

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

@@ -26,13 +26,13 @@ public interface IBroadDataService {
 
 
 
-    // 泡前库   成品入库
+
-    List<BoxOutput> pqk_selectProductInStore();
+    List<MTKBeen> zhou_selectProductInStore();
     //泡前库 订单完成率
     List<OrderInfo> pqk_selectOrderInfo();
 
 
-    List<BoxOutput> pqk_selectQualityItem();
+    List<OrderInfo> zhou_selectOrderRateInfo();
 
     List<QualityInfo> pqk_selectQualityInfo();
 

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

@@ -96,10 +96,6 @@ public class BroadDataServiceImpl implements IBroadDataService
     ///////////////////////////////////////////////////////////////////////////
 
     //    成品入库
-    @Override
-    public List<BoxOutput> pqk_selectProductInStore(){
-       return mapper.pqk_selectProductInStore();
-    }
 
     @Override
     public List<OrderInfo> pqk_selectOrderInfo() {
@@ -107,8 +103,8 @@ public class BroadDataServiceImpl implements IBroadDataService
     }
 
     @Override
-    public List<BoxOutput> pqk_selectQualityItem() {
+    public List<OrderInfo> zhou_selectOrderRateInfo() {
-        return mapper.pqk_selectQualityItem();
+        return mapper.zhou_selectOrderRateInfo();
     }
 
     @Override
@@ -190,4 +186,12 @@ public class BroadDataServiceImpl implements IBroadDataService
     public BoxOutput zz_selectOneBadRateMb() {
         return mapper.zz_selectOneBadRateMb();
     }
+    ///////////////////////////////////////////////////////////////////////////
+    // 周
+    ///////////////////////////////////////////////////////////////////////////
+    @Override
+    public List<MTKBeen> zhou_selectProductInStore(){
+        return mapper.zhou_selectProductInStore();
+    }
+
 }

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

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="day!= null and day != '' and
              params.beginDay != null and params.beginDay != '' and params.endDay != null and params.endDay != ''"> and day between #{params.beginDay} and #{params.endDay}</if>
         </where>
-        order by day
+        order by day desc
     </select>
     
     <select id="selectBaseProductQtyById" parameterType="Long" resultMap="BaseProductQtyResult">

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

@@ -274,21 +274,20 @@ FROM (select PLAN_NUMBER
         group by MATERIAL_NAME
     </select>
 
-    <select id="pqk_selectProductInStore" resultType="com.ruoyi.system.domain.BoxOutput">
+    <select id="zhou_selectProductInStore" resultMap="MTKBeen">
-        select  substr(MATERIAL_NAME,
+        select to_char(DAY, 'MM-dd') as code, qty, '目标' as name
-              case
+        from haiwei.BASE_PRODUCT_QTY
-                  when instr(MATERIAL_NAME, '/', 1, 1) = 0 then 1
+        where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
-                  else instr(MATERIAL_NAME, '/', 1, 1) + 1
+        union
-                  end,
+        select to_char(PRODUCTION_DATE, 'MM-dd') as code, count(1) as qty, '产量' as name
-              instr(MATERIAL_NAME, ',', 1, 1)
+        from IMOS.IMOS_PR_PRODUCT_BARCODE
-                  -
+        where to_char(PRODUCTION_DATE, 'yyyy-MM-dd') in
-              case
+              (
-                  when instr(MATERIAL_NAME, '/', 1, 1) = 0 then 1
+                  select to_char(DAY, 'yyyy-MM-dd')
-                  else instr(MATERIAL_NAME, '/', 1, 1) + 1
+                  from haiwei.BASE_PRODUCT_QTY
-                  end) as name,
+                  where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
-               IN_QTY as qty
+              )
-        from IMOS_PR_PRODUCT_IN
+        group by to_char(PRODUCTION_DATE, 'MM-dd')
-        where TO_CHAR(CREATION_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
     </select>
 
     <select id="pqk_selectOrderInfo" resultType="com.ruoyi.system.domain.OrderInfo">
@@ -322,15 +321,23 @@ FROM (select PLAN_NUMBER
         group by ORDER_NO
         order by plan_number desc-->
 
-    <select id="pqk_selectQualityItem" resultType="com.ruoyi.system.domain.BoxOutput">
+    <select id="zhou_selectOrderRateInfo" resultType="com.ruoyi.system.domain.OrderInfo">
-        select count(1)             as qty,
+        select substr(ORDER_NO, 5, length(ORDER_NO))  as plan_code,
-               QUALITY_DEFECTS_DESC as name
+               substr(MATERIAL_NAME,
-        from IMOS_QA_PRODUCT_QUALITY
+                      instr(MATERIAL_NAME, '-', 1, 1) + 1,
-        where ITEM_CODE in (1006, 1001) and ROWNUM &lt;6
+                      length(MATERIAL_NAME))          as name,
-                  and to_char(CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+               ORDER_QTY                              as plan_number,
---           and to_char(CREATION_DATE, 'yyyy-MM-dd') between to_char(sysdate - 1, 'yyyy-mm-dd') and to_char(sysdate + 1, 'yyyy-mm-dd')
+               ACTUAL_QTY                             as actual_number,
-        group by QUALITY_DEFECTS_DESC
+               FINISH_DATE                            as day,
-        order by qty desc
+               round(ACTUAL_QTY / ORDER_QTY * 100, 2) as rate
+        from IMOS_PR_ORDER
+        where to_char(FINISH_DATE, 'yyyy-MM-dd') in
+              (
+                  select to_char(DAY, 'yyyy-MM-dd')
+                  from haiwei.BASE_PRODUCT_QTY
+                  where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
+              )
+        order by FINISH_DATE
     </select>
 
     <select id="pqk_selectQualityInfo" resultType="com.ruoyi.system.domain.QualityInfo">
@@ -792,10 +799,10 @@ where DETIAL_TYPE_CODE = '1004'
            select * from (select RHYTHM as  qty, '节拍' as name from haiwei.BASE_RHYTHM where ROWNUM = 1 order by ID desc)
     </select>
     <select id="zz_selectProductInTarget" resultType="com.ruoyi.system.domain.BoxOutput">
-        select sum(QTY) as qty, '目标' as name
+--         select sum(QTY) as qty, '目标' as name
-        from haiwei.BASE_PRODUCT_QTY
+--         from haiwei.BASE_PRODUCT_QTY
-        where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
+--         where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
-        union
+--         union
         select sum(QTY) as qty, '进度目标' as name
         from haiwei.BASE_PRODUCT_QTY
         where to_char(DAY, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')