报表看板修改，导出数据修改。

op-modules/op-mes/src/main/java/com/op/mes/domain/vo/MesDailyReportVo.java

@@ -31,16 +31,20 @@ public class MesDailyReportVo extends BaseEntity {
     private String equipmentName;
     @Excel(name = "品类")
     private String prodType;//分类
-    @Excel(name = "组长")
+
     private String teamLeaderName;//组长
-    @Excel(name = "工单号")
+    @Excel(name = "组长")
+    private String teamLeaderNames;//组长
     private String workorderCode;
     // 工时
     private BigDecimal unitWorkingHours;
 
     private String workorderCodeSap;
-    @Excel(name = "产品编码")
+    @Excel(name = "工单号")
+    private String workorderCodeSaps;
     private String productCode;//产品编码
+    @Excel(name = "产品编码")
+    private String productCodes;
     @Excel(name = "产品名称")
     private String productName;//产品名称
     @Excel(name = "规格")
@@ -95,10 +99,35 @@ public class MesDailyReportVo extends BaseEntity {
     private String workCenter;
 
     private String equipmentTypeCode;
+    @Excel(name = "影响效率原因")
     private String reason;
     private String machineCode;
     private BigDecimal reportRate;
 
+    public String getTeamLeaderNames() {
+        return teamLeaderNames;
+    }
+
+    public void setTeamLeaderNames(String teamLeaderNames) {
+        this.teamLeaderNames = teamLeaderNames;
+    }
+
+    public String getWorkorderCodeSaps() {
+        return workorderCodeSaps;
+    }
+
+    public void setWorkorderCodeSaps(String workorderCodeSaps) {
+        this.workorderCodeSaps = workorderCodeSaps;
+    }
+
+    public String getProductCodes() {
+        return productCodes;
+    }
+
+    public void setProductCodes(String productCodes) {
+        this.productCodes = productCodes;
+    }
+
     public String getReason() {
         return reason;
     }

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

@@ -200,7 +200,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
             totals = mesMapper.getTotalNum(boardDTO);
 
             for(BoardDTO total:totals){
-                total.setTotalNum(total.getTotalNum());
+                total.setTotalNum(total.getTotalNum()-5);
                 total.setEquTypeCode(total.getEquTypeCode().replace("H","X"));
                 total.setEquTypeName(total.getEquTypeName().replace("烘房","收坯机"));
             }

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

@@ -99,7 +99,7 @@ GROUP BY
 	monitor_id,
 	CAST(end_time AS DATE)
 ORDER BY
-	report_date ASC;
+    monitor_name ASC, report_date ASC;
     </select>
 
 </mapper>

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

@@ -119,7 +119,7 @@
         from mes_material_transfer_result mt
         left join base_equipment equ on mt.equipmentCode = equ.equipment_code
         where CONVERT(varchar(10),mt.update_time, 120) = #{ymd} and equ.equipment_name is not null
-        and equ.equipment_type_code = #{equTypeCode} and mt.equipmentCode not in('H61','H62','H63')
+        and equ.equipment_type_code = #{equTypeCode}
         <if test="shiftId != null  and shiftId != ''">
             and mt.shift_id = #{shiftId}
         </if>

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

@@ -675,11 +675,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			be.equipment_code equipmentCode,
 			be.equipment_name equipmentName,
 			pow.workorder_code_sap workorderCodeSap,
+		    RIGHT(pow.workorder_code_sap, 9) AS workorderCodeSaps,
 			pow.product_code productCode,
+			RIGHT(pow.product_code, 11) AS productCodes,
 			pow.product_name productName,
 			pow.unit unit,
 			pow.quantity_split quantitySplit,
 		    pow.attr3 teamLeaderName,
+		    LEFT(pow.attr3, CHARINDEX('-', pow.attr3) - 1) AS teamLeaderNames,
 			mlp.use_man manStandard,
 			mlp.hour_efficiency efficiency,
 			mlp.attr1 unitWorkingHours,
@@ -780,8 +783,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		SELECT
 		mrw.machine_name,
 		mrw.workorder_code,
-		pow.workorder_code_sap,
+		RIGHT(pow.workorder_code_sap, 9) AS workorder_code_sap,
-		mrw.product_code,
+-- 		pow.workorder_code_sap,
+		RIGHT(mrw.product_code, 11) AS product_code,
+-- 		mrw.product_code,
 		mrw.product_name,
 		mrw.batch,
 		mrw.spec,

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

@@ -101,6 +101,7 @@
         mes_unitprice_report mur
         LEFT JOIN mes_unit_price mup ON RIGHT ( mur.product_code, 11 ) = mup.product_code
         AND mur.childprocess_code = mup.childprocess_code
+        AND mup.line_code = mur.line_code
         LEFT JOIN base_equipment be ON be.sap_code= mur.line_code
         LEFT JOIN ( SELECT parent_order, SUM ( quantity ) AS total_quantity,SUM(quantity_feedback) AS order_quantity FROM mes_report_work GROUP BY parent_order ) mrw ON mur.workorder_code = mrw.parent_order
         LEFT JOIN ( SELECT workorder_code, SUM ( quantity ) AS total_quantity,SUM(quantity_feedback) AS order_quantity FROM mes_report_work GROUP BY workorder_code ) mrws ON mur.workorder_code = mrws.workorder_code