From bc24e2f27542dd9ba7add0707a91bc0b90ba96e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Fri, 27 Mar 2026 18:42:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 4 +-- .../controller/PlateAroundController.java | 12 +++------ .../produce/service/IPlateAroundService.java | 6 ++--- .../service/impl/PlateAroundServiceImpl.java | 25 ++++++++++++++++--- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 7b82fcee..9729cc37 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -31,8 +31,8 @@ public interface LauncherConstant { /** * nacos dev 地址 */ - String NACOS_DEV_ADDR = "192.168.249.27:8848"; -// String NACOS_DEV_ADDR = "127.0.0.1:8848"; +// String NACOS_DEV_ADDR = "192.168.249.27:8848"; + String NACOS_DEV_ADDR = "127.0.0.1:8848"; /**R * nacos prod 地址 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java index 60e3f9ca..81bc32fe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java @@ -62,10 +62,8 @@ public class PlateAroundController extends BladeController { @ApiOperationSupport(order = 2) @Operation(summary = "扫描流程卡获取镀前入库数据", description = "传入cardNo") public R getBeforePlatInCardNo(String cardNo) { - // todo 获取当前登录人班组 - List tsIds = new ArrayList<>(); // 获取镀前入库数据 - WorkPlan wp = plateAroundService.getBeforePlatInCardNo(cardNo, tsIds); + WorkPlan wp = plateAroundService.getBeforePlatInCardNo(cardNo); if (wp != null) { if (!wp.getStatus().equals(WorkPlan.STATUS_WORK_OK)) { throw new ServiceException("工序未报工完成，不能进行镀前入库！"); @@ -80,9 +78,7 @@ public class PlateAroundController extends BladeController { @ApiOperationSupport(order = 3) @Operation(summary = "扫描流程卡获取镀前出库数据", description = "传入cardNo") public R getBeforePlatOutCardNo(String cardNo) { - // todo 获取当前登录人班组 - List tsIds = new ArrayList<>(); - PlateAround plateAround = plateAroundService.getBeforePlatOutCardNo(cardNo, tsIds); + PlateAround plateAround = plateAroundService.getBeforePlatOutCardNo(cardNo); if (plateAround == null) { throw new ServiceException("未找到镀前出库工序，无法出库!"); } @@ -93,9 +89,7 @@ public class PlateAroundController extends BladeController { @ApiOperationSupport(order = 4) @Operation(summary = "扫描流程卡获取镀后数据", description = "传入cardNo") public R getAfterPlatInCardNo(String cardNo) { - // todo 获取当前登录人班组 - List tsIds = new ArrayList<>(); - return R.data(plateAroundService.getAfterPlatInCardNo(cardNo, tsIds)); + return R.data(plateAroundService.getAfterPlatInCardNo(cardNo)); } @PostMapping(value = "/deleteById") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPlateAroundService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPlateAroundService.java index fb56fe1d..d2e3d587 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPlateAroundService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPlateAroundService.java @@ -23,11 +23,11 @@ public interface IPlateAroundService extends BaseService { IPage queryByReadStatus(IPage page, PlateAroundDto query); - WorkPlan getBeforePlatInCardNo(String cardNo, List tsIds); + WorkPlan getBeforePlatInCardNo(String cardNo); - PlateAround getBeforePlatOutCardNo(String cardNo, List tsIds); + PlateAround getBeforePlatOutCardNo(String cardNo); - AfterPlateInVO getAfterPlatInCardNo(String cardNo, List tsIds); + AfterPlateInVO getAfterPlatInCardNo(String cardNo); boolean savePlateAround(SavePlateAroundDto plateAroundDto); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java index 5193d8ae..c07a6154 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java @@ -13,8 +13,10 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.service.IOemService; +import org.springblade.desk.basic.service.IRelTeamSetUserService; import org.springblade.desk.basic.service.ITeamSetService; import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; @@ -40,6 +42,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 镀前镀后 服务实现类 @@ -69,18 +72,24 @@ public class PlateAroundServiceImpl extends BaseServiceImpl queryByReadStatus(IPage page, PlateAroundDto plateAroundDto) { return page.setRecords(baseMapper.queryByReadStatus(page, plateAroundDto)); } @Override - public WorkPlan getBeforePlatInCardNo(String cardNo, List tsIds) { + public WorkPlan getBeforePlatInCardNo(String cardNo) { WorkOrder wo = workOrderService.getWorkOrderByCardNo(cardNo); if (wo == null) { throw new ServiceException("车间订单不存在！"); } + List tsIds = getTsIds(); WorkPlan beforePlatInCardNo = baseMapper.getBeforePlatInCardNo(wo.getId(), tsIds, AuthUtil.getUserId()); + if (beforePlatInCardNo == null) { + throw new ServiceException("未查询到订单！"); + } long count = this.count(Wrappers.lambdaQuery(PlateAround.class).eq(PlateAround::getWpId, beforePlatInCardNo.getId()).eq(PlateAround::getPaType, PlateAround.BEFORE_PLAT_IN)); if (count > 0) { throw new ServiceException("此订单已存在镀前入库记录！"); @@ -89,12 +98,16 @@ public class PlateAroundServiceImpl extends BaseServiceImpl tsIds) { + public PlateAround getBeforePlatOutCardNo(String cardNo) { WorkOrder wo = workOrderService.getWorkOrderByCardNo(cardNo); if (wo == null) { throw new ServiceException("车间订单不存在！"); } + List tsIds = getTsIds(); PlateAround plateAround = baseMapper.getBeforePlatOutCardNo(wo.getId(), tsIds, AuthUtil.getUserId()); + if (plateAround == null) { + throw new ServiceException("未查询到订单！"); + } long count = this.count(Wrappers.lambdaQuery(PlateAround.class).eq(PlateAround::getWpId, plateAround.getWpId()).eq(PlateAround::getPaType, PlateAround.BEFORE_PLAN_OUT)); if (count > 0) { throw new ServiceException("此订单已存在镀前出库记录！"); @@ -103,12 +116,12 @@ public class PlateAroundServiceImpl extends BaseServiceImpl tsIds) { + public AfterPlateInVO getAfterPlatInCardNo(String cardNo) { WorkOrder wo = workOrderService.getWorkOrderByCardNo(cardNo); if (wo == null) { throw new ServiceException("车间订单不存在！"); } - WorkPlan wp = baseMapper.getAfterPlatInCardNo(wo.getId(), tsIds); + WorkPlan wp = baseMapper.getAfterPlatInCardNo(wo.getId(), getTsIds()); if (wp == null) { throw new ServiceException("未找到镀后入库工序，无法入库!"); } @@ -146,6 +159,10 @@ public class PlateAroundServiceImpl extends BaseServiceImpl getTsIds() { + return relTeamSetUserService.list(Wrappers.lambdaQuery(RelTeamSetUser.class).eq(RelTeamSetUser::getUserId, AuthUtil.getUserId())).stream().map(RelTeamSetUser::getTeamSetId).collect(Collectors.toList()); + } + @Override public boolean savePlateAround(SavePlateAroundDto plateAroundDto) { List plateArounds = plateAroundDto.getPlateArounds();