Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java

@@ -341,16 +341,16 @@ public class MakeRecServiceImpl extends BaseServiceImpl<MakeRecMapper, MakeRec>
 
     @Override
     public WorkPlanLoadVO loadNotReceived(String cardNo) {
-        List<Long> tsIds = relTeamSetUserService.list(Wrappers.lambdaQuery(RelTeamSetUser.class).eq(RelTeamSetUser::getUserId, 1297)).stream().map(RelTeamSetUser::getTeamSetId).collect(Collectors.toList());
+        List<Long> tsIds = relTeamSetUserService.list(Wrappers.lambdaQuery(RelTeamSetUser.class).eq(RelTeamSetUser::getUserId, AuthUtil.getUserId())).stream().map(RelTeamSetUser::getTeamSetId).collect(Collectors.toList());
         WorkPlanLoadVO rtn = new WorkPlanLoadVO();
         if (CollectionUtils.isEmpty(tsIds)) {
-            return rtn;
+            throw new ServiceException("没有可操作的班组！");
         }
         WorkOrder wo = workOrderMapper.getWorkOrderByCardNo(cardNo, (short) 0);
         Optional.ofNullable(wo).orElseThrow(() -> new ServiceException("车间订单不存在！"));
         List<WorkPlanLoadVO> wpList = workPlanMapper.loadNotReceived(tsIds, wo.getId());
         if (CollectionUtils.isEmpty(wpList)) {
-            return rtn;
+            throw new ServiceException("没有可操作的工单！");
         }
         WorkPlanLoadVO workPlanLoadVO = wpList.get(0);
         workPlanLoadVO.setRunStatusTitle(WorkOrderEnum.getName(workPlanLoadVO.getRunStatus()));

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -1829,6 +1829,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public void oemHandle(Long nextWpId, int type) {
         // 接收工序
         WorkPlan workPlan = workPlanService.getById(nextWpId);
+        if (workPlan != null && !"1".equals(workPlan.getOem())) {
+            return;
+        }
         // 完成工序
         WorkPlan frontWorkPlan = workPlanService.getById(workPlan.getFrontWpId());
         WorkOrder workOrder = this.getById(workPlan.getWoId());