root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 日志

Browse Source
This commit is contained in:
liyongde
2026-04-28 13:30:58 +08:00
parent 298ae2fa27
commit 198f6bb60b
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SendDisassemblyAgvTask.java
View File

@@ -138,15 +138,16 @@ public class SendDisassemblyAgvTask extends AbstractAcsTask {
JSONObject trussTaskParam = new JSONObject(); JSONObject trussTaskParam = new JSONObject();
if (ObjectUtil.isNotEmpty(task.getVehicle_code()) && ObjectUtil.isNotEmpty(task.getVehicle_code2())) { if (ObjectUtil.isNotEmpty(task.getVehicle_code()) && ObjectUtil.isNotEmpty(task.getVehicle_code2())) {
if (list.size() < 2) { if (list.size() < 2) {
log.info("原地等待，无可用架子...");
// 原地等待 // 原地等待
// 分切计划状态修改02->03 // 分切计划状态修改02->03
List<String> collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) // List<String> collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2())
.filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); // .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); // PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan();
p.setStatus("03"); // p.setStatus("03");
TaskUtils.updateOptMessageBySlitterPlan(p); // TaskUtils.updateOptMessageBySlitterPlan(p);
slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>() // slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
.in(PdmBiSlittingproductionplan::getQzzno, collect)); // .in(PdmBiSlittingproductionplan::getQzzno, collect));
return; return;
} }
Deliverycachepointivt d1 = list.get(0); Deliverycachepointivt d1 = list.get(0);
@@ -164,15 +165,16 @@ public class SendDisassemblyAgvTask extends AbstractAcsTask {
trussDisassemblyCacheTask.createTask(trussTaskParam); trussDisassemblyCacheTask.createTask(trussTaskParam);
} else { } else {
if (list.isEmpty()) { if (list.isEmpty()) {
log.info("原地等待，无可用架子...");
// 原地等待 // 原地等待
// 分切计划状态修改02->03 // 分切计划状态修改02->03
List<String> collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2()) // List<String> collect = Stream.of(task.getVehicle_code(), task.getVehicle_code2())
.filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); // .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList());
PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); // PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan();
p.setStatus("03"); // p.setStatus("03");
TaskUtils.updateOptMessageBySlitterPlan(p); // TaskUtils.updateOptMessageBySlitterPlan(p);
slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>() // slittingproductionplanService.update(p, new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
.in(PdmBiSlittingproductionplan::getQzzno, collect)); // .in(PdmBiSlittingproductionplan::getQzzno, collect));
return; return;
} }
// 两点 // 两点

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/TrussDisassemblyCacheTask.java
View File

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
/** /**
* * 拆单桁架任务
* @Author: liyongde * @Author: liyongde
* @Date: 2026/4/21 16:07 * @Date: 2026/4/21 16:07
*/ */

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -2426,6 +2426,7 @@ public class SlitterServiceImpl implements SlitterService {
// 2. 查询缓存点位 + 可用点位 // 2. 查询缓存点位 + 可用点位
List<Deliverycachepointivt> cachePointList = slitterMapper.getReadyShaftCachePointByDevice(deviceInfo); List<Deliverycachepointivt> cachePointList = slitterMapper.getReadyShaftCachePointByDevice(deviceInfo);
List<BstIvtCutpointivt> cutPointList = slitterMapper.getReadyShaftPoint(deviceCode); List<BstIvtCutpointivt> cutPointList = slitterMapper.getReadyShaftPoint(deviceCode);
// todo: 暂不考虑都有的情况，如果考虑，需要加判断谁的更新时间最早
// 3. 业务分支处理 // 3. 业务分支处理
if (!cachePointList.isEmpty()) { if (!cachePointList.isEmpty()) {