From 7ed953325eca74fb1aa93d05ce03d54b1fdb3bff Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Sun, 14 Dec 2025 16:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=9B=B8=E5=85=B3-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduling/mapper/EquipResourceMapper.xml |  4 +-
 .../scheduling/mapper/YieldOrderMapper.xml    |  2 +-
 .../impl/EquipResourceServiceImpl.java        |  2 +-
 .../service/impl/WorkOrderServiceImpl.java    | 59 ++++++++++---------
 4 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.xml
index 30a7926..9b8a999 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipResourceMapper.xml
@@ -51,8 +51,8 @@
         FROM
             MES_EQUIP_RESOURCE a
         WHERE
-            CRAFT_ID = '27'
-          AND id > ( SELECT max( id ) FROM MES_EQUIP_RESOURCE WHERE is_used = '1' AND CRAFT_ID = '27' ) order by date_time,start_time
+            CRAFT_ID = '27' and START_TIME > SYSDATE
+          AND id > nvl(( SELECT max( id ) FROM MES_EQUIP_RESOURCE WHERE is_used = '1' AND CRAFT_ID = '27' ),0) order by date_time,start_time
     </select>
 
 </mapper>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml
index 95973f8..e028f8b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml
@@ -87,7 +87,7 @@
 
     <select id="selectCommonCraftOrderList" resultMap="yieldOrderResultMap">
         SELECT
-            b.*
+           distinct b.*
         FROM
             MES_YIELD_ORDER_CRAFT a
             LEFT JOIN MES_YIELD_ORDER b ON a.YO_ID = b.ID
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java
index 9e3e129..cc820aa 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java
@@ -99,7 +99,7 @@ public class EquipResourceServiceImpl extends BaseServiceImpl<EquipResourceMappe
 
 	@Override
 	public List<EquipResourceEntity> selectCommonCraftList() {
-		return null;
+		return baseMapper.selectCommonCraftList();
 	}
 
 	public void generateData(String day){
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 c9a1b28..d6e364e 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
@@ -114,6 +114,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if (CollectionUtils.isNotEmpty(list)) {
             //校验已排产订单
             checkSchedulingOrder(list);
+            list = yieldOrderService.list(Wrappers.<YieldOrderEntity>lambdaQuery().eq(BaseEntity::getStatus, YieldOrderConst.STATUS_APS));
             //初始化人员能力
             List<PersonAbilityEntity> personAbilityEntityList = personAbilityService.list(Wrappers.<PersonAbilityEntity>lambdaQuery().isNotNull(PersonAbilityEntity::getWorkCenterId).isNotNull(PersonAbilityEntity::getProcessId).isNotNull(PersonAbilityEntity::getCraftId));
             Map<String, PersonAbilityEntity> personAbilityMap = new HashMap<>();
@@ -127,7 +128,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 mainProducerMap.put(item.getProcessId(), item.getMainProducer());
             });
             //计算cr值
-           // calculateCr(list);
+            //calculateCr(list);
             //根据作业中心将订单分组，并根据优先级、cr值、订单需求数量、计划下达时间4个维度进行组内排序
             Map<Long, List<YieldOrderEntity>> map =
                     list.stream()
@@ -434,12 +435,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public void allocateResources(List<YieldOrderEntity> list,Map<String, PersonAbilityEntity> personAbilityMap,Map<Long, String> mainProducerMap,Map<String,List<WorkPlanEntity>> planMap) {
 
         for (YieldOrderEntity order : list) {
-
             //是否可以排产
             Boolean isSchecuding = true;
             List<WorkPlanEntity> workPlanList = new ArrayList<>();
             //查询所有工序
-            List<YieldOrderCraftEntity> craftList = yieldOrderCraftService.list(Wrappers.<YieldOrderCraftEntity>lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).orderByAsc(YieldOrderCraftEntity::getProcessNo));
+            List<YieldOrderCraftEntity> craftList = yieldOrderCraftService.list(Wrappers.<YieldOrderCraftEntity>lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).ne(YieldOrderCraftEntity::getCaId,27).orderByAsc(YieldOrderCraftEntity::getProcessNo));
             List<Long> workCenterList = craftList.stream().filter(item -> item.getWorkCenterId() != null).map(YieldOrderCraftEntity::getWorkCenterId).collect(Collectors.toList());
             if(workCenterList.size() != craftList.size()){
                 order.setErrorInfo("工序信息不完整，含有未匹配作业中心的工序");
@@ -545,7 +545,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 //                                        if(equipResource.getRestCapacity().divide(equipResource.getTotalCapacity(),2,RoundingMode.HALF_UP).compareTo(BigDecimal.valueOf(0.2)) < 0){
 //
 //                                        }
-                                        equipResourceService.updateById(equipResource);
+                                        //同一个设备可能有多个工艺能力，同一时间只能做一个工艺能力的零件，所以需要把当前设备所有工艺能力的剩余产能都更新调
+                                        LambdaUpdateWrapper<EquipResourceEntity> equipWrapper = new LambdaUpdateWrapper<>();
+                                        equipWrapper.eq(EquipResourceEntity::getEquipCode,equipResource.getEquipCode());
+                                        equipResourceService.update(equipResource,equipWrapper);
                                         //该设备后续所有开始时间小于当前结束时间的时间段都变为不可用
                                         LambdaUpdateWrapper<EquipResourceEntity> updateWrapper = new LambdaUpdateWrapper();
                                         updateWrapper.lt(EquipResourceEntity::getStartTime, equipResource.getEndTime());
@@ -907,34 +910,36 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             for(YieldOrderEntity yieldOrder : list){
                 //查询相关车间订单
                 WorkOrderEntity workOrder = this.getOne(Wrappers.<WorkOrderEntity>lambdaQuery().eq(WorkOrderEntity::getYoId,yieldOrder.getId()));
-                List<WorkPlanEntity> schedulingPlanList = workPlanService.list(Wrappers.<WorkPlanEntity>lambdaQuery().eq(WorkPlanEntity::getWoId,workOrder.getId()));
-                if(CollectionUtils.isNotEmpty(schedulingPlanList)){
-                    for(WorkPlanEntity workPlan : schedulingPlanList){
-                        //还原设备资源
-                        if(workPlan.getEquipResourceId() != null){
-                            EquipResourceEntity equipResource = equipResourceService.getById(workPlan.getEquipResourceId());
-                            equipResource.setIsUsed("0");
-                            equipResource.setRestCapacity(equipResource.getRestCapacity().add(workPlan.getHourQuota()));
-                            equipResourceService.updateById(equipResource);
+                if(workOrder != null){
+                    List<WorkPlanEntity> schedulingPlanList = workPlanService.list(Wrappers.<WorkPlanEntity>lambdaQuery().eq(WorkPlanEntity::getWoId,workOrder.getId()));
+                    if(CollectionUtils.isNotEmpty(schedulingPlanList)){
+                        for(WorkPlanEntity workPlan : schedulingPlanList){
+                            //还原设备资源
+                            if(workPlan.getEquipResourceId() != null){
+                                EquipResourceEntity equipResource = equipResourceService.getById(workPlan.getEquipResourceId());
+                                equipResource.setIsUsed("0");
+                                equipResource.setRestCapacity(equipResource.getRestCapacity().add(workPlan.getHourQuota()));
+                                equipResourceService.updateById(equipResource);
 
-                        }
-                        //还原人力资源
-                        if(workPlan.getPersonResourceIds() != null){
-                            List<PersonResourceEntity> personResourceList = personResourceService.list(Wrappers.<PersonResourceEntity>lambdaQuery().in(BaseEntity::getId,workPlan.getPersonResourceIds().split(",")));
-                            if(CollectionUtils.isNotEmpty(personResourceList)){
-                                personResourceList.forEach(item ->{
-                                    item.setIsUsed("0");
-                                    personResourceService.updateById(item);
-                                });
                             }
+                            //还原人力资源
+                            if(workPlan.getPersonResourceIds() != null){
+                                List<PersonResourceEntity> personResourceList = personResourceService.list(Wrappers.<PersonResourceEntity>lambdaQuery().in(BaseEntity::getId,workPlan.getPersonResourceIds().split(",")));
+                                if(CollectionUtils.isNotEmpty(personResourceList)){
+                                    personResourceList.forEach(item ->{
+                                        item.setIsUsed("0");
+                                        personResourceService.updateById(item);
+                                    });
+                                }
+                            }
+
+                            workPlanService.deleteLogic(Arrays.asList(workPlan.getId()));
                         }
-                        workPlan.setIsDeleted(1);
-                        workPlanService.updateById(workPlan);
-                    }
 
+                    }
+                    this.deleteLogic(Arrays.asList(workOrder.getId()));
                 }
-                workOrder.setIsDeleted(1);
-                this.updateById(workOrder);
+
                 yieldOrder.setStatus(3);
                 yieldOrderService.updateById(yieldOrder);