包装产线看板数据

op-modules/op-mes/src/main/java/com/op/mes/controller/MesBoardController.java

@@ -108,4 +108,12 @@ public class MesBoardController extends BaseController {
         }
         return success(iMesBoradService.getHFxlInfo(mesBoard));
     }
+
+    /**获取包装产线看板数据*/
+    @GetMapping("/getProductionLineData")
+    public AjaxResult getProductionLineData() {
+        return success(iMesBoradService.getProductionLineData());
+    }
+
+
 }

op-modules/op-mes/src/main/java/com/op/mes/controller/MesProductLineController.java

@@ -0,0 +1,26 @@
+package com.op.mes.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * remark
+ *
+ * @author 019117
+ * @date
+ */
+@RestController
+@RequestMapping("/mesProductLine")
+@RequiredArgsConstructor
+public class MesProductLineController {
+
+
+    /**
+     * 生产线汇总看板数据
+     * **/
+
+
+
+
+}

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesMapper.java

@@ -123,4 +123,6 @@ public interface MesMapper {
 
     List<String> getproductLineList();
 
+    List<Map<String, Object>> getProductionLineData();
+
 }

op-modules/op-mes/src/main/java/com/op/mes/service/IMesBoradService.java

@@ -24,4 +24,6 @@ public interface IMesBoradService {
     public List<BoardDTO> getHFxlInfo(BoardDTO mesBoard);
 
     public Map getProductionNumberPLC(BoardDTO mesBoard);
+
+    List<Map<String, Object>> getProductionLineData();
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java

@@ -284,4 +284,10 @@ public class MesBoradServiceImpl implements IMesBoradService {
         }
     }
 
+    @Override
+    @DS("#header.poolName")
+    public List<Map<String, Object>>  getProductionLineData() {
+        return mesMapper.getProductionLineData();
+    }
+
 }

op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml

@@ -552,4 +552,49 @@
             product_date = CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 )
     </select>
 
+    <select id="getProductionLineData" resultType="java.util.Map">
+        SELECT
+        STRING_AGG ( t.productName, ',' ) WITHIN GROUP ( ORDER BY t.workorderCode ASC ) productName,
+        equ.equipment_name equipmentName,
+        SUM ( t.quantitySplit ) planTotal,
+        ISNULL(NULLIF(SUM (  t2.qty_total), 0), SUM ( t1.quantityProduced )) completTotal
+        FROM
+        (
+        SELECT
+        pow.workorder_code workorderCode,
+        pow.product_name productName,
+        SUM ( powb.batch_quantity ) quantitySplit,
+        pow.workorder_name
+        FROM
+        pro_order_workorder pow
+        LEFT JOIN pro_order_workorder_batch powb ON powb.workorder_id = pow.workorder_id
+        WHERE
+        pow.del_flag = '0'
+        AND CONVERT ( VARCHAR ( 10 ), pow.product_date, 120 ) = CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 )
+        AND pow.parent_order = '0'
+        AND powb.del_flag = '0'
+        AND pow.workorder_name IS NOT NULL
+        GROUP BY
+        pow.workorder_code,
+        pow.product_name,
+        pow.workorder_name
+        ) t
+        LEFT JOIN (
+        SELECT
+        workorder_code,
+        SUM ( quantity_feedback ) quantityProduced
+        FROM
+        mes_report_work
+        WHERE
+        CONVERT ( VARCHAR ( 10 ), feedback_time, 120 ) = CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 )
+        AND del_flag = '0'
+        GROUP BY
+        workorder_code
+        ) t1 ON t.workorderCode = t1.workorder_code
+        LEFT JOIN ( SELECT line_code, workorder_code, qty_build, qty_total FROM pro_workbatch_inwork ) t2 ON t.workorderCode = t2.workorder_code
+        LEFT JOIN base_equipment equ ON t.workorder_name = equ.equipment_code
+        GROUP BY
+        equ.equipment_name,t.workorder_name
+    </select>
+
 </mapper>