Merge remote-tracking branch 'origin/master'

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

@@ -5,12 +5,14 @@ import com.ruoyi.system.domain.OrderInfo;
 import com.ruoyi.system.domain.QualityInfo;
 import com.ruoyi.system.service.IBroadDataService;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.internal.OracleTypes;
 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.sql.*;
 import java.util.List;
 
 /**
@@ -41,6 +43,15 @@ public class ZhouController {
         return JSONArray.toJSONString(service.zhou_selectOrderRateInfo());
     }
 
+      @PostMapping("/selectOrderRateInfoTatle")
+    @ApiOperation("周订单执行情况标题")
+    @ResponseBody
+    public String zhou_selectOrderRateTatle() {
+        return JSONArray.toJSONString(service.zhou_selectOrderRateTatle());
+    }
+
+
+
       @PostMapping("/zhou_selectQaInfo")
     @ApiOperation("周异常情况")
     @ResponseBody
@@ -55,6 +66,45 @@ public class ZhouController {
         return JSONArray.toJSONString(service.zhou_selectQaItemInfo());
     }
 
+  /*   @PostMapping("/zhou_selectQaItemInfo1")
+    @ApiOperation("test")
+    @ResponseBody
+    public void zhou_selectQaItemInfo1() {
+
+
+         try {
+             DriverManager.registerDriver (new oracle.jdbc.OracleDriver());
+
+             Connection conn = DriverManager.getConnection("jdbc:oracle:thin:@10.100.70.5:1521:aucma", "haiwei", "123456");
+             CallableStatement stmt = conn.prepareCall(
+                     "{ call IMOS.IMOS_Pro_6_3_QualityAnalysis2(?,?,?,?,?,?,?,?) }");
+
+             stmt.setNString(1,"2022");
+             stmt.setNString(2,"6");
+             stmt.setNString(3,"");
+             stmt.setNString(4,"1005");
+             stmt.setNString(5,"");
+             stmt.setNString(6,"");
+             stmt.setNString(7,"");
+             stmt.registerOutParameter(8, OracleTypes.CURSOR);
+             stmt.execute();
+             ResultSet rs = (ResultSet) stmt.getObject(6);
+             while (rs.next()) {
+                 System.out.println(rs.getString("PRICE"));
+             }
+             rs.close();
+             rs = null;
+             stmt.close();
+             stmt = null;
+             conn.close();
+             conn = null;
+         }
+         catch (SQLException e) {
+             System.out.println(e.getLocalizedMessage());
+         }
+
+    }*/
+
 
 
 

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

@@ -104,4 +104,6 @@ public interface BroadDataMapper {
     List<BoxOutput> zhou_selectQaInfo();
 
     List<MTKBeen> zhou_selectQaItemInfo();
+
+    List<BoxOutput> zhou_selectOrderRateTatle();
 }

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

@@ -85,4 +85,6 @@ public interface IBroadDataService {
     List<BoxOutput> zhou_selectQaInfo();
 
     List<MTKBeen>  zhou_selectQaItemInfo();
+
+    List<BoxOutput> zhou_selectOrderRateTatle();
 }

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

@@ -203,4 +203,9 @@ public class BroadDataServiceImpl implements IBroadDataService
     public List<MTKBeen> zhou_selectQaItemInfo() {
         return mapper.zhou_selectQaItemInfo();
     }
+
+    @Override
+    public List<BoxOutput> zhou_selectOrderRateTatle() {
+        return mapper.zhou_selectOrderRateTatle();
+    }
 }

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

@@ -252,6 +252,7 @@ FROM (select PLAN_NUMBER
         select sum(PRODUCT_QTY) qty, '实际产量' as name
         from IMOS_PR_FOAMING_MONITOR
     </select>
+
     <select id="selectFpStock" resultType="com.ruoyi.system.domain.BoxOutput">
         select substr(MATERIAL_NAME,
                       case
@@ -273,7 +274,55 @@ FROM (select PLAN_NUMBER
                   and STORE_QTY > 0
         group by MATERIAL_NAME
     </select>
-
+    <select id="zhou_selectOrderRateTatle" resultType="com.ruoyi.system.domain.BoxOutput">
+  select count(1) as qty, '订单数量' as name
+        from IMOS_PR_ORDER
+        where to_char(FINISH_DATE, 'yyyy-MM-dd') in (
+        select to_char(DAY, 'yyyy-MM-dd')
+        from (
+         select to_char(DAY, 'yyyy-MM-dd')
+                  from haiwei.BASE_PRODUCT_QTY
+                  where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7))
+        union
+        select count(1) as qty, '完成数量'  as name
+        from IMOS_PR_ORDER
+         where to_char(FINISH_DATE, 'yyyy-MM-dd') in (
+        select to_char(DAY, 'yyyy-MM-dd')
+        from (
+         select to_char(DAY, 'yyyy-MM-dd')
+                  from haiwei.BASE_PRODUCT_QTY
+                  where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7))
+        and ORDER_QTY - ACTUAL_QTY &lt; 6
+        union
+        select round(
+        (
+        select count(1)
+        from IMOS_PR_ORDER
+         where to_char(FINISH_DATE, 'yyyy-MM-dd') in (
+        select to_char(DAY, 'yyyy-MM-dd')
+        from (
+         select to_char(DAY, 'yyyy-MM-dd')
+                  from haiwei.BASE_PRODUCT_QTY
+                  where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7))
+        and ORDER_QTY - ACTUAL_QTY &lt; 6
+        ) /
+        (
+        select count(1)
+        from IMOS_PR_ORDER
+         where to_char(FINISH_DATE, 'yyyy-MM-dd') in (
+        select to_char(DAY, 'yyyy-MM-dd')
+        from (
+          select to_char(DAY, 'yyyy-MM-dd')
+                  from haiwei.BASE_PRODUCT_QTY
+                  where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7))
+        ) * 100, 2) as qty, '清单率' as name
+        from DUAL
+--         union
+--         select  count(1)as qty, '入库订单统计' as name
+--         from IMOS_PR_PRODUCT_BARCODE ippb
+--         where DETIAL_TYPE_CODE = '1004'
+--           and  to_char(SCAN_TIME, 'yyyy-MM-dd') =to_char(SYSDATE, 'yyyy-MM-dd')
+    </select>
     <select id="zhou_selectQaItemInfo" resultMap="MTKBeen">
         select case
                    when ITEM_CODE = '1001' then '成品检漏'
@@ -294,8 +343,10 @@ FROM (select PLAN_NUMBER
         from HAIWEI.BASE_PRODUCT_QTY
         where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
     </select>
+
+
     <select id="zhou_selectProductInStore" resultMap="MTKBeen">
-        select to_char(DAY, 'MM-dd') as code, qty, '目标' as name
+        select to_char(DAY, 'MM-dd') as code, qty, '计划' as name
         from haiwei.BASE_PRODUCT_QTY
         where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
         union
@@ -1020,101 +1071,7 @@ where DETIAL_TYPE_CODE = '1004'
 
                  from view_imos_pr_barcode sqlwhere
                  where TO_CHAR(SCAN_TIME, 'yyyy-MM-dd') = TO_CHAR(sysdate, 'yyyy-MM-dd')
---                    and ITEM_CODE in ('1001', '1002', '1003', '1005', '1006')
+                   and ITEM_CODE in ('1001', '1002', '1003', '1005', '1006')
-                         and ITEM_CODE ='1001'
-                 group by ITEM_CODE
-             )
-
-             union
-                     select round((CASE
-                          WHEN Sum_Value = 0 THEN 0.00
-                          ELSE (Sum_Value - H_Unqualified_Qty) / Sum_Value END) *
-                     100.00, 2) as rate,
-               case
-                   when ITEM_CODE = '1001' then '成品检漏'
-                   when ITEM_CODE = '1002' then '内胆检漏'
-                   when ITEM_CODE = '1003' then '安全检测'
-                   when ITEM_CODE = '1005' then '测温性能'
-                   when ITEM_CODE = '1006' then '成品外观' end as name
-
-        from (
-                 select ITEM_CODE,
-                        SUM(ALL_QTY) AS        Sum_Value,
-                        SUM(H_Unqualified_Qty) H_Unqualified_Qty
-
-                 from view_imos_pr_barcode sqlwhere
-                 where TO_CHAR(SCAN_TIME, 'yyyy-MM-dd') = TO_CHAR(sysdate, 'yyyy-MM-dd')
---                    and ITEM_CODE in ('1001', '1002', '1003', '1005', '1006')
-                         and ITEM_CODE ='1002'
-                 group by ITEM_CODE
-             )
-                          union
-                     select round((CASE
-                          WHEN Sum_Value = 0 THEN 0.00
-                          ELSE (Sum_Value - H_Unqualified_Qty) / Sum_Value END) *
-                     100.00, 2) as rate,
-               case
-                   when ITEM_CODE = '1001' then '成品检漏'
-                   when ITEM_CODE = '1002' then '内胆检漏'
-                   when ITEM_CODE = '1003' then '安全检测'
-                   when ITEM_CODE = '1005' then '测温性能'
-                   when ITEM_CODE = '1006' then '成品外观' end as name
-
-        from (
-                 select ITEM_CODE,
-                        SUM(ALL_QTY) AS        Sum_Value,
-                        SUM(H_Unqualified_Qty) H_Unqualified_Qty
-
-                 from view_imos_pr_barcode sqlwhere
-                 where TO_CHAR(SCAN_TIME, 'yyyy-MM-dd') = TO_CHAR(sysdate, 'yyyy-MM-dd')
---                    and ITEM_CODE in ('1001', '1002', '1003', '1005', '1006')
-                         and ITEM_CODE ='1003'
-                 group by ITEM_CODE
-             )
-                          union
-                     select round((CASE
-                          WHEN Sum_Value = 0 THEN 0.00
-                          ELSE (Sum_Value - H_Unqualified_Qty) / Sum_Value END) *
-                     100.00, 2) as rate,
-               case
-                   when ITEM_CODE = '1001' then '成品检漏'
-                   when ITEM_CODE = '1002' then '内胆检漏'
-                   when ITEM_CODE = '1003' then '安全检测'
-                   when ITEM_CODE = '1005' then '测温性能'
-                   when ITEM_CODE = '1006' then '成品外观' end as name
-
-        from (
-                 select ITEM_CODE,
-                        SUM(ALL_QTY) AS        Sum_Value,
-                        SUM(H_Unqualified_Qty) H_Unqualified_Qty
-
-                 from view_imos_pr_barcode sqlwhere
-                 where TO_CHAR(SCAN_TIME, 'yyyy-MM-dd') = TO_CHAR(sysdate, 'yyyy-MM-dd')
---                    and ITEM_CODE in ('1001', '1002', '1003', '1005', '1006')
-                         and ITEM_CODE ='1005'
-                 group by ITEM_CODE
-             )
-                          union
-                     select round((CASE
-                          WHEN Sum_Value = 0 THEN 0.00
-                          ELSE (Sum_Value - H_Unqualified_Qty) / Sum_Value END) *
-                     100.00, 2) as rate,
-               case
-                   when ITEM_CODE = '1001' then '成品检漏'
-                   when ITEM_CODE = '1002' then '内胆检漏'
-                   when ITEM_CODE = '1003' then '安全检测'
-                   when ITEM_CODE = '1005' then '测温性能'
-                   when ITEM_CODE = '1006' then '成品外观' end as name
-
-        from (
-                 select ITEM_CODE,
-                        SUM(ALL_QTY) AS        Sum_Value,
-                        SUM(H_Unqualified_Qty) H_Unqualified_Qty
-
-                 from view_imos_pr_barcode sqlwhere
-                 where TO_CHAR(SCAN_TIME, 'yyyy-MM-dd') = TO_CHAR(sysdate, 'yyyy-MM-dd')
---                    and ITEM_CODE in ('1001', '1002', '1003', '1005', '1006')
-                         and ITEM_CODE ='1006'
                  group by ITEM_CODE
              )
     </select>