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

Merge branch 'master_merge' into master_merge_0523

Browse Source
This commit is contained in:
zhouz
2025-12-23 13:25:50 +08:00
parent 4baeae1df6 be27429564
commit ae5d6af608
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package org.nl.b_lms.sch.tasks.slitter.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.common.utils.IdUtil;
import cn.hutool.core.util.NumberUtil;
@@ -317,6 +318,28 @@ public class SlitterServiceImpl implements SlitterService {
}
List<PdmBiSlittingproductionplan> plans = slittingproductionplanService.getByQzzNo(qzzNo);
if (plans.size() == 0) {
try {
List<SchBaseTask> list = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
.eq(SchBaseTask::getTask_type, "010801")
.and(l2 -> l2.eq(SchBaseTask::getVehicle_code, qzzNo).or()
.eq(SchBaseTask::getVehicle_code2, qzzNo)));
if (list.size() > 0) {
log.info("此时得到的任务：{}", list);
SchBaseTask task = list.get(0);
JSONObject object = JSONObject.parseObject(task.getRequest_param());
JSONArray containers = object.getJSONArray("containers");
if (containers.size() > 0) {
List<String> cons = containers.toJavaList(String.class);
LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new QueryWrapper<PdmBiSlittingproductionplan>().lambda();
lam.in(PdmBiSlittingproductionplan::getContainer_name, cons);
List<PdmBiSlittingproductionplan> list1 = slittingproductionplanService.list(lam);
log.info("此时得到的计划：{}", list1);
}
}
} catch (Exception e) {
log.info("查询出错：{}", e);
}
log.error("查询不到气胀轴编码「" + qzzNo + "」对应状态[结束]的子卷信息!");
stepTipLogs.add("查询不到气胀轴编码「" + qzzNo + "」对应状态[结束]的子卷信息!");
redisUtils.set("ERROR" + deviceCode, stepTipLogs);