派工表记录实际开始、结束时间

mes/src/main/java/com/ximai/mes/pro/domain/task/ProTaskWorkunit.java

@@ -117,6 +117,14 @@ public class ProTaskWorkunit extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date scheduleEndDate;
 
+    @ApiModelProperty("实际开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date actualStartDate;
+
+    @ApiModelProperty("实际结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date actualEndDate;
+
     @ApiModelProperty("备注")
     private String remark;
 

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java

@@ -841,6 +841,8 @@ public class ProTaskServiceImpl implements IProTaskService {
 
         //本次合格数和不合格数总和大于可报工数目 与 已报工数目已经超过了排产数量
         if ((feedbackQualityDouConst + fuantityUnqualify.doubleValue())>= task.getQuantityWait().doubleValue() &&  task.getQuantity().doubleValue() <= (execQuantityQualifySumConst + feedbackQualityDouConst + fuantityUnqualify.doubleValue())) {
+            //记录实际完工时间
+            taskWorkunit.setActualEndDate(Calendar.getInstance().getTime());
             taskWorkunit.setStatus(FINISHED.getStatus());
         }
         quantityWaitVal = taskQuantityWaitConst.subtract(feedbackQualityVal.add(fuantityUnqualify));

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskWorkunitServiceImpl.java

@@ -205,6 +205,10 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
                     proWorkorderService.updateWorkorderState(proWorkorder, WorkorderStatusEnum.PRODUCING);
                 }
             }
+            //记录实际开始时间
+            if(proTaskWorkunit.getActualStartDate()==null){
+                proTaskWorkunit.setActualStartDate(Calendar.getInstance().getTime());
+            }
         }
         proTaskWorkunit.setStatus(taskStatusEnum.getStatus());
         this.updateProTaskWorkunit(proTaskWorkunit);

mes/src/main/resources/mapper/pro/task/ProTaskWorkunitMapper.xml

@@ -23,6 +23,10 @@
         <result property="createTime" column="create_time"/>
         <result property="remark" column="remark"/>
         <result property="outsourceUnitPrice" column="outsource_unit_price"/>
+        <result property="scheduleStartDate" column="schedule_start_date"/>
+        <result property="scheduleEndDate" column="schedule_end_date"/>
+        <result property="actualStartDate" column="actual_start_date"/>
+        <result property="actualEndDate" column="actual_end_date"/>
         <result property="vendorId" column="vendor_id"/>
         <result property="vendorName" column="vendor_name"/>
         <result property="outsourced" column="outsourced"/>
@@ -49,6 +53,8 @@
                ptw.quantity_changed,
                ptw.schedule_start_date,
                ptw.schedule_end_date,
+               ptw.actual_start_date,
+               ptw.actual_end_date,
                ptw.status,
                ptw.create_by,
                ptw.create_time,
@@ -165,6 +171,8 @@
             <if test="status != null">status = #{status},</if>
             <if test="scheduleStartDate != null">schedule_start_date = #{scheduleStartDate},</if>
             <if test="scheduleEndDate != null">schedule_end_date = #{scheduleEndDate},</if>
+            <if test="actualStartDate != null">actual_start_date = #{actualStartDate},</if>
+            <if test="actualEndDate != null">actual_end_date = #{actualEndDate},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>