From e318154b149f6607977552e66a682ccb0023c312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Tue, 17 Mar 2026 14:02:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/service/IUserRightService.java | 7 ++ .../service/impl/UserRightServiceImpl.java | 12 +++ .../desk/device/service/IRackSetService.java | 8 ++ .../service/impl/RackSetServiceImpl.java | 10 ++ .../produce/controller/PdaLoadController.java | 11 ++- .../produce/controller/PdaSaveController.java | 66 +++++++------ .../desk/produce/mapper/MakeRecMapper.xml | 2 +- .../desk/produce/service/IPdaLoadService.java | 6 +- .../desk/produce/service/IPdaSaveService.java | 1 - .../service/impl/MakeRecServiceImpl.java | 19 ++-- .../service/impl/PdaLoadServiceImpl.java | 99 +++++++++++++------ .../service/impl/PdaSaveServiceImpl.java | 59 +++++------ 12 files changed, 196 insertions(+), 104 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IUserRightService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IUserRightService.java index 046cf4b1..e404ecbf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IUserRightService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IUserRightService.java @@ -41,4 +41,11 @@ public interface IUserRightService extends BaseService { * @param vo */ void setVOValue(UserRightVO vo); + + /** + * 获取团队id + * @param userId + * @return + */ + List getTeamId(Long userId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/UserRightServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/UserRightServiceImpl.java index 527080ae..a909b929 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/UserRightServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/UserRightServiceImpl.java @@ -5,6 +5,8 @@ package org.springblade.desk.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; @@ -12,6 +14,7 @@ import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.constant.UserRightConst; import org.springblade.desk.basic.excel.UserRightExcel; import org.springblade.desk.basic.mapper.UserRightMapper; import org.springblade.desk.basic.pojo.entity.UserRight; @@ -66,4 +69,13 @@ public class UserRightServiceImpl extends BaseServiceImpl getTeamId(Long userId) { + List bsTeamSet = this.list(Wrappers.lambdaQuery(UserRight.class).eq(UserRight::getUserId, userId).eq(UserRight::getUrType, UserRightConst.UR_TYPE_TEAM_SET)); + if (CollectionUtils.isEmpty(bsTeamSet)) { + return null; + } + return bsTeamSet.stream().map(UserRight::getTheId).toList(); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRackSetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRackSetService.java index 2c2f7aef..a16851b4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRackSetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IRackSetService.java @@ -67,4 +67,12 @@ public interface IRackSetService extends BaseService { * @return */ Boolean bind(@NotEmpty List ids, Integer deviceId); + + /** + * 根据挂具编号查询挂具信息 + * + * @param rsCode + * @return + */ + RackSetEntity getBsRackSetByCode(String rsCode); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java index 6d197291..da245702 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/RackSetServiceImpl.java @@ -26,6 +26,7 @@ package org.springblade.desk.device.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.desk.device.mapper.RackSetMapper; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; @@ -91,4 +92,13 @@ public class RackSetServiceImpl extends BaseServiceImpl rackSets = this.list(Wrappers.lambdaQuery(RackSetEntity.class).eq(RackSetEntity::getRsCode, rsCode)); + if (CollectionUtils.isEmpty(rackSets)) { + return null; + } + return rackSets.get(0); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java index a7b29947..3fb0671e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java @@ -11,6 +11,7 @@ import org.springblade.desk.device.pojo.entity.RackSetEntity; import org.springblade.desk.device.pojo.vo.RackSetVO; import org.springblade.desk.device.wrapper.RackSetWrapper; import org.springblade.desk.produce.pojo.dto.TurnTypeDTO; +import org.springblade.desk.produce.pojo.vo.PdaProRelevantVO; import org.springblade.desk.produce.service.IPdaLoadService; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springframework.web.bind.annotation.*; @@ -30,18 +31,21 @@ import org.springframework.web.bind.annotation.*; public class PdaLoadController { private final IPdaLoadService pdaLoadService; + @GetMapping(value = "/loadBindData/{cardNo}") @ApiOperationSupport(order = 1) @Operation(summary = "加载绑定需要的流程卡数据", description = "传入cardNo") public R loadBindData(@PathVariable String cardNo) { - return R.data(pdaLoadService.loadBindData(AuthUtil.getUser(), cardNo)); + return R.data(pdaLoadService.loadBindData(AuthUtil.getUserId(), cardNo)); } + @GetMapping(value = "getBsFeiBaSetByCode/{rsCode}") @ApiOperationSupport(order = 2) @Operation(summary = "根据挂具编码查询数据", description = "传入rsCode") public R getBsFeiBaSetByCode(@PathVariable String rsCode) { return R.data(pdaLoadService.getBsRackSetByCode(rsCode)); } + @GetMapping(value = "/getBsFeiBaSetByCodeUn/{fsCode}") @ApiOperationSupport(order = 3) @Operation(summary = "根据挂具编码查询数据(解绑)", description = "传入fsCode") @@ -55,16 +59,18 @@ public class PdaLoadController { public R getEcByDeviceCode(@PathVariable String deviceCode) { return R.data(pdaLoadService.getEcByCode(deviceCode)); } + @GetMapping(value = "/loadSubOrder/{cardNo}") @ApiOperationSupport(order = 5) @Operation(summary = "加载子件订单入库数据", description = "传入cardNo") public R loadSubOrder(@PathVariable String cardNo) { return R.data(pdaLoadService.loadSubOrder(cardNo)); } + @GetMapping(value = "/loadProTest/{cardNo}") @ApiOperationSupport(order = 6) @Operation(summary = "加载当前工序检验数据", description = "传入cardNo") - public R loadProTest(@PathVariable String cardNo) { + public R loadProTest(@PathVariable String cardNo) { return R.data(pdaLoadService.loadProTestWorkPlan(cardNo)); } @@ -74,6 +80,7 @@ public class PdaLoadController { public R loadPrMacToolUseByMtnCode(@PathVariable String mtnCode) { return R.data(pdaLoadService.loadPrMacToolUseByMtnCode(mtnCode)); } + @GetMapping(value = "/deletedProduceRun/{mtnCode}") @ApiOperationSupport(order = 8) @Operation(summary = "根据同槽号删除信息", description = "传入mtnCode") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java index 49b0d514..440d0fce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaSaveController.java @@ -32,84 +32,94 @@ public class PdaSaveController { private final IPdaSaveService pdaSaveService; private final IBasicClazzService basicClazzService; + @Operation(summary = "流程卡与挂具绑定") @PostMapping("/gjBindingCrad") - public R gjBindingCrad(@RequestParam(value = "rsId") Long rsId,@RequestParam(value = "planListIds") String planListIds) { + public R gjBindingCrad(@RequestParam(value = "rsId") Long rsId, @RequestParam(value = "planListIds") String planListIds) { pdaSaveService.bindingCard(rsId, null, null, planListIds); - return R.success() ; + return R.success(); } + @Operation(summary = "挂具与飞靶绑定") @PostMapping("/gjBindingFb") - public R gjBindingFb(@RequestParam(value = "fsId") Long fsId,@RequestParam(value = "rsListIds") String rsListIds) { - pdaSaveService.binding(fsId, null, null,null, rsListIds); - return R.success() ; + public R gjBindingFb(@RequestParam(value = "fsId") Long fsId, @RequestParam(value = "rsListIds") String rsListIds) { + pdaSaveService.binding(fsId, null, null, null, rsListIds); + return R.success(); } + @Operation(summary = "飞靶与设备绑定") @PostMapping("/fbBindingEc") - public R fbBindingEc(@RequestParam(value = "fsId") Long fsId,@RequestParam(value = "ecId") Long ecId, - @RequestParam(value = "hangNum") Long hangNum,@RequestParam(value = "unFsBool") Boolean unFsBool) { + public R fbBindingEc(@RequestParam(value = "fsId") Long fsId, @RequestParam(value = "ecId") Long ecId, + @RequestParam(value = "hangNum") Long hangNum, @RequestParam(value = "unFsBool") Boolean unFsBool) { String hangNumName = ""; BasicClazz bsBasicClass = null; - if(hangNum != null&&hangNum != -1){ + if (hangNum != null && hangNum != -1) { bsBasicClass = basicClazzService.getById(hangNum); - if(bsBasicClass != null){ + if (bsBasicClass != null) { hangNumName = bsBasicClass.getName(); } - }else if(hangNum == -1){ + } else if (hangNum == -1) { hangNumName = "-1"; } - pdaSaveService.binding(fsId, ecId, unFsBool, hangNumName,null); + pdaSaveService.binding(fsId, ecId, unFsBool, hangNumName, null); // 删除产线设备对应的挂次号之前的数据 - if(bsBasicClass!= null){ + if (bsBasicClass != null) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(BasicClazz::getCode,bsBasicClass.getCode()); - wrapper.eq(BasicClazz::getBizType,"6"); - wrapper.lt(BasicClazz::getUpdateTime,bsBasicClass.getUpdateTime()); - wrapper.set(BasicClazz::getIsDeleted,1); + wrapper.eq(BasicClazz::getCode, bsBasicClass.getCode()); + wrapper.eq(BasicClazz::getBizType, "6"); + wrapper.lt(BasicClazz::getUpdateTime, bsBasicClass.getUpdateTime()); + wrapper.set(BasicClazz::getIsDeleted, 1); basicClazzService.update(null, wrapper); } - return R.success() ; + return R.success(); } + @Operation(summary = "流程卡与飞靶绑定") @PostMapping("/fbBindingCrad") - public R fbBindingCrad(@RequestParam(value = "fsId") Long fsId,@RequestParam(value = "planListIds") String planListIds) { + public R fbBindingCrad(@RequestParam(value = "fsId") Long fsId, @RequestParam(value = "planListIds") String planListIds) { pdaSaveService.bindingCard(null, fsId, null, planListIds); - return R.success() ; + return R.success(); } + @Operation(summary = "流程卡与设备绑定") @PostMapping("/ecBindingCrad") - public R ecBindingCrad(@RequestParam(value = "ecId") Long ecId,@RequestParam(value = "planListIds") String planListIds) { + public R ecBindingCrad(@RequestParam(value = "ecId") Long ecId, @RequestParam(value = "planListIds") String planListIds) { pdaSaveService.bindingCard(null, null, ecId, planListIds); - return R.success() ; + return R.success(); } + @Operation(summary = "挂具与设备绑定") @PostMapping("/gjBindingEc") - public R gjBindingEc(@RequestParam(value = "ecId") Long ecId,@RequestParam(value = "rsListIds") String rsListIds) { - pdaSaveService.binding(null, ecId, null,null, rsListIds); - return R.success() ; + public R gjBindingEc(@RequestParam(value = "ecId") Long ecId, @RequestParam(value = "rsListIds") String rsListIds) { + pdaSaveService.binding(null, ecId, null, null, rsListIds); + return R.success(); } + @Operation(summary = "烧结流程卡与设备绑定") @PostMapping("/sjEcBindingCard") public R sjEcBindingCard(@RequestBody SjEcBingCardVo sjEcBingCardVo) { pdaSaveService.sjBindingCard(sjEcBingCardVo); - return R.success() ; + return R.success(); } + @Operation(summary = "解绑") @PostMapping("/unBind") public R unBind(@RequestBody UnBingVo unBingVo) { pdaSaveService.unBind(unBingVo); - return R.success() ; + return R.success(); } + @Operation(summary = "获取烧结未解绑的绑定记录") @PostMapping("/getUnbindByCard") public R getUnbindByCard(@RequestParam(value = "cardNo") String cardNo) { - return R.data(pdaSaveService.getUnbindByCard(cardNo)) ; + return R.data(pdaSaveService.getUnbindByCard(cardNo)); } + @Operation(summary = "烧结设备解绑解绑") @PostMapping("/sjDeviceUnBind") public R sjDeviceUnBind(@RequestBody UnBingDeviceVo unBingDeviceVo) { pdaSaveService.sjDeviceUnBind(unBingDeviceVo); - return R.success() ; + return R.success(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MakeRecMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MakeRecMapper.xml index 44bf291a..a5f7c4d7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MakeRecMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MakeRecMapper.xml @@ -58,7 +58,7 @@ LEFT JOIN MES_WORK_ORDER wo ON wp.WO_ID = wo.ID LEFT JOIN MES_YIELD_ORDER yo ON wo.YO_ID = yo.ID - mr.IS_DELETED = 0 and a.worker = #{mesMakeRec.worker} + mr.IS_DELETED = 0 and mr.worker = #{mesMakeRec.worker} AND wo.WO_CODE LIKE concat(concat('%', #{mesMakeRec.worker}),'%') diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java index 9ede8993..67de301c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java @@ -24,11 +24,11 @@ public interface IPdaLoadService extends BaseService { *

方法名: loadBindData

*

方法描述: 加载绑定数据

* - * @param user 用户 + * @param userId 用户id * @param cardNo 卡号 * @return org.springblade.desk.produce.pojo.entity.WorkPlan */ - WorkPlan loadBindData(BladeUser user, String cardNo); + WorkPlan loadBindData(Long userId, String cardNo); /** *

方法名: getBsRackSetByCode

*

方法描述: 根据挂具编码查询数据

@@ -62,7 +62,7 @@ public interface IPdaLoadService extends BaseService { void deletedProduceRun(String mtnCode); - public WorkOrder checkPrWorkOrder(String cardNo); + WorkOrder checkPrWorkOrder(String cardNo); void handleBaoZhuangWorkPlan(List wpList, YieldOrder yo); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java index 9d577406..9b89641d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaSaveService.java @@ -34,7 +34,6 @@ public interface IPdaSaveService extends BaseService { * @param ecId 设备id * @param unFsBool 是否解绑 * @param rsListIds 绑定数据 - * @param listIds */ void binding(Long rsId, Long ecId, Boolean unFsBool,String hangNum,String rsListIds); /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java index 8b7bb5e8..038c85eb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java @@ -128,14 +128,6 @@ public class MakeRecServiceImpl extends BaseServiceImpl } } - private List getTeamId(Long userId) { - List bsTeamSet = userRightService.list(Wrappers.lambdaQuery(UserRight.class).eq(UserRight::getUserId, userId).eq(UserRight::getUrType, "bs_team_set")); - if (CollectionUtils.isEmpty(bsTeamSet)) { - return null; - } - return bsTeamSet.stream().map(UserRight::getTheId).toList(); - } - @Override @Transactional(rollbackFor = Exception.class) public boolean saveMakeRec(MakeRecDTO makeRecDTO) { @@ -432,8 +424,11 @@ public class MakeRecServiceImpl extends BaseServiceImpl @Override public IPage selectMesMakeRecPage(IPage page, MesMakeRecVO mesMakeRec) { - IPage mesMakeRecVOIPage = page.setRecords(baseMapper.selectMesMakeRecPage(page, mesMakeRec)); - List records = mesMakeRecVOIPage.getRecords(); + if (mesMakeRec.getWorker() == null) { + mesMakeRec.setWorker(AuthUtil.getUserId()); + } + IPage mesMakeRecVoiPage = page.setRecords(baseMapper.selectMesMakeRecPage(page, mesMakeRec)); + List records = mesMakeRecVoiPage.getRecords(); if (CollectionUtils.isNotEmpty(records)) { List ppsIds = new ArrayList<>(); List makeTeams = new ArrayList<>(); @@ -470,9 +465,9 @@ public class MakeRecServiceImpl extends BaseServiceImpl record.setNextPpsName(processSetMap.get(record.getNextPpsId())); record.setNextMakeTeamName(teamMap.get(record.getNextMakeTeam())); } - mesMakeRecVOIPage.setRecords(records); + mesMakeRecVoiPage.setRecords(records); } - return mesMakeRecVOIPage; + return mesMakeRecVoiPage; } @Override diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java index 227c0c28..77812e92 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java @@ -15,7 +15,11 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.desk.basic.mapper.CraftAbilityMapper; import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; +import org.springblade.desk.basic.pojo.entity.TeamSet; +import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.service.IRelTeamSetUserService; +import org.springblade.desk.basic.service.ITeamSetService; +import org.springblade.desk.basic.service.IUserRightService; import org.springblade.desk.dashboard.pojo.entity.*; import org.springblade.desk.dashboard.service.*; import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; @@ -101,16 +105,23 @@ public class PdaLoadServiceImpl extends BaseServiceImpl tsIds = relTeamSetUserService. - list(Wrappers.lambdaQuery(RelTeamSetUser.class) - .eq(RelTeamSetUser::getUserId, user.getUserId())) - .stream().map(RelTeamSetUser::getUserId).collect(Collectors.toList()); + List tsIds = userRightService.getTeamId(userId); //获取作业计划 - WorkPlan prWorkPlan = this.getOne(Wrappers.lambdaQuery(WorkPlan.class) - .eq(WorkPlan::getId, prWorkOrder.getWpId())); + WorkPlan workPlan = workPlanService.getById(prWorkOrder.getWpId()); //获取当前工序的下序 - WorkPlan nextPrWorkPlan = this.getOne(Wrappers.lambdaQuery(WorkPlan.class) - .eq(WorkPlan::getId, prWorkPlan.getNextWpId())); + WorkPlan nextPrWorkPlan = workPlanService.getById(workPlan.getNextWpId()); //获取当前工序的上序 - WorkPlan frontPrWorkPlan = this.getOne(Wrappers.lambdaQuery(WorkPlan.class) - .eq(WorkPlan::getId, prWorkPlan.getFrontWpId())); + WorkPlan frontPrWorkPlan = workPlanService.getById(workPlan.getFrontWpId()); //如果是最后一道工序(当前序下序为空或者下序的下序为空) if (nextPrWorkPlan == null || nextPrWorkPlan.getNextWpId() == null) { //如果是镀后入库则不验证 if (checkAfterPlating) { - throw new ServiceException("pda.nextWorkPlan.noNext"); + throw new ServiceException("工序已是最后一道！"); } } //验证作业中心 - //this.checkWorkCenter(checkCurrentProcess, frontPrWorkPlan, prWorkPlan, nextPrWorkPlan, tsIds, checkAfterPlating); + this.checkWorkCenter(checkCurrentProcess, frontPrWorkPlan, workPlan, nextPrWorkPlan, tsIds, checkAfterPlating); //状态是false或者上序为空，并且当前序(首道)状态未未开工时，获取当前序； - if (!checkCurrentProcess || (frontPrWorkPlan == null && prWorkPlan.getStatus().equals(WorkPlan.STATUS_NO_START))) { - return prWorkPlan; + if (!checkCurrentProcess || (frontPrWorkPlan == null && workPlan.getStatus().equals(WorkPlan.STATUS_NO_START))) { + return workPlan; } //如果是镀后入库则不验证 if (checkAfterPlating) { - if (prWorkPlan != null) { + if (workPlan != null) { //验证上道工序是否报工完成 - if (!WorkPlan.STATUS_WORK_OK.equals(prWorkPlan.getStatus())) { - throw new ServiceException("product.frontWpNotWork"); + if (!WorkPlan.STATUS_WORK_OK.equals(workPlan.getStatus())) { + throw new ServiceException("上序未报工完成，请联系相关人员处理！"); } } } @@ -249,9 +254,47 @@ public class PdaLoadServiceImpl extends BaseServiceImpl tsIds, boolean checkAfterPlating) { - + // todo 等待关联表开发完成 +// WorkCenter bsWorkCenter = null; +// BsTeamSetEntity teamSet; +// if (!checkCurrentProcess || (frontPrWorkPlan == null && prWorkPlan.getStatus().equals(WorkPlan.STATUS_NO_START)) || nextPrWorkPlan == null) { +// if (prWorkPlan.getMakeTeam() == null) { +// throw new ServiceException("当前工序无加工班组"); +// } +// +// // 根据当前工序班组查询作业中心 +// teamSet = bsTeamSetService.getById(prWorkPlan.getMakeTeam()); +// if (teamSet != null) { +// bsWorkCenter = centerTeam.getBsWorkCenter(); +// } +// // 验证当前登录人和当前工序的班组是否一致 +// this.checkMakeTeamOne(prWorkPlan, tsIds); +// if (checkAfterPlating) { +// prWorkPlanService.verifyMakeUnit(prWorkPlan); +// } +// } else { +// +// if (nextPrWorkPlan.getMakeTeam() == null) { +// throw new ServiceException("当前工序无加工班组"); +// } +// +// // 根据当前工序班组查询作业中心 +// centerTeam = bsCenterTeamService.getByTsId(nextPrWorkPlan.getMakeTeam().getTsId()); +// if (centerTeam != null) { +// bsWorkCenter = centerTeam.getBsWorkCenter(); +// } +// //验证当前登录人和当前工序的班组是否一致 +// this.checkMakeTeamOne(nextPrWorkPlan, tsIds); +// if (checkAfterPlating) { +// prWorkPlanService.verifyMakeUnit(nextPrWorkPlan); +// } +// } +// if (bsWorkCenter == null) { +// throw new ServiceException("当前工序无作业中心！"); +// } } + @Override public WorkOrder checkPrWorkOrder(String cardNo) { WorkOrder prWorkOrder = this.checkWo(cardNo); //车间订单状态小于已下达并且大于加工中的情况下，不允许下序接收 @@ -307,10 +350,10 @@ public class PdaLoadServiceImpl extends BaseServiceImpl macToolUseList = macToolUseService.list(Wrappers.query().lambda() .eq(MacToolUse::getBsRackSet, rsId) .eq(MacToolUse::getFinished, false) .eq(MacToolUse::getIsDeleted, 0).orderByDesc(MacToolUse::getMtnCode) ); - if(macToolUseList.size()>0){ + if (macToolUseList.size() > 0) { code = macToolUseList.get(0).getMtnCode(); } //如果未找到满足条件的同槽号 @@ -128,7 +128,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl0){ + if (macToolUseList.size() > 0) { code = macToolUseList.get(0).getMtnCode(); } //修改飞靶状态 @@ -174,15 +174,15 @@ public class PdaSaveServiceImpl extends BaseServiceImpl macToolUseList = macToolUseService.list(Wrappers.query().lambda() .eq(MacToolUse::getBsFeiBaSet, frackSet.getId()) .eq(MacToolUse::getIsDeleted, 0) ); //未标记解绑飞靶，则代表正常绑定 - if (unFsBool == null){ + if (unFsBool == null) { //获取以设备为基准的同槽号 code = macToolUseService.nextCode(2); //开始绑定 @@ -252,7 +252,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl qcProduceRuns = mesQcProduceRunService.list(Wrappers.lambdaQuery(). - eq(MesQcProduceRunEntity::getMtnCode,prMacToolUse.getMtnCode())); + eq(MesQcProduceRunEntity::getMtnCode, prMacToolUse.getMtnCode())); if (qcProduceRuns == null || qcProduceRuns.size() == 0) { continue; @@ -398,7 +398,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpllambdaQuery().eq(WorkOrder::getBatchNo, rr.getSplcode())); + // WorkOrder wo = prWorkOrderService.getWorkOrderUniqueRec(rr.getPrtno(), rr.getSplcode(), rr.getSono()); + WorkOrder wo = workOrderService.getOne(Wrappers.lambdaQuery().eq(WorkOrder::getBatchNo, rr.getSplcode())); //syDockingLogService.sendDockingLog("查询原单", rr.getRedono(), rr.getPrtno()+","+rr.getSplcode()+","+rr.getSono()); if (wo == null) { wo = workOrderService.getOne(Wrappers.lambdaQuery().eq(WorkOrder::getBatchNo, rr.getSplcode())); @@ -449,7 +449,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl