榄菊日生产报表导出格式、撤销报工的数据不算入计算逻辑修改

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

@@ -10,6 +10,8 @@ import java.util.Date;
 public class MesDailyReportVo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @Excel(name = "工厂编码")
+    private String factoryCode;
     // 车间
     @Excel(name = "车间编码")
     private String workshopCode;
@@ -27,8 +29,13 @@ public class MesDailyReportVo extends BaseEntity {
     private String equipmentCode;
     @Excel(name = "组别")
     private String equipmentName;
+    @Excel(name = "品类")
+    private String prodType;//分类
+    @Excel(name = "组长")
+    private String teamLeaderName;//组长
+    @Excel(name = "工单号")
+    private String workorderCode;
     // 工时
-
     private BigDecimal unitWorkingHours;
 
     private String workorderCodeSap;
@@ -36,45 +43,40 @@ public class MesDailyReportVo extends BaseEntity {
     private String productCode;//产品编码
     @Excel(name = "产品名称")
     private String productName;//产品名称
+    @Excel(name = "规格")
+    private Long spec;//规格
+    @Excel(name = "单位(件)")
+    private String unit;
+    @Excel(name = "计划产量(件)")
+    private Long quantitySplit;
+    @Excel(name = "实际产量(件)")
+    private String quantityFeedback;//实际产量（箱）
+    @Excel(name = "产量(PC)")
+    private String quantityAct;// 产量（盒）
+    @Excel(name = "订单完成率(%)")
+    private String completeRate;// 订单完成率
+    // 标准效率
+    @Excel(name = "产线标准效率(PC/H)")
+    private BigDecimal efficiency;
 
-    //组别
     private String teamCode;
     private String teamDesc;
 
-    @Excel(name = "品类")
-    private String prodType;//分类
-    @Excel(name = "组长")
-    private String teamLeaderName;//组长
     //计划产量
     // 标准用人
     @Excel(name = "标准用人")
     private BigDecimal useMan;
-    // 标准效率
+
-    @Excel(name = "产线标准效率")
-    private BigDecimal efficiency;
-    @Excel(name = "工单号")
-    private String workorderCode;
     private String workorderName;
     private String quantity;//计划产量（箱）
-    @Excel(name = "规格")
+
-    private Long spec;//规格
-    @Excel(name = "单位")
-    private String unit;
-    @Excel(name = "计划产量")
-    private Long quantitySplit;
-    @Excel(name = "实际产量")
-    private String quantityFeedback;//实际产量（箱）
-    @Excel(name = "产量")
-    private String quantityAct;// 产量（盒）
-    @Excel(name = "产线标准效率")
-    private String completeRate;// 订单完成率
     @Excel(name = "实际用人")
     private String manStandard;//实际用人
     @Excel(name = "标准工时")
     private String workTimeStandard;//工时-标准
     @Excel(name = "实际工时")
     private BigDecimal workTime;//工时-实际
-    @Excel(name = "产线效率")
+    @Excel(name = "产线效率(%)")
     private String productivity;//工时-产线效率
     @Excel(name = "总工时")
     private String totalWorkTime;
@@ -95,8 +97,6 @@ public class MesDailyReportVo extends BaseEntity {
     private String equipmentTypeCode;
 
     private String machineCode;
-    @Excel(name = "工厂编码")
-    private String factoryCode;
     private BigDecimal reportRate;
 
     public BigDecimal getReportRate() {

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

@@ -709,6 +709,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select sum(quantity_feedback) quantityFeedbackSum
 		from mes_report_work
 		where workorder_code = #{workorderCode} and del_flag = '0' and machine_code = #{machineCode}
+        and upload_status = '1'
 	</select>
 
 	<select id="getSumQuantity" resultType="com.op.mes.domain.dto.QuantityDto">
@@ -719,6 +720,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			sum(work_time*use_man) totalWorkTime
 		from mes_report_work
 		where parent_order = #{workorderCode} and del_flag = '0' and machine_code = #{machineCode}
+		  and upload_status = '1'
 	</select>
 
 	<select id="selectMesReportWorkList_S" parameterType="MesReportWork" resultMap="MesReportWorkResult">