DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
JR
2025-08-14 16:44:21 +08:00
parent 21f15b8744 6d33b00ae7
commit 1de61358c2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klp-wms/src/main/java/com/klp/service/impl/WmsBatchServiceImpl.java
View File

@@ -169,8 +169,8 @@ public class WmsBatchServiceImpl implements IWmsBatchService {
// 遍历每一行，记录每个进程在每一行的执行顺序 // 遍历每一行，记录每个进程在每一行的执行顺序
for (List<Map<String, Object>> row : rows) { for (List<Map<String, Object>> row : rows) {
// 按sequare排序 // 按sequence排序
row.sort(Comparator.comparingInt(task -> Integer.parseInt(task.get("sequare").toString()))); row.sort(Comparator.comparingInt(task -> Integer.parseInt(task.get("sequence").toString())));
// 记录每个进程的执行顺序 // 记录每个进程的执行顺序
for (int i = 0; i < row.size(); i++) { for (int i = 0; i < row.size(); i++) {
@@ -205,7 +205,7 @@ public class WmsBatchServiceImpl implements IWmsBatchService {
// 遍历每一行，记录进程间的依赖关系 // 遍历每一行，记录进程间的依赖关系
for (List<Map<String, Object>> row : rows) { for (List<Map<String, Object>> row : rows) {
// 按sequare排序 // 按sequare排序
row.sort(Comparator.comparingInt(task -> Integer.parseInt(task.get("sequare").toString()))); row.sort(Comparator.comparingInt(task -> Integer.parseInt(task.get("sequence").toString())));
// 构建依赖关系 // 构建依赖关系
for (int i = 0; i < row.size() - 1; i++) { for (int i = 0; i < row.size() - 1; i++) {
@@ -229,8 +229,8 @@ public class WmsBatchServiceImpl implements IWmsBatchService {
// 遍历每一行，记录任务间的依赖关系 // 遍历每一行，记录任务间的依赖关系
for (List<Map<String, Object>> row : rows) { for (List<Map<String, Object>> row : rows) {
// 按sequare排序 // 按sequence排序
row.sort(Comparator.comparingInt(task -> Integer.parseInt(task.get("sequare").toString()))); row.sort(Comparator.comparingInt(task -> Integer.parseInt(task.get("sequence").toString())));
// 构建依赖关系 // 构建依赖关系
for (int i = 0; i < row.size() - 1; i++) { for (int i = 0; i < row.size() - 1; i++) {