|
@@ -229,8 +229,8 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
|
|
|
apsReportRecordsDo.setChiefoperatorname(currentUser.getName());
|
|
|
//开工时间
|
|
|
apsReportRecordsDo.setStartworktime(DateUtil.date());
|
|
|
- //报工时间
|
|
|
- apsReportRecordsDo.setReportworktime(DateUtil.date());
|
|
|
+// //报工时间
|
|
|
+// apsReportRecordsDo.setReportworktime(DateUtil.date());
|
|
|
//报工状态
|
|
|
apsReportRecordsDo.setReportworkstatus("已开工");
|
|
|
apsReportRecordsDo.setCheckstatus("待检验");
|
|
@@ -503,6 +503,11 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
|
|
|
apsReportRecordsDo.setHeatnumber(heatNumber);
|
|
|
//报工状态
|
|
|
apsReportRecordsDo.setReportworkstatus("已报工");
|
|
|
+ //如过报工时间为空,填入当前时间
|
|
|
+ if(ObjectUtil.isEmpty(apsReportRecordsDo.getReportworktime())){
|
|
|
+ apsReportRecordsDo.setReportworktime(DateUtil.date());
|
|
|
+ }
|
|
|
+
|
|
|
this.updateById(apsReportRecordsDo);
|
|
|
|
|
|
//物理删除原来的报工记录输出物料
|