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

固化室出口叫料判断终点是否有任务号&任务完成找组盘用任务本身的编码

Browse Source
This commit is contained in:
psh
2024-07-16 16:41:58 +08:00
parent 69f986fdc9
commit 059aad5260
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
View File

@@ -216,12 +216,14 @@ public class GHCMLTask extends AbstractTask {
public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
String startPoint = taskObj.getPoint_code1(); String startPoint = taskObj.getPoint_code1();
String endPoint = taskObj.getPoint_code2(); String endPoint = taskObj.getPoint_code2();
String vehicle_code= JSONObject.parseObject(taskObj.getRequest_param()).getString("vehicle_code");
String vehicle_type= JSONObject.parseObject(taskObj.getRequest_param()).getString("vehicle_type");
SchBasePoint startPointObj = pointService.getById(startPoint); SchBasePoint startPointObj = pointService.getById(startPoint);
SchBasePoint endPointObj = pointService.getById(endPoint); SchBasePoint endPointObj = pointService.getById(endPoint);
if (ObjectUtil.isNotEmpty(endPointObj)) { if (ObjectUtil.isNotEmpty(endPointObj)) {
SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getVehicleGroupInfo( SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getVehicleGroupInfo(
startPointObj.getVehicle_code(), vehicle_code,
startPointObj.getVehicle_type(), vehicle_type,
GroupBindMaterialStatusEnum.BOUND.getValue()); GroupBindMaterialStatusEnum.BOUND.getValue());
TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType); TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
vehiclematerialgroup.setTask_code(taskObj.getTask_code()); vehiclematerialgroup.setTask_code(taskObj.getTask_code());

22
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml
View File

@@ -7,10 +7,24 @@
p.* p.*
FROM FROM
`sch_base_point` p `sch_base_point` p
WHERE '5' = (SELECT p1.point_status FROM sch_base_point p1 WHERE p1.point_code = p.parent_point_code AND p1.region_code='GH' WHERE
AND p1.point_type = '1') '5' = (
AND p.region_code = 'GH' AND p.point_type = '3' AND p.point_status = '1' SELECT
ORDER BY p.row_num, p.col_num p1.point_status
FROM
sch_base_point p1
WHERE
p1.point_code = p.parent_point_code
AND p1.region_code = 'GH'
AND p1.point_type = '1'
)
AND p.region_code = 'GH'
AND p.point_type = '3'
AND p.point_status = '1'
and (p.ing_task_code = '' OR p.ing_task_code IS NULL)
ORDER BY
p.row_num,
p.col_num
</select> </select>
<select id="getGHSExitMaterialList" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint"> <select id="getGHSExitMaterialList" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
SELECT SELECT