From c7adabcee9288fef812ccdcaaa8131510d5ed214 Mon Sep 17 00:00:00 2001 From: chj <16637853242@163.com> Date: Mon, 7 Aug 2023 18:02:22 +0800 Subject: [PATCH] =?UTF-8?q?MES=E6=8A=A5=E5=BA=9F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/controller/MesPrepareController.java | 1 + .../impl/ProEmbryoScrapServiceImpl.java | 56 ++++++++++++------- 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareController.java index 1f93d0918..b5a4d6324 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesPrepareController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.common.core.utils.uuid.IdUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProEmbryoScrapServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProEmbryoScrapServiceImpl.java index 661e5e8c5..0ce8504e6 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProEmbryoScrapServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProEmbryoScrapServiceImpl.java @@ -1,7 +1,8 @@ package com.op.mes.service.impl; -import java.util.ArrayList; + import java.util.List; +import java.util.stream.Collectors; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.context.SecurityContextHolder; @@ -16,7 +17,7 @@ import com.op.mes.mapper.ProEmbryoScrapMapper; import com.op.mes.service.IProEmbryoScrapService; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; -import sun.plugin.javascript.navig.Array; + /** * 报废Service业务层处理 @@ -68,7 +69,7 @@ public class ProEmbryoScrapServiceImpl implements IProEmbryoScrapService { @DS("#header.poolName") @Transactional(rollbackFor = Exception.class) public int insertProEmbryoScrap(ProEmbryoScrap proEmbryoScrap) { - proEmbryoScrap.setId(IdUtils.fastSimpleUUID()); + proEmbryoScrap.setId(IdUtils.fastSimpleUUID()); proEmbryoScrap.setCreateBy(SecurityContextHolder.getUserName()); proEmbryoScrap.setUpdateBy(SecurityContextHolder.getUserName()); proEmbryoScrap.setUpdateTime(DateUtils.getNowDate()); @@ -95,16 +96,17 @@ public class ProEmbryoScrapServiceImpl implements IProEmbryoScrapService { ProOrderWorkorder proOrderWorkorder = proEmbryoScrapMapper.selectOrderWorkByProductId(proEmbryoScrap.getMaterialId()); if (ObjectUtils.isEmpty(proOrderWorkorder)) { throw new ServiceException("该物料下没有对应的工单！"); + }else { + proEmbryoScrapDetail.setWorkorderId(proOrderWorkorder.getWorkorderId()); + proEmbryoScrapDetail.setWorkorderCode(proOrderWorkorder.getWorkorderCode()); + proEmbryoScrapDetail.setScrapQuality(proEmbryoScrap.getScrapQuality()); + proEmbryoScrapDetail.setUnit(proEmbryoScrap.getUnit()); + proEmbryoScrapDetail.setStatus(proEmbryoScrap.getStatus()); + proEmbryoScrapDetail.setCreateTime(proEmbryoScrap.getCreateTime()); + proEmbryoScrapDetail.setUpdateTime(proEmbryoScrap.getUpdateTime()); + proEmbryoScrapDetail.setCreateBy(proEmbryoScrap.getCreateBy()); + proEmbryoScrapDetail.setUpdateBy(proEmbryoScrap.getUpdateBy()); } - proEmbryoScrapDetail.setWorkorderId(proOrderWorkorder.getWorkorderId()); - proEmbryoScrapDetail.setWorkorderCode(proOrderWorkorder.getWorkorderCode()); - proEmbryoScrapDetail.setScrapQuality(proEmbryoScrap.getScrapQuality()); - proEmbryoScrapDetail.setUnit(proEmbryoScrap.getUnit()); - proEmbryoScrapDetail.setStatus(proEmbryoScrap.getStatus()); - proEmbryoScrapDetail.setCreateTime(proEmbryoScrap.getCreateTime()); - proEmbryoScrapDetail.setUpdateTime(proEmbryoScrap.getUpdateTime()); - proEmbryoScrapDetail.setCreateBy(proEmbryoScrap.getCreateBy()); - proEmbryoScrapDetail.setUpdateBy(proEmbryoScrap.getUpdateBy()); // todo 向详情表中添加 return proEmbryoScrapDetailMapper.insertProEmbryoScrapDetail(proEmbryoScrapDetail); } @@ -132,7 +134,6 @@ public class ProEmbryoScrapServiceImpl implements IProEmbryoScrapService { proEmbryoScrapDetail.setUpdateTime(DateUtils.getNowDate()); } proEmbryoScrapMapper.updateProEmbryoScrap(proEmbryoScrap); - return proEmbryoScrapDetailMapper.updateProEmbryoScrapDetail(proEmbryoScrapDetail); } @@ -145,14 +146,21 @@ public class ProEmbryoScrapServiceImpl implements IProEmbryoScrapService { @Override @DS("#header.poolName") public int deleteProEmbryoScrapByIds(String[] ids) { - ArrayList strings = new ArrayList<>(); +// ArrayList strings = new ArrayList<>(); +// List proEmbryoScraps = proEmbryoScrapMapper.selectManyProEmbryScrap(ids); +// for (ProEmbryoScrap proEmbryoScrap : proEmbryoScraps) { +// strings.add(proEmbryoScrap.getScrapCode()); +// } +// String[] codes= strings.toArray(new String[0]); +// proEmbryoScrapDetailMapper.deleteProEmbryoScrapDetails(codes); +// return proEmbryoScrapMapper.deleteProEmbryoScrapByIds(ids); List proEmbryoScraps = proEmbryoScrapMapper.selectManyProEmbryScrap(ids); - for (ProEmbryoScrap proEmbryoScrap : proEmbryoScraps) { - strings.add(proEmbryoScrap.getScrapCode()); - } - String[] codes= strings.toArray(new String[0]); - proEmbryoScrapDetailMapper.deleteProEmbryoScrapDetails(codes); + List codes = proEmbryoScraps.stream() + .map(ProEmbryoScrap::getScrapCode) + .collect(Collectors.toList()); + String[] code= codes.toArray(new String[0]); + proEmbryoScrapDetailMapper.deleteProEmbryoScrapDetails(code); return proEmbryoScrapMapper.deleteProEmbryoScrapByIds(ids); } @@ -173,14 +181,20 @@ public class ProEmbryoScrapServiceImpl implements IProEmbryoScrapService { // return proEmbryoScrapMapper.selectProEmbryoScrap(); // } - //查询所有物料名称 + /** + * 查询所有物料名称 + * @return + */ @Override @DS("#header.poolName") public List showAllMaterial() { return proEmbryoScrapMapper.showAllMaterial(); } - //查询工位信息 + /** + * 查询工位信息 + * @return + */ @Override @DS("#header.poolName") public List showSysPost() {