From 7345cce032476bed014b66f2c7ae03eeb3f0cd33 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Fri, 29 May 2026 10:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkOrderServiceImpl.java    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
index a4637b9bd..a75653fb6 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
@@ -611,8 +611,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                 equipAbilityList = equipAbilityService.list(Wrappers.<EquipAbilityEntity>lambdaQuery().in(EquipAbilityEntity::getWorkCenterId, craft.getWorkCenterId()).eq(EquipAbilityEntity::getCraftId, craft.getCaId()).eq(EquipAbilityEntity::getProcessId,craft.getPpsId()));
                             }
                             if (CollectionUtils.isEmpty(equipAbilityList)) {
-                                errorInfo.append("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的设备能力;");
-//                                order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的设备能力");
+                                errorInfo.append("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的设备能力;");
+//                                order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的设备能力");
 //                                order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
 //                                yieldOrderService.updateById(order);
                                 isSchecuding = false;
@@ -653,7 +653,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
                                 if (CollectionUtils.isEmpty(equipResourceList)) {
                                     order.setStatus(YieldOrderEnum.STATUS_APS.getCode());
-                                    order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId())  + ",设备资源已不足");
+                                    order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId())  + ",设备资源已不足");
                                     yieldOrderService.updateById(order);
                                     isSchecuding = false;
                                     break;
@@ -863,7 +863,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                         hourMap.put("totalTime",totalTime);
                                         hourMap.put("standardTime",ability.getStandardTime());
                                         hourMap.put("prepareTime",ability.getPrepareTime());
-                                        hourMap.put("hourType",ability.getType());
+                                        hourMap.put("hourType",ability.getType() == null ? 0 : ability.getType());
                                     }else{
                                         if("玻璃封接组装".equals(processMap.get(craft.getPpsId()))){//玻璃封接组装单独计算
                                             hourMap = calPersonHoursByBlfjzz(order.getYpQty(),part);
@@ -900,8 +900,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                 if (CollectionUtils.isNotEmpty(personResourceList)) {
                                     workPlan.setMakeTeam(personResourceList.get(0).getTeamId());
                                 }else{
-                                    errorInfo.append("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力;");
-//                                    order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力");
+                                    errorInfo.append("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力;");
+//                                    order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力");
 //                                    order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
 //                                    yieldOrderService.updateById(order);
                                     isSchecuding = false;
@@ -918,8 +918,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                     }
                                 }
                             } else {
-                                errorInfo.append("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力;");
-//                                order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力");
+                                errorInfo.append("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力;");
+//                                order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力");
 //                                order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
 //                                yieldOrderService.updateById(order);
                                 isSchecuding = false;
@@ -945,9 +945,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             workPlanList.add(workPlan);
                             log.info("当前订单是：" + order.getId() + ",工序是：" + craft.getId()+",人员匹配完成");
                         } else {
-                            errorInfo.append("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力和设备能力;");
+                            errorInfo.append("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力和设备能力;");
                             log.info("未匹配到设备和人力资源的工序是：" + craft.getPpsId());
-//                            order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力和设备能力");
+//                            order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺能力：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的人员能力和设备能力");
 //                            order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
 //                            yieldOrderService.updateById(order);
                             isSchecuding = false;
@@ -963,6 +963,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     if(errorInfo.length() > 0){
                         order.setErrorInfo(errorInfo.toString());
                         order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
+                        order.setUpdateTime(new Date());
                         yieldOrderService.updateById(order);
                     }
                     continue;
@@ -1039,7 +1040,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     yieldOrderService.updateById(order);
                     workOrderList.add(workOrder);
                     //生成生产运行记录
-                    disTaskingClient.saveWorkOrderRun(workOrder.getId().toString());
+                    //disTaskingClient.saveWorkOrderRun(workOrder.getId().toString());
                     if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_3.getCode()){
                         StGlassCakeOutDTO glassDto = new StGlassCakeOutDTO();
                         glassDto.setCardNo(workOrder.getCardNo());