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

add: 生箔下料到分切上料试运行

Browse Source
This commit is contained in:
ls
2024-12-07 08:11:49 +08:00
parent 6091ad4684
commit e181617d6f
14 changed files with 300 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
View File

@@ -148,5 +148,9 @@ public class SchBasePoint implements Serializable {
private String material_id;
private String device_code;
/**
* 出入库排序
*/
private Integer sort;
}

4
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
View File

@@ -24,7 +24,7 @@
</if>
AND p.is_used = TRUE
AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.point_code1 = p.point_code AND t.task_status <![CDATA[<]]> '07')
ORDER BY p.update_time
ORDER BY p.sort desc , p.update_time asc
</select>
<select id="getHotNotTaskPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
SELECT p.*
@@ -64,7 +64,7 @@
AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status <![CDATA[<]]> '07'
AND (t.point_code1 = p.point_code OR t.point_code2 = p.point_code OR t.point_code3 = p.point_code
OR t.point_code4 = p.point_code))
ORDER BY p.in_order_seq, p.update_time
ORDER BY p.sort , p.in_order_seq, p.update_time
</select>
<select id="getWindRollConformRawNotTaskPoints" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
SELECT

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/raw/RawCallRollAGVTask.java
View File

@@ -52,6 +52,8 @@ public class RawCallRollAGVTask extends AbstractTask {
task.setPoint_code2(task.getPoint_code2());
task.setHandle_class(THIS_CLASS);
task.setTask_status(TaskStatus.START_AND_POINT.getCode());
//生箔agv
task.setCar_no("1");
setUpdateByPC(task);
taskService.save(task);
}

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/raw/RawDownAGVTask.java
View File

@@ -90,6 +90,8 @@ public class RawDownAGVTask extends AbstractTask {
// 保存任务参数
task.setHandle_class(THIS_CLASS);
task.setTask_status(TaskStatus.START_AND_POINT.getCode());
//生箔agv
task.setCar_no("1");
setUpdateByPC(task);
taskService.save(task);
});

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterUpAGVTask.java
View File

@@ -84,6 +84,8 @@ public class SlitterUpAGVTask extends AbstractTask {
// 创建任务
task.setHandle_class(THIS_CLASS);
task.setTask_status(TaskStatus.START_AND_POINT.getCode());
//分切上料agv
task.setCar_no("2");
setUpdateByPC(task);
taskService.save(task);
log.info("任务创建成功：{}", task);