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

opt:行架->捆扎逻辑变更

Browse Source
This commit is contained in:
郑旭明\73939
2026-07-12 16:20:21 +07:00
parent 57758164d4
commit 8339fa8082
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
View File

@@ -97,10 +97,10 @@ public class TwoOutTask extends AbstractAcsTask {
.collect(Collectors.groupingBy(row -> row.getString("task_group_id")));
// 判断长度
if (likeArr.size() >= 2) {
log.warn("twoOutTasklikeArr>2");
return null;
}
// if (likeArr.size() >= 2) {
// log.warn("twoOutTasklikeArr>2");
// return null;
// }
if (likeArr.size() == 1) {
flag = 1;

23
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
View File

@@ -31,6 +31,7 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.LashManage
import org.nl.b_lms.storage_manage.md.dao.MdPdStoragevehicleext;
import org.nl.b_lms.storage_manage.md.dao.mapper.MdPdStoragevehicleextMapper;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.RedissonUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
@@ -42,6 +43,7 @@ import org.nl.wms.pda.st.service.impl.PrintServiceImpl;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.*;
@@ -115,6 +117,7 @@ public class LashManageServiceImpl implements LashManageService {
* 3.生成任务
*/
// 查询木箱信息
RedissonUtils.lock(c->{
BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne(
new QueryWrapper<BstIvtBoxinfo>().lambda()
.eq(BstIvtBoxinfo::getBox_no, whereJson.getString("vehicle_code"))
@@ -224,6 +227,25 @@ public class LashManageServiceImpl implements LashManageService {
// 有空位
JSONObject jsonPoint = empPointList.get(0);
// 判断这两个点位是否有任务：如果没有则下发任务
WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
List<JSONObject> pointJson = wo_Task.query("task_type = '010707' AND task_status IN ('05','06') AND is_delete = '0' ORDER BY point_code2")
.getResultJSONArray(0).toJavaList(JSONObject.class);
if (!CollectionUtils.isEmpty(pointJson) && empPointList.size() > 1) {
// 统计第一个点位的任务数量
JSONObject finalJsonPoint = jsonPoint;
long countPoint1 = pointJson.stream()
.filter(j -> finalJsonPoint.getString("point_code").equals(j.getString("point_code2"))).count();
//第一个点有任务
if (countPoint1 > 0) {
jsonPoint = empPointList.get(1);
}
}
// 判断是否堆叠
String two_is_lash = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("two_is_lash").getValue();
if (two_is_lash.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
@@ -267,6 +289,7 @@ public class LashManageServiceImpl implements LashManageService {
twoLashTask.createTask(jsonTaskParam);
//测试屏蔽下发acs
twoLashTask.immediateNotifyAcs(null);
},"createLashTask",5,this,"捆扎任务正在创建中");
}
@Override