From 3f494d81df7a7f36251457819c7ed1f6bdf9dd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LML=E4=B8=B6?= Date: Thu, 16 May 2024 15:38:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/MesSpotCheckOrderResultController.java | 17 +++++++++++++++++ .../serviceimpl/busi/MesSpotCheckOrderService.java | 21 ++++++++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesSpotCheckOrderResultController.java diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesSpotCheckOrderResultController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesSpotCheckOrderResultController.java new file mode 100644 index 0000000..380a7bd --- /dev/null +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesSpotCheckOrderResultController.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.ext.mes.apiservice.controller.busi; + +import cn.estsh.i3plus.ext.mes.apiservice.controller.base.BaseMesController; +import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrder; +import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderResult; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@Api("点检单明细") +@RestController +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesSpotCheckOrderResult") +public class MesSpotCheckOrderResultController extends BaseMesController { + +} 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 638da66..f829fcc 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 @@ -109,12 +109,12 @@ public class MesSpotCheckOrderService extends BaseMesService } //生成单据号 -// GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE); -// List resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); + GenSerialNoModel genSerialNoModel = new GenSerialNoModel(MesCommonConstant.SPOT_CHECK_ORDER_NO_RULE); + List resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); //保存单据 BeanUtils.copyProperties(equipmentSpotCheck, bean, "id"); - bean.setSpotCheckOrderNo("SPOT_CHECK_ORDER_NO_0002"); + bean.setSpotCheckOrderNo(resultList.get(0)); ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName()); bean = baseRDao.insert(bean); @@ -291,22 +291,25 @@ public class MesSpotCheckOrderService extends BaseMesService //获取点检方案明细 DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); DdlPreparedPack.getNumberBiggerEqualPack(bean.getSpotCheckId(), "pid", packBean); - List detailList = equipmentSpotCheckDetailRepository.findByHqlWhere(packBean); + List detailList = spotCheckOrderResultRepository.findByHqlWhere(packBean); detailList.forEach(k -> { k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); - equipmentSpotCheckDetailRepository.saveAll(detailList); + spotCheckOrderResultRepository.saveAll(detailList); //获取点检方案零件 主表零件表 spotCheckId-pid关联 - List equipmentSpotCheckPartList = equipmentSpotCheckPartRepository.findByHqlWhere(packBean); + //获取点检单零件号 + DdlPackBean orderPartPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(bean.getId(), "spotCheckOrderId", orderPartPackBean); + List oldOrderPartList = spotCheckOrderPartRepository.findByHqlWhere(orderPartPackBean); - if (CollectionUtils.isEmpty(equipmentSpotCheckPartList)) { - equipmentSpotCheckPartList.forEach(k -> { + if (CollectionUtils.isEmpty(oldOrderPartList)) { + oldOrderPartList.forEach(k -> { k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); - equipmentSpotCheckPartRepository.saveAll(equipmentSpotCheckPartList); + spotCheckOrderPartRepository.saveAll(oldOrderPartList); } }