diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index 7f598e89..c4997a82 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -15,9 +15,11 @@ import net.sourceforge.barbecue.BarcodeImageHandler; import org.apache.commons.lang3.StringUtils; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.FlowConst; import org.springblade.desk.basic.pojo.entity.BsAssignEntity; import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity; @@ -46,6 +48,7 @@ import org.springblade.desk.produce.pojo.enums.WorkOrderEnum; import org.springblade.desk.produce.pojo.enums.ProcessCycleEnum; import org.springblade.desk.produce.pojo.vo.*; import org.springblade.desk.produce.service.*; +import org.springblade.desk.quality.mapper.InspectionTaskMapper; import org.springblade.desk.quality.pojo.entity.*; import org.springblade.desk.quality.service.*; import org.springblade.desk.util.date.DateUtils; @@ -91,7 +94,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl oldList, List wpList) { + Date date = new Date(); + BladeUser user = AuthUtil.getUser(); for (WorkPlan prWorkPlan : oldList) { // 如果已经当前工序大于加工中, if (prWorkPlan.getStatus() > WorkPlan.STATUS_START) { @@ -1023,13 +1026,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl rsLst = reviewSheetService.getNoCompleteByWcId(checkByWpId.getId());