外协审批逻辑修改

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

@@ -406,52 +406,6 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     //更新车间订单主责任单位
                     workOrderService.updateHostWorkUnit(wo);
                     workPlanMapper.updateById(wpList);
-
-                    // 调用外协接收
-                    String wxWoCode = null;
-                    Oem oem = oemMapper.selectById(workOrderRun.getInCustomer());
-                    User planner = UserCache.getUser(wo.getPlanner());
-                    if (workOrderRun.getCollaborate() != null && workOrderRun.getCollaborate().equalsIgnoreCase("1")) {
-                        List<BsProcessSetEntity> processSets = processSetMapper.selectByIds(wpList.stream().filter(workPlan -> oem.getId().equals(workPlan.getOcId())).map(WorkPlan::getPpsId).collect(Collectors.toList()));
-                        String ppsName = processSets.stream().map(BsProcessSetEntity::getName).collect(Collectors.joining(","));
-                        // 获取wpList最大的计划结束时间
-                        LocalDateTime maxPlanEndTime = wpList.stream().map(WorkPlan::getPlanEndTime).max(LocalDateTime::compareTo).orElse(null);
-                        if (maxPlanEndTime == null) {
-                            maxPlanEndTime = LocalDateTime.now();
-                        }
-                        wxWoCode = erpDataOemClient.fullOrderOutsourcing(yo.getPartCode(), yo.getProductIdent(), wo.getBatchNo(), oem != null ? oem.getCode() : "", ppsName, yo.getYoCode(),
-                                planner != null ? planner.getName() : "", maxPlanEndTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), wo.getMakeQty(), "").getData();
-                    } else {
-                        User user = UserCache.getUser(workOrderRun.getCreateUser());
-                        User dispatcher = UserCache.getUser(wo.getDispatcher());
-                        String roamNo = null;
-                        String craftNo = null;
-                        Long craftId = yo.getCraftId();
-                        // 返工单号
-                        if (craftId != null && wo.getReworkCode() == null) {
-                            Map<String, String> craftInfo = baseMapper.selectRoamAndCraftNoByCraftId(craftId);
-                            roamNo = craftInfo.get("ROAMNO");
-                            craftNo = craftInfo.get("CRAFTNO");
-                            if (roamNo == null) {
-                                craftInfo = baseMapper.selectRoamAndCraftNoByPartCode(yo.getPartCode());
-                                roamNo = craftInfo.get("ROAMNO");
-                                craftNo = craftInfo.get("CRAFTNO");
-                            }
-                        } else if (StringUtils.isNotBlank(wo.getReworkCode())) {
-                            roamNo = wo.getReworkCode();
-                            craftNo = "返修";
-                            craftId = Long.valueOf(wo.getReworkNo());
-                        }
-                        String format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault()).format(yo.getDemandDate().toInstant());
-                        wxWoCode = erpDataOemClient.collaborativeOutsourcing(yo.getPartCode(), yo.getProductIdent(), format, wo.getMakeQty(), yo.getUseDeptCode(), yo.getUseDept(),
-                                wo.getBatchNo(), oem != null ? oem.getCode() : "", yo.getPlate(), yo.getYpCode(), yo.getYoCode(), user != null ? user.getName() : "",
-                                planner != null ? planner.getName() : "", dispatcher != null ? dispatcher.getName() : "", roamNo, craftNo, craftId).getData();
-                    }
-                    // 赋值wx号，erp返回
-                    workOrderRun.setWoCode(wxWoCode);
-                    if (StringUtils.isNotBlank(wxWoCode)) {
-                        updateWorkPlanAndOrderStatus(wo, wxWoCode);
-                    }
                 } else {
                     //转厂内业务
                     WorkPlan nextWorkPlan;

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

@@ -2936,7 +2936,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             //产生外协生产进度记录信息
             WorkOrderRun wr = new WorkOrderRun(workOrder.getId(), workOrder.getWoCode(), WorkOrderRun.RUN_TYPE_1,
                     null, null, null, prWorkPlan.getOcId(), "分派默认(厂外)",
-                    null, "1", workOrder.getCollaborate());
+                    null, "1", "0");
             workOrderRunService.save(wr);
             //更改订单调度员和计划员
             OemCraftAbilityEntity oa = oemCraftAbilityService.findBsOemAbility(prWorkPlan.getOcId(), prWorkPlan.getCaId());
@@ -2949,7 +2949,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             //产生车间运行记录信息
             WorkOrderRun wr = new WorkOrderRun(workOrder.getId(), workOrder.getWoCode(), WorkOrderRun.RUN_TYPE_2,
                     null, prWorkPlan.getMakeTeam(), null, null, "分派默认（厂内）",
-                    null, "1", workOrder.getCollaborate());
+                    null, "1", "0");
             workOrderRunService.save(wr);
 
             //更改订单调度员和计划员