Skip to content

H
HYH.APSJ
Commit 7c8ef9a1 authored by DESKTOP-VKRD9QF\Administration's avatar DESKTOP-VKRD9QF\Administration
Browse files
Options

routing_Detail修改

parent ebcb5713
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 12 deletions
schedule_log.txt
View file @ 7c8ef9a1
......@@ -66233,3 +66233,69 @@
[221400-286140]:[11-03 13:30-11-04 07:29] 64740
[286200-293460]:[11-04 07:30-11-04 09:31] 7260
[2025-12-03 19:02:51]
[2025-12-16 11:13:20]
=== Schedule Summary === 0.484233
[2025-12-16 11:13:20] Operation: 1|1|1
[2025-12-16 11:13:20] Makespan: 3292920.000000 minutes
[2025-12-16 11:13:20] Total Tardiness: 0.000000 hours
[2025-12-16 11:13:20] Setup Time: 0.000000 minutes
[2025-12-16 11:13:20] Flow Time: 96061.000000 minutes
[2025-12-16 11:13:20] Machine Load Balance: 99.99%
[2025-12-16 11:13:20] -------------------------
[2025-12-16 11:13:20] [3218460-3232920]:[12-08 06:01-12-08 10:02] Order 1, Machine 3402, Operation 1, Batch 20000.0, processingTime %.1f
[3218460-3223740]:[12-08 06:01-12-08 07:29] 5280
[3223800-3232920]:[12-08 07:30-12-08 10:02] 9120
[2025-12-16 11:13:20] [3232920-3292920]:[12-08 10:02-12-09 02:42] Order 1, Machine 3243, Operation 2, Batch 50000.0, processingTime %.1f
[3232920-3292920]:[12-08 10:02-12-09 02:42] 60000
[2025-12-16 11:13:20] [3232921-3254522]:[12-08 10:02-12-08 16:02] Order 1, Machine 3402, Operation 3, Batch 30000.0, processingTime %.1f
[3232921-3254522]:[12-08 10:02-12-08 16:02] 21601
[2025-12-16 11:13:20]
[2025-12-16 11:26:06]
=== Schedule Summary === 0.484233
[2025-12-16 11:26:06] Operation: 1|2|3|1|2|3|1|2|3
[2025-12-16 11:26:06] Makespan: 3352980.000000 minutes
[2025-12-16 11:26:06] Total Tardiness: 0.000000 hours
[2025-12-16 11:26:06] Setup Time: 0.000000 minutes
[2025-12-16 11:26:06] Flow Time: 132125.000000 minutes
[2025-12-16 11:26:06] Machine Load Balance: 99.99%
[2025-12-16 11:26:06] -------------------------
[2025-12-16 11:26:06] [3254522-3268922]:[12-08 16:02-12-08 20:02] Order 1, Machine 3402, Operation 1, Batch 20000.0, processingTime %.1f
[3254522-3268922]:[12-08 16:02-12-08 20:02] 14400
[2025-12-16 11:26:06] [3292920-3316980]:[12-09 02:42-12-09 09:23] Order 1, Machine 3243, Operation 2, Batch 20000.0, processingTime %.1f
[3292920-3310140]:[12-09 02:42-12-09 07:29] 17220
[3310200-3316980]:[12-09 07:30-12-09 09:23] 6780
[2025-12-16 11:26:06] [3312191-3326592]:[12-09 08:03-12-09 12:03] Order 1, Machine 3402, Operation 3, Batch 20000.0, processingTime %.1f
[3312191-3326592]:[12-09 08:03-12-09 12:03] 14401
[2025-12-16 11:26:06]
[2025-12-16 11:26:06] [3268923-3283324]:[12-08 20:02-12-09 00:02] Order 2, Machine 3402, Operation 4, Batch 20000.0, processingTime %.1f
[3268923-3283324]:[12-08 20:02-12-09 00:02] 14401
[2025-12-16 11:26:06] [3290527-3304928]:[12-09 02:02-12-09 06:02] Order 2, Machine 3402, Operation 5, Batch 20000.0, processingTime %.1f
[3290527-3304928]:[12-09 02:02-12-09 06:02] 14401
[2025-12-16 11:26:06] [3316980-3340980]:[12-09 09:23-12-09 16:03] Order 2, Machine 3243, Operation 6, Batch 20000.0, processingTime %.1f
[3316980-3340980]:[12-09 09:23-12-09 16:03] 24000
[2025-12-16 11:26:06]
[2025-12-16 11:26:06] [3283325-3290526]:[12-09 00:02-12-09 02:02] Order 3, Machine 3402, Operation 7, Batch 10000.0, processingTime %.1f
[3283325-3290526]:[12-09 00:02-12-09 02:02] 7201
[2025-12-16 11:26:06] [3304929-3312190]:[12-09 06:02-12-09 08:03] Order 3, Machine 3402, Operation 8, Batch 10000.0, processingTime %.1f
[3304929-3310140]:[12-09 06:02-12-09 07:29] 5211
[3310200-3312190]:[12-09 07:30-12-09 08:03] 1990
[2025-12-16 11:26:06] [3340980-3352980]:[12-09 16:03-12-09 19:23] Order 3, Machine 3243, Operation 9, Batch 10000.0, processingTime %.1f
[3340980-3352980]:[12-09 16:03-12-09 19:23] 12000
[2025-12-16 11:26:06]
[2025-12-16 11:49:14]
=== Schedule Summary === 0.484233
[2025-12-16 11:49:14] Operation: 1|1|1
[2025-12-16 11:49:14] Makespan: 137400.000000 minutes
[2025-12-16 11:49:14] Total Tardiness: 0.000000 hours
[2025-12-16 11:49:14] Setup Time: 0.000000 minutes
[2025-12-16 11:49:14] Flow Time: 110400.000000 minutes
[2025-12-16 11:49:14] Machine Load Balance: 95.23%
[2025-12-16 11:49:14] -------------------------
[2025-12-16 11:49:14] [27000-63000]:[11-01 07:30-11-01 17:30] Order 1, Machine 3403, Operation 1, Batch 50000.0, processingTime %.1f
[27000-63000]:[11-01 07:30-11-01 17:30] 36000
[2025-12-16 11:49:14] [63000-87000]:[11-01 17:30-11-02 00:10] Order 1, Machine 3243, Operation 2, Batch 20000.0, processingTime %.1f
[63000-87000]:[11-01 17:30-11-02 00:10] 24000
[2025-12-16 11:49:14] [87000-137400]:[11-02 00:10-11-02 14:10] Order 1, Machine 3243, Operation 3, Batch 30000.0, processingTime %.1f
[87000-99000]:[11-02 00:10-11-02 03:30] 12000
[113400-137400]:[11-02 07:30-11-02 14:10] 24000
[2025-12-16 11:49:14]
src/main/java/com/aps/entity/RoutingDetail.java
View file @ 7c8ef9a1
......@@ -18,11 +18,11 @@ public class RoutingDetail {
private LocalDateTime deletionTime;
private Long routingHeaderId;
private String name;
private Short taskSeq;
private Short runtime;
private Short setupTime;
private Long taskSeq;
private BigDecimal runtime;
private BigDecimal setupTime;
private Short efficiencyValue;
private Short singleOut;
private BigDecimal singleOut;
private Short isOutside;
private Short status;
private String remark;
......@@ -37,20 +37,20 @@ public class RoutingDetail {
private Long equipTypeId;
private Long canInterrupt;
private Short previousStartTimeBegin;
private Short changeLineTime;
private int changeLineTime;
private Long preDetailId;
private Long connectType;
private Long connectProperty;
private Integer connectProperty;
private String connectTypeName;
private String connectPropertyName;
private BigDecimal constTime;
private BigDecimal increment;
private int constTime;
private BigDecimal batchQty;
private BigDecimal minProductionQty;
private BigDecimal maxProductionQty;
private BigDecimal productionTakt;
private BigDecimal preprocessingTime;
private BigDecimal postprocessingTime;
private int preprocessingTime;
private int postprocessingTime;
private BigDecimal splitMinQty;
private BigDecimal splitMaxQty;
private Short equipmentConnectivity;
......
src/main/java/com/aps/service/impl/LanuchServiceImpl.java
View file @ 7c8ef9a1
......@@ -614,6 +614,8 @@ public class LanuchServiceImpl implements LanuchService {
public ProdProcessExec createProcessExec(ProdLaunchOrder prodOrderMain,
RoutingDetail detail,
String sceneId) {
ProdProcessExec prodProcessExec = new ProdProcessExec();
prodProcessExec.setExecId(UUID.randomUUID().toString().replace("-", ""));
prodProcessExec.setOrderId(prodOrderMain.getOrderId());
......
src/main/resources/application.yml
View file @ 7c8ef9a1
......@@ -50,6 +50,8 @@ mybatis-plus:
mapper-locations: classpath:mapper/**/*.xml # Mapper XML路径
type-aliases-package: com.aps.entity # 实体类包路径
configuration:
# 开启自动转义关键字
auto-delimited-keywords: true
map-underscore-to-camel-case: true # 下划线转驼峰
log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl # 打印SQL日志（调试用）
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启SQL打印
......
src/main/resources/mapper/RoutingDetailMapper.xml
View file @ 7c8ef9a1
......@@ -40,7 +40,6 @@
<result column="CONNECT_TYPE_NAME" property="connectTypeName" />
<result column="CONNECT_PROPERTY_NAME" property="connectPropertyName" />
<result column="CONST_TIME" property="constTime" />
<result column="INCREMENT" property="increment" />
<result column="BATCH_QTY" property="batchQty" />
<result column="MIN_PRODUCTION_QTY" property="minProductionQty" />
<result column="MAX_PRODUCTION_QTY" property="maxProductionQty" />
......@@ -56,9 +55,10 @@
<result column="CONNECT_UNIT_NAME" property="connectUnitName" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
ID, CREATION_TIME, CREATOR_USER_ID, LAST_MODIFICATION_TIME, LAST_MODIFIER_USER_ID, IS_DELETED, DELETER_USER_ID, DELETION_TIME, ROUTING_HEADER_ID, NAME, TASK_SEQ, RUNTIME, SETUP_TIME, EFFICIENCY_VALUE, SINGLE_OUT, IS_OUTSIDE, STATUS, REMARK, EXTEND, OUTSIDE_TIME, PERFORMANCE_HOURS, SCHEDULING_WORKING_HOURS, REAL_WORKING_HOURS, REAL_RUNTIME, PERFORMANCE_WORKING_HOURS, EQUIP_TYPE, EQUIP_TYPE_ID, CAN_INTERRUPT, PREVIOUS_START_TIME_BEGIN, CHANGE_LINE_TIME, PRE_DETAIL_ID, CONNECT_TYPE, CONNECT_PROPERTY, CONNECT_TYPE_NAME, CONNECT_PROPERTY_NAME, CONST_TIME, INCREMENT, BATCH_QTY, MIN_PRODUCTION_QTY, MAX_PRODUCTION_QTY, PRODUCTION_TAKT, PREPROCESSING_TIME, POSTPROCESSING_TIME, SPLIT_MIN_QTY, SPLIT_MAX_QTY, EQUIPMENT_CONNECTIVITY, SINGLE_OUT_UNIT_ID, SINGLE_OUT_UNIT_NAME, CONNECT_UNIT_ID, CONNECT_UNIT_NAME
ID, CREATION_TIME, CREATOR_USER_ID, LAST_MODIFICATION_TIME, LAST_MODIFIER_USER_ID, IS_DELETED, DELETER_USER_ID, DELETION_TIME, ROUTING_HEADER_ID, NAME, TASK_SEQ, RUNTIME, SETUP_TIME, EFFICIENCY_VALUE, SINGLE_OUT, IS_OUTSIDE, STATUS, REMARK, EXTEND, OUTSIDE_TIME, PERFORMANCE_HOURS, SCHEDULING_WORKING_HOURS, REAL_WORKING_HOURS, REAL_RUNTIME, PERFORMANCE_WORKING_HOURS, EQUIP_TYPE, EQUIP_TYPE_ID, CAN_INTERRUPT, PREVIOUS_START_TIME_BEGIN, CHANGE_LINE_TIME, PRE_DETAIL_ID, CONNECT_TYPE, CONNECT_PROPERTY, CONNECT_TYPE_NAME, CONNECT_PROPERTY_NAME, CONST_TIME, BATCH_QTY, MIN_PRODUCTION_QTY, MAX_PRODUCTION_QTY, PRODUCTION_TAKT, PREPROCESSING_TIME, POSTPROCESSING_TIME, SPLIT_MIN_QTY, SPLIT_MAX_QTY, EQUIPMENT_CONNECTIVITY, SINGLE_OUT_UNIT_ID, SINGLE_OUT_UNIT_NAME, CONNECT_UNIT_ID, CONNECT_UNIT_NAME
</sql>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment