diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index c659681..7ae76c5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -315,43 +315,43 @@ public class MesSpotCheckOrderService extends BaseMesService String organizeCode = AuthUtilExt.getOrganizeCode(); for (Long id : ids) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getNumEqualPack(id, "id", ddlPackBean); + DdlPreparedPack.getNumEqualPack(id, MesExtConstWords.ID, ddlPackBean); MesSpotCheckOrder bean = baseRDao.getByProperty(ddlPackBean); - if (StringUtils.isEmpty(bean)) continue; - - if (bean.getStatus() == MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.COMPLETE.getValue() && Objects.equals(bean.getSpotCheckOrderResult(), - MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT_TYPE.OK.getValue())) { + if (null == bean) continue; + if (!StringUtils.isEmpty(bean.getStatus()) && bean.getStatus().compareTo(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.COMPLETE.getValue()) == 0 && + !StringUtils.isEmpty(bean.getSpotCheckOrderResult()) && bean.getSpotCheckOrderResult().compareTo(MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT_TYPE.OK.getValue()) == 0) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorDetail("【%s】点检单状态为【%s】,且点检结果为OK,不允许修改,请检查数据", bean.getSpotCheckId(), MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.valueOfDescription(bean.getStatus())) .build(); } - bean.setSystemSyncStatus(CommonEnumUtil.FALSE); + bean.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); bean.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName()); //获取点检方案明细 DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); - DdlPreparedPack.getNumEqualPack(bean.getId(), "pid", packBean); + DdlPreparedPack.getNumEqualPack(bean.getId(), MesExtConstWords.PID, packBean); List detailList = spotCheckOrderResultRepository.findByHqlWhere(packBean); - detailList.forEach(k -> { - k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - k.setSystemSyncStatus(CommonEnumUtil.FALSE); - k.setSystemSyncDatetime(""); - ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); - }); - spotCheckOrderResultRepository.saveAll(detailList); + if (!CollectionUtils.isEmpty(detailList)) { + detailList.forEach(k -> { + k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + k.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + k.setSystemSyncDatetime(""); + ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); + }); + spotCheckOrderResultRepository.saveAll(detailList); + } //获取点检方案零件 主表零件表 spotCheckId-pid关联 //获取点检单零件号 DdlPackBean orderPartPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); - DdlPreparedPack.getNumEqualPack(bean.getId(), "spotCheckOrderId", orderPartPackBean); + DdlPreparedPack.getNumEqualPack(bean.getId(), MesExtConstWords.SPOT_CHECK_ORDER_ID, orderPartPackBean); List oldOrderPartList = spotCheckOrderPartRepository.findByHqlWhere(orderPartPackBean); - - if (CollectionUtils.isEmpty(oldOrderPartList)) { + if (!CollectionUtils.isEmpty(oldOrderPartList)) { oldOrderPartList.forEach(k -> { k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); - k.setSystemSyncStatus(CommonEnumUtil.FALSE); + k.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); k.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index 93621e6..cfdbae7 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -199,6 +199,8 @@ public class MesExtConstWords { public static final String PULL_NAME = "pullName"; //拉动地址 public static final String PULL_ADDR = "pullAddr"; + //点检单id + public static final String SPOT_CHECK_ORDER_ID = "spotCheckOrderId"; //时间[开始/结束]条件 public static final String START_TIME_START = "startTimeStart";