修改 总装

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

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

ruoyi-system/src/main/java/com/ruoyi/system/domain/QualityInfo.java

@@ -5,26 +5,19 @@ package com.ruoyi.system.domain;
  * @date 2022/7/14  9:30
  */
 public class QualityInfo {
-    private String code;
+
-    private String qa;
+    private String type;
     private String item;
-    private String day;
+    private int qty;
-    private String state;
+    private double rate;
 
-    public String getCode() {
+
-        return code;
+    public String getType() {
+        return type;
     }
 
-    public void setCode(String code) {
+    public void setType(String type) {
-        this.code = code;
+        this.type = type;
-    }
-
-    public String getQa() {
-        return qa;
-    }
-
-    public void setQa(String qa) {
-        this.qa = qa;
     }
 
     public String getItem() {
@@ -35,19 +28,19 @@ public class QualityInfo {
         this.item = item;
     }
 
-    public String getDay() {
+    public int getQty() {
-        return day;
+        return qty;
     }
 
-    public void setDay(String day) {
+    public void setQty(int qty) {
-        this.day = day;
+        this.qty = qty;
     }
 
-    public String getState() {
+    public double getRate() {
-        return state;
+        return rate;
     }
 
-    public void setState(String state) {
+    public void setRate(double rate) {
-        this.state = state;
+        this.rate = rate;
     }
 }

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

@@ -292,24 +292,24 @@ FROM (select PLAN_NUMBER
     </select>
 
     <select id="pqk_selectOrderInfo" resultType="com.ruoyi.system.domain.OrderInfo">
-        select plan_code,
+        select substr(ORDER_NO, 5, length(ORDER_NO)) as plan_code,
-               plan_number,
+        substr(MATERIAL_NAME,
-               actual_number,
+        instr(MATERIAL_NAME, '-', 1, 1) + 1,
-               day,
+        length(MATERIAL_NAME)) as name ,
-               round(actual_number/ plan_number * 100, 2) as rate
+        ORDER_QTY as plan_number,
+        ACTUAL_QTY as actual_number
 
+        from IMOS_PR_ORDER
+        where to_char(FINISH_DATE, 'yyyy-MM-dd') in
+        (
+        select to_char(DAY, 'yyyy-MM-dd')
         from (
-                 select ORDER_NO                       as plan_code,
+        select DAY, ROWNUM as qt
-
+        from haiwei.BASE_PRODUCT_QTY
-                        sum(PLAN_QTY)                  as plan_number,
+        where DAY &lt; to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss')
-                        SUM(ACTUAL_QTY)                as actual_number,
+        order by DAY desc)
-                        to_char(sysdate, 'yyyy-MM-dd') as day
+        where qt &lt; 4
-                 from IMOS_PR_PLAN
+        )
-                 where DETIAL_TYPE_CODE = 1004
-                   and TO_CHAR(CREATION_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
-                 group by ORDER_NO
-             )
-        order by  rate desc
     </select>
     <!-- 通过入库查订单   select ORDER_NO as name,
         round(SUM(ACTUAL_QTY) / sum(PLAN_QTY) * 100, 2) as qty
@@ -334,17 +334,31 @@ FROM (select PLAN_NUMBER
     </select>
 
     <select id="pqk_selectQualityInfo" resultType="com.ruoyi.system.domain.QualityInfo">
-         select PRODUCT_BARCODE as code,
+
-               QUALITY_DEFECTS_DESC as qa,
+        select *
-               base.ITEM_NAME as item,
+        from (
-               to_char(record.CREATION_DATE, 'yyyy-MM-dd') as day,
+        select QUALITY_DEFECTS_DESC as type,
-               case when ALLOW_FLAG = 0 then '不放行' else '放行' end as  state
+        base.ITEM_NAME       as item,
+        count(1)             as qty,
+        round(count(1) / (
+        select sum(qty)
+        from (
+        select QUALITY_DEFECTS_DESC as type,
+        base.ITEM_NAME       as item,
+        count(1)             as qty
         from IMOS_QA_PRODUCT_QUALITY record
-                 left join IMOS_QA_QUALITY_ITEM base on record.ITEM_CODE = base.ITEM_CODE
+        left join IMOS_QA_QUALITY_ITEM base on record.ITEM_CODE = base.ITEM_CODE
-        where record.ITEM_CODE in (1006, 1001)
+        where to_char(record.CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
-         and to_char(record.CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+        group by base.ITEM_NAME, QUALITY_DEFECTS_DESC
---         and  to_char(record.CREATION_DATE, 'yyyy-MM-dd') between to_char(sysdate-1,'yyyy-mm-dd') and to_char(sysdate+1,'yyyy-mm-dd')
+        order by count(1) desc)
-        order by record.CREATION_DATE desc
+        where ROWNUM &lt; 11
+        )*100   ,2)                 as rate
+        from IMOS_QA_PRODUCT_QUALITY record
+        left join IMOS_QA_QUALITY_ITEM base on record.ITEM_CODE = base.ITEM_CODE
+        where to_char(record.CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
+        group by base.ITEM_NAME, QUALITY_DEFECTS_DESC
+        order by count(1) desc)
+        where ROWNUM &lt; 11
     </select>
 
     <select id="fp_selectDeviceStation" resultType="com.ruoyi.system.domain.DeviceStation">