From 5911612ab6ca11d95081ddbb30fd733c138680a7 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Tue, 24 Mar 2026 19:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduling/scheduling/mapper/EquipAbilityMapper.xml | 1 + .../scheduling/scheduling/mapper/MainProducerMapper.xml | 4 ++-- .../scheduling/scheduling/mapper/PersonAbilityMapper.xml | 1 + .../scheduling/scheduling/mapper/PersonResourceMapper.xml | 3 +++ .../scheduling/service/impl/EquipResourceServiceImpl.java | 2 +- .../scheduling/service/impl/WorkOrderServiceImpl.java | 6 +++--- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml index a425d963..e23f32b4 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml @@ -38,6 +38,7 @@ and equip_code = #{param2.equipCode} + order by update_time desc diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml index dbdd5d60..9b092a69 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/MainProducerMapper.xml @@ -22,8 +22,8 @@ select * from MES_MAIN_PRODUCER is_deleted = 0 - - and process_id = #{param2.processId} + + and process_name like CONCAT('%', CONCAT(#{param2.processName}, '%')) and main_producer = #{param2.mainProducer} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml index 54346ba7..49479227 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml @@ -36,6 +36,7 @@ and craft_id = #{param2.craftId} + order by update_time desc diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.xml index 553533f1..8b863dbb 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonResourceMapper.xml @@ -38,6 +38,9 @@ LEFT JOIN BS_TEAM_TIME c ON b.TS_ID = c.ts_id WHERE c.special = 0 + and a.IS_DELETED = 0 + and b.IS_DELETED = 0 + and c.IS_DELETED = 0 and a.work_center_id = #{workCenterId} 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 a67d27ef..5c5c5147 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 @@ -215,7 +215,7 @@ public class EquipResourceServiceImpl extends BaseServiceImpl workPlanList = new ArrayList<>(); //查询所有工序 - List craftList = yieldOrderCraftService.list(Wrappers.lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).ne(YieldOrderCraftEntity::getCaId, 27).orderByAsc(YieldOrderCraftEntity::getProcessNo)); + List craftList = yieldOrderCraftService.list(Wrappers.lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).ne(YieldOrderCraftEntity::getPpsId, 105).orderByAsc(YieldOrderCraftEntity::getProcessNo)); //如果是外协回来的订单 if(order.getStatus() == YieldOrderEnum.STATUS_OUTSOURCING_WAITING.getCode()){ WorkOrderEntity oldWorkOrder = this.getOne(Wrappers.lambdaQuery().eq(WorkOrderEntity::getYoId,order.getId())); @@ -1251,12 +1251,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl workPlanList = new ArrayList<>(); //获取相关工序 - YieldOrderCraftEntity craft = yieldOrderCraftService.getOne(Wrappers.lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).eq(YieldOrderCraftEntity::getCaId, equipAbility.getCraftId())); + YieldOrderCraftEntity craft = yieldOrderCraftService.getOne(Wrappers.lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).eq(YieldOrderCraftEntity::getPpsId, equipAbility.getProcessId())); if (craft == null) { continue; } //计算订单总产能 - BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(100)).multiply(BigDecimal.valueOf(order.getYpQty())); + BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty())); //计算需要占用几个时间段 int period = sumCapacity.divide(standardProcessAbility, 0, RoundingMode.CEILING).intValue();