list = outsourceProcessService.export(queryWrapper);
+ ExcelUtil.export(response, "外协工序表数据" + DateUtil.time(), "外协工序表数据表", list, OutsourceProcessExcel.class);
+ }
+
+}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java
index f2b2978..5700602 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java
@@ -40,5 +40,7 @@ public class WorkOrderDto {
private Integer schedulingCount;
private String schedulingRate;
private String productIdent;
+ private String receiveTime;
+ private String priorityAps;
}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/OutsourceProcessEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/OutsourceProcessEntity.java
new file mode 100644
index 0000000..85c062a
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/OutsourceProcessEntity.java
@@ -0,0 +1,74 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ *
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.entity;
+
+import lombok.Data;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.tenant.mp.TenantEntity;
+import java.io.Serial;
+
+/**
+ * 外协工序表 实体类
+ *
+ * @author BladeX
+ * @since 2025-12-24
+ */
+@Data
+@TableName("MES_OUTSOURCE_PROCESS")
+@Schema(description = "MesOutsourceProcess对象")
+@EqualsAndHashCode(callSuper = true)
+public class OutsourceProcessEntity extends BaseEntity {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 工序id
+ */
+ @Schema(description = "工序id")
+ private String processId;
+ /**
+ * 工序名称
+ */
+ @Schema(description = "工序名称")
+ private String processName;
+ /**
+ * 时间
+ */
+ @Schema(description = "时间")
+ private Integer days;
+ /**
+ * 备注
+ */
+ @Schema(description = "备注")
+ private String remarks;
+
+}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/YieldOrderCraftEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/YieldOrderCraftEntity.java
index c2c1a75..5704257 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/YieldOrderCraftEntity.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/YieldOrderCraftEntity.java
@@ -122,4 +122,10 @@ public class YieldOrderCraftEntity extends TenantEntity {
@Schema(description = "作业中心")
private Long workCenterId;
+ /**
+ * 是否外协
+ */
+ @Schema(description = "是否外协")
+ private Boolean isOutsource;
+
}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/OutsourceProcessExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/OutsourceProcessExcel.java
new file mode 100644
index 0000000..7c30de5
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/OutsourceProcessExcel.java
@@ -0,0 +1,93 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ *
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.excel;
+
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+import java.io.Serial;
+
+
+/**
+ * 外协工序表 Excel实体类
+ *
+ * @author BladeX
+ * @since 2025-12-24
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class OutsourceProcessExcel implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("ID")
+ private BigDecimal id;
+ /**
+ * 工序id
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("工序id")
+ private BigDecimal processId;
+ /**
+ * 工序名称
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("工序名称")
+ private String processName;
+ /**
+ * 时间
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("时间")
+ private Long days;
+ /**
+ * 备注
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("备注")
+ private String remarks;
+ /**
+ * 是否已删除
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("是否已删除")
+ private Long isDeleted;
+
+}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.java
new file mode 100644
index 0000000..acc6407
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.java
@@ -0,0 +1,64 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ *
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.scheduling.scheduling.entity.OutsourceProcessEntity;
+import org.springblade.scheduling.scheduling.excel.OutsourceProcessExcel;
+import org.springblade.scheduling.scheduling.vo.OutsourceProcessVO;
+
+import java.util.List;
+
+/**
+ * 外协工序表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2025-12-24
+ */
+public interface OutsourceProcessMapper extends BaseMapper {
+
+ /**
+ * 自定义分页
+ *
+ * @param page 分页参数
+ * @param OutsourceProcess 查询参数
+ * @return List
+ */
+ List selectOutsourceProcessPage(IPage page, OutsourceProcessVO outsourceProcess);
+
+
+ /**
+ * 获取导出数据
+ *
+ * @param queryWrapper 查询条件
+ * @return List
+ */
+ List export(@Param("ew") Wrapper queryWrapper);
+
+}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.xml
new file mode 100644
index 0000000..0f95250
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/OutsourceProcessMapper.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+ select * from MES_OUTSOURCE_PROCESS
+
+ is_deleted = 0
+
+ and process_id = #{param2.processId}
+
+
+
+
+
+
+ SELECT * FROM MES_OUTSOURCE_PROCESS ${ew.customSqlSegment}
+
+
+
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml
index 1b3c0a4..00e2930 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml
@@ -92,6 +92,7 @@
a.batch_no AS "batchNo",
a.make_qty AS "makeQty",
a.card_no AS "cardNO",
+ g.priority_aps AS "priorityAps",
g.product_ident AS "productIdent",
f.name AS "currentProcessName",
d.name AS "processName",
@@ -115,9 +116,9 @@
LEFT JOIN BS_PROCESS_SET f on e.pps_id = f.id
LEFT JOIN MES_YIELD_ORDER g on g.id = a.yo_id
- a.is_deleted = 0 and b.is_deleted = 0
+ a.is_deleted = 0 and b.is_deleted = 0 and a.status in (1,2,3,5)
- and (to_char(b.start_time,'YYYY-MM-DD') = #{startTime} or (b.start_time to_date(CONCAT(#{startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') and b.end_time ]]> to_date(CONCAT(#{startTime},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')))
+ and (to_char(b.start_time,'YYYY-MM-DD') = #{startTime} or to_char(b.end_time,'YYYY-MM-DD') = #{startTime} or (b.start_time to_date(CONCAT(#{startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') and b.end_time ]]> to_date(CONCAT(#{startTime},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')))
and a.wo_code = #{woCode}
@@ -131,8 +132,20 @@
and d.name = #{processName}
+
+ and a.part_code = #{partCode}
+
+
+ and a.batch_no = #{batchNo}
+
+
+ and g.receive_time = #{receiveTime}
+
+
+ and b.status = #{planStatus}
+
- order by a.WO_CODE,b.start_time
+ order by b.start_time,a.WO_CODE
@@ -206,9 +219,9 @@
LEFT JOIN BS_TEAM_SET g on c.MAKE_TEAM = g.ID
LEFT JOIN MES_WORK_PLAN h on h.wo_id = a.id
- a.is_deleted = 0 and h.is_deleted = 0
+ a.is_deleted = 0 and h.is_deleted = 0 and a.status in (1,2,3,5)
- and (to_char(h.start_time,'YYYY-MM-DD') = #{startTime} or (h.start_time to_date(CONCAT(#{startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') and h.end_time ]]> to_date(CONCAT(#{startTime},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')))
+ and (to_char(h.start_time,'YYYY-MM-DD') = #{startTime} or to_char(h.end_time,'YYYY-MM-DD') = #{startTime} or (h.start_time to_date(CONCAT(#{startTime},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') and h.end_time ]]> to_date(CONCAT(#{startTime},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS')))
and a.wo_code = #{woCode}
@@ -219,6 +232,18 @@
and d.name = #{processName}
+
+ and a.part_code = #{partCode}
+
+
+ and a.batch_no = #{batchNo}
+
+
+ and b.receive_time = #{receiveTime}
+
+
+ and h.status = #{planStatus}
+
GROUP BY
a.WO_CODE,
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IOutsourceProcessService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IOutsourceProcessService.java
new file mode 100644
index 0000000..96526dc
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IOutsourceProcessService.java
@@ -0,0 +1,62 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ *
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.scheduling.scheduling.entity.OutsourceProcessEntity;
+import org.springblade.scheduling.scheduling.excel.OutsourceProcessExcel;
+import org.springblade.scheduling.scheduling.vo.OutsourceProcessVO;
+
+import java.util.List;
+
+/**
+ * 外协工序表 服务类
+ *
+ * @author BladeX
+ * @since 2025-12-24
+ */
+public interface IOutsourceProcessService extends BaseService {
+ /**
+ * 自定义分页
+ *
+ * @param page 分页参数
+ * @param OutsourceProcess 查询参数
+ * @return IPage
+ */
+ IPage selectOutsourceProcessPage(IPage page, OutsourceProcessVO outsourceProcess);
+
+
+ /**
+ * 导出数据
+ *
+ * @param queryWrapper 查询条件
+ * @return List
+ */
+ List export(Wrapper queryWrapper);
+
+}
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 cc820aa..e5c674b 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
@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
+import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.scheduling.scheduling.entity.EquipAbilityEntity;
import org.springblade.scheduling.scheduling.entity.EquipResourceEntity;
@@ -80,21 +81,16 @@ public class EquipResourceServiceImpl extends BaseServiceImpl list1 = this.list(Wrappers.lambdaQuery().eq(EquipResourceEntity::getDateTime,today));
- List list2 = this.list(Wrappers.lambdaQuery().eq(EquipResourceEntity::getDateTime,tomorrow));
- List list3 = this.list(Wrappers.lambdaQuery().eq(EquipResourceEntity::getDateTime,dayAfterTomorrow));
- if(CollectionUtils.isEmpty(list1)){
- generateData(today);
- }
- if(CollectionUtils.isEmpty(list2)){
- generateData(tomorrow);
- }
- if(CollectionUtils.isEmpty(list3)){
- generateData(dayAfterTomorrow);
+ for(int i=0;i<7;i++){
+ String today = DateFormatUtils.format(DateUtils.addDays(date,i),"yyyy-MM-dd");
+ List list = this.list(Wrappers.lambdaQuery().eq(EquipResourceEntity::getDateTime,today));
+ if(CollectionUtils.isEmpty(list)){
+ generateData(today);
+ }
}
+ //删除3天之前的数据
+ List deleteList = this.list(Wrappers.lambdaQuery().le(EquipResourceEntity::getDateTime,DateFormatUtils.format(DateUtils.addDays(date,-3),"yyyy-MM-dd")));
+ this.removeByIds(deleteList.stream().map(BaseEntity::getId).collect(Collectors.toList()));
}
@Override
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/OutsourceProcessServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/OutsourceProcessServiceImpl.java
new file mode 100644
index 0000000..036da6a
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/OutsourceProcessServiceImpl.java
@@ -0,0 +1,63 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ *
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.service.impl;
+
+import org.springblade.scheduling.scheduling.entity.OutsourceProcessEntity;
+import org.springblade.scheduling.scheduling.excel.OutsourceProcessExcel;
+import org.springblade.scheduling.scheduling.mapper.OutsourceProcessMapper;
+import org.springblade.scheduling.scheduling.service.IOutsourceProcessService;
+import org.springblade.scheduling.scheduling.vo.OutsourceProcessVO;
+import org.springframework.stereotype.Service;
+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;
+
+/**
+ * 外协工序表 服务实现类
+ *
+ * @author BladeX
+ * @since 2025-12-24
+ */
+@Service
+public class OutsourceProcessServiceImpl extends BaseServiceImpl implements IOutsourceProcessService {
+
+ @Override
+ public IPage selectOutsourceProcessPage(IPage page, OutsourceProcessVO outsourceProcess) {
+ return page.setRecords(baseMapper.selectOutsourceProcessPage(page, outsourceProcess));
+ }
+
+
+ @Override
+ public List export(Wrapper queryWrapper) {
+ List OutsourceProcessList = baseMapper.export(queryWrapper);
+ //OutsourceProcessList.forEach(OutsourceProcess -> {
+ // OutsourceProcess.setTypeName(DictCache.getValue(DictEnum.YES_NO, OutsourceProcess.getType()));
+ //});
+ return OutsourceProcessList;
+ }
+
+}
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 caaf475..a990522 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
@@ -81,6 +81,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl list =
- yieldOrderService.list(Wrappers.lambdaQuery().eq(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCategory()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate));
+ yieldOrderService.list(Wrappers.lambdaQuery().in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCategory(),YieldOrderEnum.STATUS_PROCESS_ERROR.getCategory()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate));
log.info("待排产订单数量为：" + list.size());
if (CollectionUtils.isNotEmpty(list)) {
//校验已排产订单
@@ -133,6 +135,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl {
mainProducerMap.put(item.getProcessId(), item.getMainProducer());
});
+ //初始化工序
+ List processList = processSetService.list();
+ Map processMap = new HashMap<>();
+ processList.forEach(item -> {
+ processMap.put(item.getId(), item.getName());
+ });
//计算cr值
calculateCr(list);
//根据作业中心将订单分组，并根据优先级、cr值、订单需求数量、计划下达时间4个维度进行组内排序
@@ -161,7 +169,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl(),
r -> new Thread(r, "scheduling-thread-" + System.currentTimeMillis()));
map.forEach((workcenter, orders) -> {
- threadPool.execute(() -> allocateResources(orders, personAbilityMap, mainProducerMap, planMap));
+ threadPool.execute(() -> allocateResources(orders, personAbilityMap, mainProducerMap, planMap, processMap));
});
}
@@ -322,7 +330,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl list, Map personAbilityMap, Map mainProducerMap, Map> planMap) {
+ public void allocateResources(List list, Map personAbilityMap, Map mainProducerMap, Map> planMap, Map processMap) {
List workOrderList = new ArrayList<>();
for (YieldOrderEntity order : list) {
try {
@@ -331,8 +339,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl workPlanList = new ArrayList<>();
//查询所有工序
List craftList = yieldOrderCraftService.list(Wrappers.lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).ne(YieldOrderCraftEntity::getCaId, 27).orderByAsc(YieldOrderCraftEntity::getProcessNo));
- List workCenterList = craftList.stream().filter(item -> item.getWorkCenterId() != null).map(YieldOrderCraftEntity::getWorkCenterId).collect(Collectors.toList());
- if (workCenterList.size() != craftList.size()) {
+ //过滤非外协工序
+ List craftList1 = craftList.stream().filter(item -> item.getIsOutsource() == false).collect(Collectors.toList());
+ List workCenterList = craftList1.stream().filter(item -> item.getWorkCenterId() != null).map(YieldOrderCraftEntity::getWorkCenterId).collect(Collectors.toList());
+ if (workCenterList.size() != craftList1.size()) {
order.setErrorInfo("工序信息不完整，含有未匹配作业中心的工序");
order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCategory());
yieldOrderService.updateById(order);
@@ -346,131 +356,169 @@ public class WorkOrderServiceImpl extends BaseServiceImpl 0 ? prevProcessEnd : workPlanList.get(workPlanList.size() - 1).getEndTime();
}
+ //处理外协工序，外协可能多个工序连续的，共享开始结束时间
+ Map> outSourceMap = craftList.stream().filter(item -> item.getIsOutsource() == true).collect(Collectors.groupingBy(YieldOrderCraftEntity::getOcId));
+ Map ppsIdMap = new HashMap<>();
+ for (Map.Entry> entry : outSourceMap.entrySet()) {
+ String ppsIdStr = entry.getValue().stream()
+ .map(entity -> String.valueOf(entity.getPpsId())) // long → String
+ // 等价写法：.map(entity -> Long.toString(entity.getPpsId()))
+ .collect(Collectors.joining(",")); // 逗号分隔拼接
+ ppsIdMap.put(entry.getKey(),ppsIdStr);
+ }
for (int i = 0; i < craftList.size(); i++) {
YieldOrderCraftEntity craft = craftList.get(i);
- if ("设备".equals(mainProducerMap.get(craft.getPpsId()))) {
- //根据作业中心查询所有设备
- List equipAbilityList = equipAbilityService.list(Wrappers.lambdaQuery().in(EquipAbilityEntity::getWorkCenterId, craft.getWorkCenterId()).eq(EquipAbilityEntity::getCraftId, craft.getCaId()));
- if (CollectionUtils.isEmpty(equipAbilityList)) {
- order.setErrorInfo("设备未匹配到对应的设备能力");
- order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCategory());
- yieldOrderService.updateById(order);
- isSchecuding = false;
- break;
+ //如果是外协的话，去查询外协工序时间，若未查询到先默认3天，跳过该工序的排产
+ if(craft.getIsOutsource()){
+ String ppsIdStr = ppsIdMap.get(craft.getOcId());
+ OutsourceProcessEntity outsourceProcess = outsourceProcessService.getOne(Wrappers.lambdaQuery().eq(OutsourceProcessEntity::getProcessId,ppsIdStr));
+ BigDecimal totalTime = new BigDecimal(0);
+ if(outsourceProcess != null){
+ //外协多工序需要把时间平分，方便处理
+ prevProcessEnd = prevProcessEnd.plusMinutes((long)((double)outsourceProcess.getDays()/ppsIdStr.split(",").length*24*60));
+ totalTime = totalTime.add(BigDecimal.valueOf((long)((double)outsourceProcess.getDays()/ppsIdStr.split(",").length*24*60)));
+ }else{
+ prevProcessEnd = prevProcessEnd.plusDays(3);
+ totalTime = totalTime.add(BigDecimal.valueOf(3*24*60));
}
- Map> equipAbilityMap = equipAbilityList.stream().collect(Collectors.groupingBy(EquipAbilityEntity::getEquipOrder));
-
- //匹配设备资源
- //获取下一个整数点
- LocalDateTime dateTime = getNextIntegerTime(prevProcessEnd);
- for (Map.Entry> 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()));
- if (CollectionUtils.isEmpty(equipResourceList)) {
+ WorkPlanEntity workPlan = new WorkPlanEntity();
+ workPlan.setWoId(order.getId());
+ workPlan.setCaId(craft.getCaId());
+ workPlan.setPpsId(craft.getPpsId());
+ workPlan.setWorkQty(order.getYpQty());
+ workPlan.setHourQuota(totalTime);
+ workPlan.setWorkCenterId(craft.getWorkCenterId());
+ workPlan.setOrders(craft.getProcessNo());
+ workPlan.setOem("0");
+ workPlan.setTestQty(0);
+ workPlan.setQualifiedQty(0);
+ workPlan.setUnqualifiedQty(0);
+ workPlan.setScrapQty(0);
+ workPlanList.add(workPlan);
+ }else{
+ if ("设备".equals(mainProducerMap.get(craft.getPpsId()))) {
+ //根据作业中心查询所有设备
+ List equipAbilityList = equipAbilityService.list(Wrappers.lambdaQuery().in(EquipAbilityEntity::getWorkCenterId, craft.getWorkCenterId()).eq(EquipAbilityEntity::getCraftId, craft.getCaId()));
+ if (CollectionUtils.isEmpty(equipAbilityList)) {
+ order.setErrorInfo("工序："+processMap.get(craft.getPpsId()) +"设备未匹配到对应的设备能力");
order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCategory());
- order.setErrorInfo("工序：" + craft.getPpsId() + "未匹配到对应的设备资源");
yieldOrderService.updateById(order);
isSchecuding = false;
break;
}
- //设备资源按照时间段分组并按时间排序，然后再每个组内按照剩余产能倒序排序
- Map> equipResourceMap = equipResourceList.stream()
- .collect(Collectors.groupingBy(
- EquipResourceEntity::getStartTime, // 分组字段：startTime
- // 用TreeMap接收，指定startTime降序（分组的排序）
- TreeMap::new,
- // 组内收集器：按restCapacity降序排序
- Collectors.collectingAndThen(
- Collectors.toList(),
- list1 -> list1.stream()
- .sorted(Comparator.comparing(
- EquipResourceEntity::getRestCapacity,
- // restCapacity 降序比较器（BigDecimal专用）
- Comparator.reverseOrder()
- ))
- .collect(Collectors.toList())
- )
- ));
- //计算生产所需产能，需将m2换算成dm2
- BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty()));
- //需要判断设备额定生产能力是否满足订单总产能，如果不满足，则需要把总产能进行拆分
- List capacityList = capacitySplit(equipResourceMap, sumCapacity);
- for (BigDecimal capacity : capacityList) {
- for (Map.Entry> entry1 : equipResourceMap.entrySet()) {
- Boolean isOccupied = false;
- List resourceList = entry1.getValue();
- for (EquipResourceEntity equipResource : resourceList) {
- //如果产能最大的设备都不满足，后面的设备就不需要判断了
- if (equipResource.getRestCapacity().compareTo(capacity) < 0) {
- break;
- } else {
- //生成车间订单
- WorkPlanEntity workPlan = new WorkPlanEntity();
- workPlan.setStartTime(equipResource.getStartTime());
- if (entry.getKey() == 1) {
- workPlan.setEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().longValue()));
+ Map> equipAbilityMap = equipAbilityList.stream().collect(Collectors.groupingBy(EquipAbilityEntity::getEquipOrder));
+
+ //匹配设备资源
+ //获取下一个整数点
+ LocalDateTime dateTime = getNextIntegerTime(prevProcessEnd);
+ for (Map.Entry> 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()));
+ if (CollectionUtils.isEmpty(equipResourceList)) {
+ order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCategory());
+ order.setErrorInfo("工序：" + processMap.get(craft.getPpsId()) + "未匹配到对应的设备资源");
+ yieldOrderService.updateById(order);
+ isSchecuding = false;
+ break;
+ }
+ //设备资源按照时间段分组并按时间排序，然后再每个组内按照剩余产能倒序排序
+ Map> equipResourceMap = equipResourceList.stream()
+ .collect(Collectors.groupingBy(
+ EquipResourceEntity::getStartTime, // 分组字段：startTime
+ // 用TreeMap接收，指定startTime降序（分组的排序）
+ TreeMap::new,
+ // 组内收集器：按restCapacity降序排序
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ list1 -> list1.stream()
+ .sorted(Comparator.comparing(
+ EquipResourceEntity::getRestCapacity,
+ // restCapacity 降序比较器（BigDecimal专用）
+ Comparator.reverseOrder()
+ ))
+ .collect(Collectors.toList())
+ )
+ ));
+ //计算生产所需产能，需将m2换算成dm2
+ BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty()));
+ //需要判断设备额定生产能力是否满足订单总产能，如果不满足，则需要把总产能进行拆分
+ List capacityList = capacitySplit(equipResourceMap, sumCapacity);
+ for (BigDecimal capacity : capacityList) {
+ for (Map.Entry> entry1 : equipResourceMap.entrySet()) {
+ Boolean isOccupied = false;
+ List resourceList = entry1.getValue();
+ for (EquipResourceEntity equipResource : resourceList) {
+ //如果产能最大的设备都不满足，后面的设备就不需要判断了
+ if (equipResource.getRestCapacity().compareTo(capacity) < 0) {
+ break;
} else {
- workPlan.setEndTime(equipResource.getEndTime());
+ //生成车间订单
+ WorkPlanEntity workPlan = new WorkPlanEntity();
+ workPlan.setStartTime(equipResource.getStartTime());
+ if (entry.getKey() == 1) {
+ workPlan.setEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().longValue()));
+ } else {
+ workPlan.setEndTime(equipResource.getEndTime());
+ }
+ workPlan.setWorkQty(order.getYpQty());
+ workPlan.setCaId(craft.getCaId());
+ workPlan.setPpsId(craft.getPpsId());
+ workPlan.setMakeTeam(equipResource.getTeamId());
+ workPlan.setWorkCenterId(craft.getWorkCenterId());
+ workPlan.setOrders(craft.getProcessNo());
+ workPlan.setWoId(order.getId());
+ workPlan.setOem("0");
+ workPlan.setTestQty(0);
+ workPlan.setQualifiedQty(0);
+ workPlan.setUnqualifiedQty(0);
+ workPlan.setScrapQty(0);
+ workPlan.setHourQuota(BigDecimal.valueOf(ChronoUnit.MINUTES.between(workPlan.getStartTime(), workPlan.getEndTime())));
+ workPlan.setEquipCode(equipResource.getEquipCode());
+ workPlan.setEquipName(equipResource.getEquipName());
+ workPlan.setEquipResourceId(equipResource.getId());
+ workPlanList.add(workPlan);
+ //更新剩余产能
+ equipResource.setRestCapacity(equipResource.getRestCapacity().subtract(capacity));
+ equipResource.setIsUsed("1");
+ //如果剩余产能占总产能不足20%，则修改为已占用
+ // if(equipResource.getRestCapacity().divide(equipResource.getTotalCapacity(),2,RoundingMode.HALF_UP).compareTo(BigDecimal.valueOf(0.2)) < 0){
+ //
+ // }
+ //同一个设备可能有多个工艺能力，同一时间只能做一个工艺能力的零件，所以需要把当前设备所有工艺能力的剩余产能都更新调
+ LambdaUpdateWrapper equipWrapper = new LambdaUpdateWrapper<>();
+ equipWrapper.eq(EquipResourceEntity::getEquipCode, equipResource.getEquipCode());
+ equipWrapper.eq(EquipResourceEntity::getDateTime, equipResource.getDateTime());
+ equipWrapper.eq(EquipResourceEntity::getPeriod, equipResource.getPeriod());
+ equipWrapper.eq(EquipResourceEntity::getStartTime, equipResource.getStartTime());
+ equipWrapper.eq(EquipResourceEntity::getEndTime, equipResource.getEndTime());
+ equipResourceService.update(equipResource, equipWrapper);
+ //该设备后续所有开始时间小于当前结束时间的时间段都变为不可用
+ LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper();
+ updateWrapper.lt(EquipResourceEntity::getStartTime, equipResource.getEndTime());
+ updateWrapper.gt(EquipResourceEntity::getStartTime, equipResource.getStartTime());
+ updateWrapper.eq(EquipResourceEntity::getEquipCode, equipResource.getEquipCode());
+ EquipResourceEntity equipResource1 = new EquipResourceEntity();
+ equipResource1.setIsUsed("1");
+ equipResourceService.update(equipResource1, updateWrapper);
+ //当前工序的结束时间作为下一工序的开始时间
+ prevProcessEnd = workPlan.getEndTime();
+ dateTime = workPlan.getEndTime();
+ isOccupied = true;
+ break;
}
- workPlan.setWorkQty(order.getYpQty());
- workPlan.setCaId(craft.getCaId());
- workPlan.setPpsId(craft.getPpsId());
- workPlan.setMakeTeam(equipResource.getTeamId());
- workPlan.setWorkCenterId(craft.getWorkCenterId());
- workPlan.setOrders(craft.getProcessNo());
- workPlan.setWoId(order.getId());
- workPlan.setOem("0");
- workPlan.setTestQty(0);
- workPlan.setQualifiedQty(0);
- workPlan.setUnqualifiedQty(0);
- workPlan.setScrapQty(0);
- workPlan.setHourQuota(BigDecimal.valueOf(ChronoUnit.MINUTES.between(workPlan.getStartTime(), workPlan.getEndTime())));
- workPlan.setEquipCode(equipResource.getEquipCode());
- workPlan.setEquipName(equipResource.getEquipName());
- workPlan.setEquipResourceId(equipResource.getId());
- workPlanList.add(workPlan);
- //更新剩余产能
- equipResource.setRestCapacity(equipResource.getRestCapacity().subtract(capacity));
- equipResource.setIsUsed("1");
- //如果剩余产能占总产能不足20%，则修改为已占用
- // if(equipResource.getRestCapacity().divide(equipResource.getTotalCapacity(),2,RoundingMode.HALF_UP).compareTo(BigDecimal.valueOf(0.2)) < 0){
- //
- // }
- //同一个设备可能有多个工艺能力，同一时间只能做一个工艺能力的零件，所以需要把当前设备所有工艺能力的剩余产能都更新调
- LambdaUpdateWrapper equipWrapper = new LambdaUpdateWrapper<>();
- equipWrapper.eq(EquipResourceEntity::getEquipCode, equipResource.getEquipCode());
- equipWrapper.eq(EquipResourceEntity::getDateTime, equipResource.getDateTime());
- equipWrapper.eq(EquipResourceEntity::getPeriod, equipResource.getPeriod());
- equipWrapper.eq(EquipResourceEntity::getStartTime, equipResource.getStartTime());
- equipWrapper.eq(EquipResourceEntity::getEndTime, equipResource.getEndTime());
- equipResourceService.update(equipResource, equipWrapper);
- //该设备后续所有开始时间小于当前结束时间的时间段都变为不可用
- LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper();
- updateWrapper.lt(EquipResourceEntity::getStartTime, equipResource.getEndTime());
- updateWrapper.gt(EquipResourceEntity::getStartTime, equipResource.getStartTime());
- updateWrapper.eq(EquipResourceEntity::getEquipCode, equipResource.getEquipCode());
- EquipResourceEntity equipResource1 = new EquipResourceEntity();
- equipResource1.setIsUsed("1");
- equipResourceService.update(equipResource1, updateWrapper);
- //当前工序的结束时间作为下一工序的开始时间
- prevProcessEnd = workPlan.getEndTime();
- dateTime = workPlan.getEndTime();
- isOccupied = true;
+ }
+ if (isOccupied) {
break;
}
}
- if (isOccupied) {
- break;
- }
}
}
- }
- if (!isSchecuding) {
- break;
- }
+ if (!isSchecuding) {
+ break;
+ }
- } else if ("人".equals(mainProducerMap.get(craft.getPpsId()))) {
- //匹配人资源
+ } else if ("人".equals(mainProducerMap.get(craft.getPpsId()))) {
+ //匹配人资源
/* String personAbility = craft.getWorkCenterId() + "-" + craft.getPpsId() + "-" + craft.getCaId();
if (personAbilityMap.containsKey(craft.getWorkCenterId() + "-" + craft.getPpsId() + "-" + craft.getCaId())) {
@@ -481,32 +529,32 @@ public class WorkOrderServiceImpl extends BaseServiceImpl list) {
//根据作业中心分组
- Map> workPlanMap = list.stream().collect(Collectors.groupingBy(WorkPlanEntity::getWorkCenterId));
+ Map> workPlanMap = list.stream().filter(item -> item.getWorkCenterId() != null).collect(Collectors.groupingBy(WorkPlanEntity::getWorkCenterId));
for (Map.Entry> entry : workPlanMap.entrySet()) {
List workPlanList = entry.getValue();
int startIndex = -1;
@@ -746,8 +790,19 @@ public class WorkOrderServiceImpl extends BaseServiceImpl
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.scheduling.scheduling.entity.OutsourceProcessEntity;
+
+import java.io.Serial;
+
+/**
+ * 外协工序表 视图实体类
+ *
+ * @author BladeX
+ * @since 2025-12-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OutsourceProcessVO extends OutsourceProcessEntity {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/OutsourceProcessWrapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/OutsourceProcessWrapper.java
new file mode 100644
index 0000000..f3a2a78
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/OutsourceProcessWrapper.java
@@ -0,0 +1,60 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ *
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ *
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ *
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ *
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ *
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ *
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.scheduling.scheduling.entity.OutsourceProcessEntity;
+import org.springblade.scheduling.scheduling.vo.OutsourceProcessVO;
+
+import java.util.Objects;
+
+/**
+ * 外协工序表 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2025-12-24
+ */
+public class OutsourceProcessWrapper extends BaseEntityWrapper {
+
+ public static OutsourceProcessWrapper build() {
+ return new OutsourceProcessWrapper();
+ }
+
+ @Override
+ public OutsourceProcessVO entityVO(OutsourceProcessEntity outsourceProcess) {
+ OutsourceProcessVO OutsourceProcessVO = Objects.requireNonNull(BeanUtil.copyProperties(outsourceProcess, OutsourceProcessVO.class));
+
+ //User createUser = UserCache.getUser(OutsourceProcess.getCreateUser());
+ //User updateUser = UserCache.getUser(OutsourceProcess.getUpdateUser());
+ //OutsourceProcessVO.setCreateUserName(createUser.getName());
+ //OutsourceProcessVO.setUpdateUserName(updateUser.getName());
+
+ return OutsourceProcessVO;
+ }
+
+
+}