Merge remote-tracking branch 'origin/master'

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

@@ -29,6 +29,8 @@ public class MesDailyReportVo extends BaseEntity {
     private String equipmentCode;
     @Excel(name = "组别")
     private String equipmentName;
+    @Excel(name = "班次")
+    private String shiftDesc;
     @Excel(name = "品类")
     private String prodType;//分类
 
@@ -104,6 +106,14 @@ public class MesDailyReportVo extends BaseEntity {
     private String machineCode;
     private BigDecimal reportRate;
 
+    public String getShiftDesc() {
+        return shiftDesc;
+    }
+
+    public void setShiftDesc(String shiftDesc) {
+        this.shiftDesc = shiftDesc;
+    }
+
     public String getTeamLeaderNames() {
         return teamLeaderNames;
     }

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

@@ -30,7 +30,7 @@ public class H5ApiServiceImpl implements H5ApiService {
     public List<H5> dailyProductDetil(String workTime) {
         //查询当天的生产情况
         H5 h5=new H5();
-        h5.setFeedbackTime("2025-03-05");
+        h5.setFeedbackTime(workTime);
         //报工信息
         List<H5> h5List=h5ApiMapper.selectMesLineProdceList(h5);
         //报工信息处理

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

@@ -768,6 +768,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			be.sap_name sapName,
 			be.equipment_code equipmentCode,
 			be.equipment_name equipmentName,
+		    bst.Shift_Desc shiftDesc,
 			pow.workorder_code_sap workorderCodeSap,
 		    RIGHT(pow.workorder_code_sap, 9) AS workorderCodeSaps,
 			pow.product_code productCode,
@@ -786,6 +787,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    bp.report_rate reportRate
 		from base_equipment be
 		left join pro_order_workorder pow on be.equipment_code = pow.workorder_name
+		LEFT JOIN base_shifts_t bst ON bst.Shift_Id=pow.shift_id
 		left join mes_line_product mlp on pow.workorder_name = mlp.line_code and pow.product_code = mlp.product_code and mlp.del_flag='0'
 		left join base_product bp on bp.product_code = pow.product_code
 		where be.del_flag = '0' and be.sap_code is not null and pow.status in ('w2','w3')