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

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
liyongde
2025-09-09 15:49:03 +08:00
parent 0e3f21c27c 2bcaebfa14
commit 0d02b5ef37
3 changed files with 49 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -460,10 +460,10 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
.eq("point_code1", 浅Attr.getString("struct_code")) .eq("point_code1", 浅Attr.getString("struct_code"))
.lt("task_status", TaskStatusEnum.FINISHED.getCode())); .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位存在任务" + 浅Attr.getString("task_code")); throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位被【锁定】或【存在任务】" + 浅Attr.getString("task_code"));
} }
} else { } else {
throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位存在任务" + 浅Attr.getString("task_code")); throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位被【锁定】或【存在任务】" + 浅Attr.getString("task_code"));
} }
} }
} }

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

@@ -92,6 +92,8 @@ public class TwoOutBoxTask extends AbstractAcsTask {
.uniqueResult(0); .uniqueResult(0);
if (ObjectUtil.isEmpty(浅Attr.getString("storagevehicle_code"))) { if (ObjectUtil.isEmpty(浅Attr.getString("storagevehicle_code"))) {
if (!浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) { if (!浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
json.put("remark", "当前仓位对应的浅货位【" + 浅Attr.getString("struct_code") + "被锁定无法下发任务！】");
WQLObject.getWQLObject("SCH_BASE_Task").update(json);
continue; continue;
} }
} else { } else {
@@ -104,6 +106,8 @@ public class TwoOutBoxTask extends AbstractAcsTask {
.eq("point_code1", 浅Attr.getString("struct_code")) .eq("point_code1", 浅Attr.getString("struct_code"))
.lt("task_status", TaskStatusEnum.FINISHED.getCode())); .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
json.put("remark", "当前仓位对应的浅货位【" + 浅Attr.getString("struct_code") + "有正在执行中的任务，任务完成后才能下发！】");
WQLObject.getWQLObject("SCH_BASE_Task").update(json);
continue; continue;
} else { } else {
outBoxManageService.createBoxMove(浅Attr); outBoxManageService.createBoxMove(浅Attr);

26
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java
View File

@@ -209,7 +209,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
throw new BadRequestException("终点未找到可用点位:" + point_code2); throw new BadRequestException("终点未找到可用点位:" + point_code2);
} }
//创建桁架任务将子卷搬运到桁架下的半成品缓存位 /*//创建桁架任务将子卷搬运到桁架下的半成品缓存位
//查询当前点位为空且没有任务的桁架内缓存点 //查询当前点位为空且没有任务的桁架内缓存点
JSONObject cache_param = new JSONObject(); JSONObject cache_param = new JSONObject();
cache_param.put("flag", "4"); cache_param.put("flag", "4");
@@ -250,7 +250,29 @@ public class CallEmpReelTask extends AbstractAcsTask {
param.put("type", "3"); param.put("type", "3");
InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class); InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class);
inHotTask.createTask(param); inHotTask.createTask(param);
} }*/
JSONObject cache_param = new JSONObject();
cache_param.put("flag", "4");
cache_param.put("point_location", jsonIvt.getString("point_location"));
cache_param.put("product_area", jsonIvt.getString("product_area"));
// 创建半条任务
JSONObject jo = new JSONObject();
jo.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
jo.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
jo.put("task_type", "010206");
jo.put("task_status", TaskStatusEnum.SURE_START.getCode());
jo.put("point_code1", point_code4);
jo.put("point_code2", "");
jo.put("material_code", jsonTask.getString("material_code"));
jo.put("product_area", jsonTask.getString("product_area"));
jo.put("handle_class", InHotTask.class.getName());
jo.put("remark", cache_param);
jo.put("type", "3");
jo.put("priority", "1");
jo.put("sort_seq", "1");
jo.put("create_time", DateUtil.now());
jo.put("acs_task_type", "6");
taskTab.insert(jo);
// 更新点位库存状态 // 更新点位库存状态
jsonIvt2.put("point_status", "2"); jsonIvt2.put("point_status", "2");
jsonIvt2.put("material_code", jsonTask.getString("material_code")); jsonIvt2.put("material_code", jsonTask.getString("material_code"));