From c883287e5528cf97061f8e67e08cd49933804a17 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 12 Jan 2026 17:23:44 +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 --- .../pojo/entity/EquipAbilityEntity.java | 7 ++++ .../pojo/entity/SameTroughEntity.java | 6 ++-- .../scheduling/mapper/SameTroughMapper.java | 3 ++ .../scheduling/mapper/SameTroughMapper.xml | 23 +++++++++++++ .../service/ISameTroughService.java | 4 +++ .../service/impl/SameTroughServiceImpl.java | 6 ++++ .../service/impl/WorkOrderServiceImpl.java | 33 +++++++++++-------- .../scheduling/vo/SameTroughVO.java | 5 +++ 8 files changed, 71 insertions(+), 16 deletions(-) diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java index 6db4959b..a5cefaaf 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java @@ -26,6 +26,9 @@ package org.springblade.scheduling.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -96,24 +99,28 @@ public class EquipAbilityEntity extends BaseEntity { * 额定加工能力 */ @Schema(description = "额定加工能力") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal standardProcessAbility; /** * 额定工时（分钟） */ @Schema(description = "额定工时（分钟）") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal standardTime; /** * 准备工时（分钟） */ @Schema(description = "准备工时（分钟）") + @JsonSerialize(nullsUsing = NullSerializer.class) private BigDecimal prepareTime; /** * 轮次间隔（分钟） */ @Schema(description = "轮次间隔（分钟）") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal interval; /** diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/SameTroughEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/SameTroughEntity.java index 53625738..614b2f80 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/SameTroughEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/SameTroughEntity.java @@ -53,7 +53,7 @@ public class SameTroughEntity extends BaseEntity { * 作业中心id */ @Schema(description = "作业中心id") - private BigDecimal workCenterId; + private Long workCenterId; /** * 作业中心名称 */ @@ -63,7 +63,7 @@ public class SameTroughEntity extends BaseEntity { * 工序id */ @Schema(description = "工序id") - private BigDecimal processId; + private Long processId; /** * 工序名称 */ @@ -73,7 +73,7 @@ public class SameTroughEntity extends BaseEntity { * 工艺id */ @Schema(description = "工艺id") - private BigDecimal craftId; + private Long craftId; /** * 工艺名称 */ diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java index 08b38e3e..4f9d44ee 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java @@ -34,6 +34,7 @@ import org.springblade.scheduling.scheduling.excel.SameTroughExcel; import org.springblade.scheduling.scheduling.vo.SameTroughVO; import java.util.List; +import java.util.Map; /** * 非同槽因素表 Mapper 接口 @@ -61,4 +62,6 @@ public interface SameTroughMapper extends BaseMapper { */ List export(@Param("ew") Wrapper queryWrapper); + SameTroughVO selectSameTroughInfo(Long id); + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml index 90f0a446..ca2583e8 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml @@ -41,4 +41,27 @@ SELECT * FROM MES_SAME_TROUGH ${ew.customSqlSegment} + + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISameTroughService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISameTroughService.java index aed3019e..e7a21945 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISameTroughService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/ISameTroughService.java @@ -27,12 +27,14 @@ package org.springblade.scheduling.scheduling.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import org.springblade.core.mp.base.BaseService; import org.springblade.scheduling.pojo.entity.SameTroughEntity; import org.springblade.scheduling.scheduling.excel.SameTroughExcel; import org.springblade.scheduling.scheduling.vo.SameTroughVO; import java.util.List; +import java.util.Map; /** * 非同槽因素表 服务类 @@ -59,4 +61,6 @@ public interface ISameTroughService extends BaseService { */ List export(Wrapper queryWrapper); + SameTroughVO selectSameTroughInfo(Long id); + } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SameTroughServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SameTroughServiceImpl.java index 9e1692fe..d7203a0f 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SameTroughServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/SameTroughServiceImpl.java @@ -35,6 +35,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; +import java.util.Map; /** * 非同槽因素表 服务实现类 @@ -58,4 +59,9 @@ public class SameTroughServiceImpl extends BaseServiceImpl schedulingBoard(WorkOrderDto workOrder) { List list = baseMapper.selectWorkOrderList(workOrder); + list.forEach(item -> { + item.setPriorityAps(YieldOrderEnum.getName(Integer.parseInt(item.getPriorityAps()))); + }); Map> woCodeGroup = list.stream().collect(Collectors.groupingBy(WorkOrderDto::getWoCode)); List resultList = new ArrayList<>(); for (Map.Entry> entry : woCodeGroup.entrySet()) { @@ -482,7 +486,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl> entry : equipAbilityMap.entrySet()) { //根据时间点获取所有设备资源 - List equipResourceList = equipResourceService.list(Wrappers.lambdaQuery().eq(EquipResourceEntity::getCraftId, craft.getCaId()).eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId()).ge(EquipResourceEntity::getStartTime, dateTime).eq(EquipResourceEntity::getIsUsed, 0).in(EquipResourceEntity::getEquipOrder, entry.getKey())); + List equipResourceList = equipResourceService.list(Wrappers.lambdaQuery() + .eq(EquipResourceEntity::getCraftId, craft.getCaId()) + .eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId()) + .ge(EquipResourceEntity::getStartTime, dateTime) + .eq(EquipResourceEntity::getIsUsed, 0) + .in(EquipResourceEntity::getEquipOrder, entry.getKey())); if (CollectionUtils.isEmpty(equipResourceList)) { order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode()); order.setErrorInfo("工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的设备资源"); @@ -1167,19 +1176,17 @@ public class WorkOrderServiceImpl extends BaseServiceImpl list,Long workCenterId){ - List sameTroughEntities = sameTroughService.list(); - //相同零件号判断键位、生产厂家、检验编号、生产标识 - //按照零件号分组 - Map> map = list.stream().collect(Collectors.groupingBy(YieldOrderEntity::getPartCode)); - for(Map.Entry> entry : map.entrySet()){ - List list1 = entry.getValue(); - if(list1.size() > 1){ - List craftList = yieldOrderCraftService.list(Wrappers.lambdaQuery().in(YieldOrderCraftEntity::getYoId,list1.stream().map(BaseEntity::getId).collect(Collectors.toList()))); - + /*public void sameTrough(YieldOrderCraftEntity yieldOrderCraft,LocalDateTime dateTime){ + SameTroughEntity sameTrough =sameTroughService.getOne(Wrappers.lambdaQuery().eq(SameTroughEntity::getWorkCenterId,yieldOrderCraft.getWorkCenterId()).eq(SameTroughEntity::getCraftId,yieldOrderCraft.getCaId()).eq(SameTroughEntity::getProcessId,yieldOrderCraft.getPpsId())); + if(sameTrough != null){ + //查询是否有已经排产的计划 + List workPlanList = workPlanService.list(Wrappers.lambdaQuery().eq(WorkPlanEntity::getWorkCenterId,yieldOrderCraft.getWorkCenterId()).eq(WorkPlanEntity::getCaId,yieldOrderCraft.getCaId()).eq(WorkPlanEntity::getPpsId,yieldOrderCraft.getPpsId())); + if(CollectionUtils.isNotEmpty(workPlanList)){ + Map<> } + SameTroughVO vo = sameTroughService.selectSameTroughInfo(yieldOrderCraft.getId()); + } - //不同零件号判断工艺 - } + }*/ } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SameTroughVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SameTroughVO.java index fdaad7b5..234c4e72 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SameTroughVO.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/SameTroughVO.java @@ -42,4 +42,9 @@ public class SameTroughVO extends SameTroughEntity { @Serial private static final long serialVersionUID = 1L; + private String partCode; + + private String plate; + + }