diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index de5c753..06d091d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -198,13 +198,14 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { Integer orderResult = MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT.OK.getValue(); for (MesSpotCheckOrderResult result : model.getOrderResultList()) { - if (StringUtils.isEmpty(result.getSpotCheckResult())) { - throw new ImppBusiException(String.format("点检单明细未填写完成,请继续质检", result.getSpotCheckResult())); + if (StringUtils.isEmpty(result.getSpotCheckRealValue())) { + throw new ImppBusiException(String.format("点检单明细未填写完成,请继续质检", result.getSpotCheckRealValue())); } if (result.getIsTolerance() != MesCommonConstant.TRUE_INTEGER && orderResult == MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT.OK.getValue()) { orderResult = MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT.NOK.getValue(); } + result.setSpotCheckTime(TimeTool.getNowTime(true)); ConvertBean.serviceModelUpdate(result, AuthUtil.getSessionUser().getUserName()); } @@ -229,7 +230,6 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { //校验点检单 MesSpotCheckOrder spotCheckOrder = checkSpotCheckOrder(model.getSpotCheckOrder()); -// MesSpotCheckOrder spotCheckOrder = spotCheckOrderRepository.getById(model.getId()); //生成新点检单 MesSpotCheckOrder spotCheckOrderTemp = new MesSpotCheckOrder(); @@ -242,7 +242,6 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { //保存新点检单 spotCheckOrderTemp.setSpotCheckOrderNo(resultList.get(0)); -// ConvertBean.serviceModelInitialize(spotCheckOrderTemp, "LML"); ConvertBean.serviceModelInitialize(spotCheckOrderTemp, AuthUtil.getSessionUser().getUserName()); spotCheckOrderTemp = spotCheckOrderRepository.insert(spotCheckOrderTemp);