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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-25 13:59:31 +08:00
parent 2eb75f782e
commit bb100606a7
4 changed files with 436 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -23,6 +23,7 @@ import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.service.TaskService;
import org.nl.wms.sch.service.dto.TaskDto;
import org.nl.wms.sch.tasks.callEmpty.GjxCallEmpVehicleTask;
import org.nl.wms.sch.tasks.callEmpty.YqxCallEmpVehicleTask;
import org.nl.wms.sch.tasks.callMaterial.CallMaterialTask;
import org.nl.wms.sch.tasks.sendEmpty.HtSendEmpVehicleTask;
import org.nl.wms.sch.tasks.sendEmpty.YqxSendEmpVehicleTask;
@@ -230,7 +231,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
param.put("point_code2", point_code);
param.put("qty", qty);
// 创建任务
GjxCallEmpVehicleTask taskBean = SpringContextHolder.getBean(GjxCallEmpVehicleTask.class);
YqxCallEmpVehicleTask taskBean = SpringContextHolder.getBean(YqxCallEmpVehicleTask.class);
String task_id = taskBean.createTask(param);
} else if (StrUtil.equals(type, "4")) {
// 4.油漆线申请物料: 调用物料出库库处理类创建任务

79
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
View File

@@ -23,6 +23,7 @@ import org.nl.wms.sch.tasks.RegionTypeEnum;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@Service
@@ -45,10 +46,47 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
if (StrUtil.equals(status, "0")) {
// 取消删除任务
/*
* 取消删除
* 1.终点为叠盘架更新起点点位、等待点点位、叠盘架点位
* 2.终点为供给线更新叠盘架点位
*/
if (StrUtil.equals(jsonTask.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) {
throw new BadRequestException("已完成不能取消!");
}
String point_code1 = jsonTask.getString("point_code1");
String point_code2 = jsonTask.getString("point_code2");
JSONObject jsonEnd = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0);
// 终点在叠盘架
if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQB.getId())) {
JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
// 判断此起点是否是等待点
if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) {
// 如果不是等待点更新等待点状态
JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") +
"' and block_num = '" + jsonStart.getString("block_num") +
"' and col_num = '" + jsonStart.getString("col_num") +
"' and row_num = '9'").uniqueResult(0);
jsonEmpWait.put("lock_type", "1");
pointTab.update(jsonEmpWait);
}
jsonStart.put("lock_type", "1");
pointTab.update(jsonStart);
// 更新终点（叠盘架状态）
jsonEnd.put("lock_type", "1");
pointTab.update(jsonEnd);
} else {
// 终点在供给线
JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
jsonStart.put("lock_type", "1");
pointTab.update(jsonStart);
}
taskTab.delete("task_id = '" + task_id + "'");
}
@@ -111,7 +149,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
jsonTask2.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
taskTab.update(jsonTask2);
} else {
// 终点在油漆线: 更新起点（叠盘架）数量
// 终点在供给线线: 更新起点（叠盘架）数量
JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
jsonStart.put("vehicle_qty",NumberUtil.sub(jsonStart.getString("vehicle_qty"),"1"));
jsonStart.put("lock_type", "1");
@@ -121,11 +159,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
}
@Override
public List<AcsTaskDto> addTask() {
return null;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void findStartPoint() {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表
@@ -222,7 +256,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
pointTab.update(jsonStartPoint);
} else {
// 判断等待点是否是 未锁定、为空载具
if (StrUtil.equals(jsonEmpWait.getString("lock_type"), "1") && StrUtil.equals(jsonEmpWait.getString("point_status"), "2")) {
if (StrUtil.equals(jsonEmpWait.getString("lock_type"), "1")) {
// 创建 养生A区空载具 --> 叠盘架
SchTaskDto dto = SchTaskDto.builder()
.task_id(org.nl.wms.util.IdUtil.getLongId())
@@ -243,6 +277,9 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
// 锁起点
jsonStartPoint.put("lock_type", "2");
pointTab.update(jsonStartPoint);
// 锁等待点
jsonEmpWait.put("lock_type","2");
pointTab.update(jsonEmpWait);
} else {
continue;
}
@@ -305,6 +342,32 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
}
@Override
public List<AcsTaskDto> addTask() {
/*
* 下发给ACS时需要特殊处理
*/
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '"+THIS_CLASS+"' and task_status = '"+TaskStatusEnum.START_AND_POINT.getCode()+"' and is_delete ='0'").getResultJSONArray(0);
ArrayList<AcsTaskDto> resultList = new ArrayList<>();
for (int i = 0; i < arr.size(); i++) {
JSONObject json = arr.getJSONObject(i);
AcsTaskDto dto = AcsTaskDto.builder()
.task_id(json.getString("task_id"))
.task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1"))
.next_device_code(json.getString("point_code3"))
.vehicle_code(json.getString("vehicle_code"))
.vehicle_type(json.getString("vehicle_type"))
.priority(json.getString("priority"))
.remark(json.getString("remark"))
.build();
resultList.add(dto);
}
return resultList;
}
@Transactional(rollbackFor = Exception.class)
public boolean isTask(String point_code) {
/*

499
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java
View File

@@ -6,6 +6,7 @@ import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -17,6 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.pdm.service.DeviceService;
import org.nl.wms.pdm.service.dto.DeviceDto;
import org.nl.wms.sch.SchTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.PointService;
@@ -27,6 +29,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@Service
@@ -36,7 +39,6 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
private final String THIS_CLASS = YqxCallEmpVehicleTask.class.getName();
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
@@ -47,7 +49,47 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
if (StrUtil.equals(status, "0")) {
// 取消删除任务
/*
* 取消删除
* 1.终点为叠盘架更新起点点位、等待点点位、叠盘架点位
* 2.终点为油漆线更新叠盘架点位
*/
if (StrUtil.equals(jsonTask.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) {
throw new BadRequestException("已完成不能取消!");
}
String point_code1 = jsonTask.getString("point_code1");
String point_code2 = jsonTask.getString("point_code2");
JSONObject jsonEnd = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0);
// 终点在叠盘架
if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQA.getId())) {
JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
// 判断此起点是否是等待点
if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) {
// 如果不是等待点更新等待点状态
JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") +
"' and block_num = '" + jsonStart.getString("block_num") +
"' and col_num = '" + jsonStart.getString("col_num") +
"' and row_num = '9'").uniqueResult(0);
jsonEmpWait.put("lock_type", "1");
pointTab.update(jsonEmpWait);
}
jsonStart.put("lock_type", "1");
pointTab.update(jsonStart);
// 更新终点（叠盘架状态）
jsonEnd.put("lock_type", "1");
pointTab.update(jsonEnd);
} else {
// 终点在油漆线
JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
jsonStart.put("lock_type", "1");
pointTab.update(jsonStart);
}
taskTab.delete("task_id = '" + task_id + "'");
}
@@ -60,107 +102,243 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
}
if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
// 更改任务状态为完成
/*
* 更改任务状态为完成
* 1.终点为叠盘架更新叠盘架数量、起点点位状态、等待位状态，更新任务组状态
* 2.终点为油漆线，更新起点载具数量
*/
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("update_optid", SecurityUtils.getCurrentUserId());
jsonTask.put("update_optname", SecurityUtils.getCurrentUsername());
jsonTask.put("update_time", DateUtil.now());
taskTab.update(jsonTask);
PointService point = SpringContextHolder.getBean(PointService.class);
// 校验起点是否存在
PointDto point_code1 = point.findByCode(jsonTask.getString("point_code1"));
if (ObjectUtil.isEmpty(point_code1)) throw new BadRequestException("未找到可用点位:" + point_code1);
// 校验终点是否存在
PointDto point_code2 = point.findByCode(jsonTask.getString("point_code2"));
if (ObjectUtil.isEmpty(point_code1)) throw new BadRequestException("未找到可用点位:" + point_code2);
// 判断终点在哪里
String point_code1 = jsonTask.getString("point_code1");
String point_code2 = jsonTask.getString("point_code2");
// 1.更新点位数量 2.解锁点位
int vehicle_qty = JSONObject.parseObject(JSON.toJSONString(point_code1)).getIntValue("vehicle_qty");
BigDecimal vehicle_qty_point = NumberUtil.sub(String.valueOf(vehicle_qty), String.valueOf(1));
JSONObject jsonEnd = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0);
// 终点在叠盘架
if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQA.getId())) {
// 更新起点点位状态
JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
// 判断此起点是否是等待点
if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) {
// 如果不是等待点更新等待点状态
JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") +
"' and block_num = '" + jsonStart.getString("block_num") +
"' and col_num = '" + jsonStart.getString("col_num") +
"' and row_num = '9'").uniqueResult(0);
point_code1.setVehicle_qty(vehicle_qty_point);
if (StrUtil.equals(vehicle_qty_point.toString(), "0")) {
point_code1.setPoint_status("00");
point_code1.setVehicle_type("");
jsonEmpWait.put("lock_type", "1");
pointTab.update(jsonEmpWait);
}
jsonStart.put("point_status", "1");
jsonStart.put("lock_type", "1");
jsonStart.put("vehicle_type", "");
jsonStart.put("vehicle_code", "");
jsonStart.put("vehicle_qty", 0);
pointTab.update(jsonStart);
// 更新终点（叠盘架状态）
jsonEnd.put("vehicle_qty", NumberUtil.add(jsonEnd.getString("vehicle_qty"),jsonTask.getString("vehicle_qty")));
jsonEnd.put("lock_type", "1");
pointTab.update(jsonEnd);
// 更新任务组状态
JSONObject jsonTask2 = taskTab.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' and task_id <> '" + jsonTask.getString("task_id") + "'").uniqueResult(0);
// 判断叠盘架数量是否 < 需求数量 (暂时只能<需求数量)
if (jsonEnd.getIntValue("vehicle_qty") < jsonTask2.getIntValue("vehicle_qty")) {
jsonTask2.put("vehicle_qty", jsonEnd.getIntValue("vehicle_qty"));
}
jsonTask2.put("point_code1", jsonEnd.getString("point_code"));
jsonTask2.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
taskTab.update(jsonTask2);
} else {
// 终点在油漆线: 更新起点（叠盘架）数量
JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
jsonStart.put("vehicle_qty",NumberUtil.sub(jsonStart.getString("vehicle_qty"),jsonTask.getString("vehicle_qty")));
jsonStart.put("lock_type", "1");
pointTab.update(jsonStart);
}
point_code1.setLock_type("00");
pointTab.update(JSONObject.parseObject(JSON.toJSONString(point_code1)));
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void findStartPoint() {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表
JSONArray taskArr = taskTab.query("is_delete = '0' and handle_class = '" + this.THIS_CLASS + "' and task_status = '" + TaskStatusEnum.SURE_END.getCode() + "'").getResultJSONArray(0);
for (int i = 0; i < taskArr.size(); i++) {
// 创建任务
JSONObject jsonTask = taskArr.getJSONObject(i);
String vehicle_type = jsonTask.getString("vehicle_type");
// 找叠盘架是否与对应的载具类型
JSONObject jsonDpjStart = pointTab.query("region_id = '" + RegionTypeEnum.DPJQA.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty <> '0'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonDpjStart)) {
// 判断叠盘架是否有任务 有就下一个任务
boolean is_point = this.isTask(jsonDpjStart.getString("point_code"));
if (!is_point) continue;
// 判断叠盘架数量是否 < 需求数量 (暂时只能<需求数量)
if (jsonDpjStart.getIntValue("vehicle_qty") < jsonTask.getIntValue("vehicle_qty")) {
jsonTask.put("vehicle_qty", jsonDpjStart.getIntValue("vehicle_qty"));
}
// 更新任务起点
jsonTask.put("point_code1", jsonDpjStart.getString("point_code"));
jsonTask.put("task_status", TaskStatusEnum.START_AND_POINT);
taskTab.update(jsonTask);
} else {
// 判断叠盘架载具数量是否是0
JSONObject jsonDpjStart2 = pointTab.query("region_id = '" + RegionTypeEnum.DPJQA.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonDpjStart2)) continue;
// 判断叠盘架是否有任务
boolean is_point = this.isTask(jsonDpjStart2.getString("point_code"));
if (!is_point) continue;
// 找叠盘架暂存位是否有空托盘
JSONObject map = new JSONObject();
map.put("flag", "1");
map.put("vehicle_type", vehicle_type);
JSONObject jsonZcKtp = WQL.getWO("QSCH_YqxCallEmpVehicleTask").addParamMap(map).process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonZcKtp)) {
// 创建任务：空载具暂存位 --> 叠盘架
SchTaskDto dto = SchTaskDto.builder()
.task_id(org.nl.wms.util.IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("")
.task_status(TaskStatusEnum.START_AND_POINT.getCode())
.point_code1(jsonZcKtp.getString("point_code"))
.point_code2(jsonDpjStart2.getString("point_code"))
.vehicle_code(jsonZcKtp.getString("vehicle_code"))
.vehicle_type(jsonZcKtp.getString("vehicle_type"))
.vehicle_qty(jsonZcKtp.getIntValue("vehicle_qty"))
.task_group_id(jsonTask.getLong("task_group_id"))
.handle_class(THIS_CLASS)
.create_time(DateUtil.now())
.build();
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
taskTab.insert(json);
// 锁定起点
jsonZcKtp.put("lock_type", "2");
pointTab.update(jsonZcKtp);
} else {
// 空托盘暂存区没有就到养生A区找: 先找到出库等待点
JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() +
"' and row_num = '9' and can_vehicle_type = '" + vehicle_type +
"' and is_used = '1' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonEmpWait)) continue;
JSONObject jsonStartPoint = pointTab.query("region_id = '" + jsonEmpWait.getString("region_id") +
"' and block_num = '" + jsonEmpWait.getString("block_num") +
"' and col_num = '" + jsonEmpWait.getString("col_num") +
"' and point_status = '2' and lock_type = '1' order by out_empty_seq DESC").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonStartPoint)) continue;
// 判断找到的空载具点位是否是等待点
if (StrUtil.equals(jsonEmpWait.getString("point_code"), jsonStartPoint.getString("point_code"))) {
// 创建 养生A区空载具等待点 --> 叠盘架
SchTaskDto dto = SchTaskDto.builder()
.task_id(org.nl.wms.util.IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("")
.task_status(TaskStatusEnum.START_AND_POINT.getCode())
.point_code1(jsonStartPoint.getString("point_code"))
.point_code2(jsonDpjStart2.getString("point_code"))
.vehicle_code(jsonStartPoint.getString("vehicle_code"))
.vehicle_type(jsonStartPoint.getString("vehicle_type"))
.vehicle_qty(jsonStartPoint.getIntValue("vehicle_qty"))
.task_group_id(jsonTask.getLong("task_group_id"))
.handle_class(THIS_CLASS)
.create_time(DateUtil.now())
.build();
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
taskTab.insert(json);
// 锁起点
jsonStartPoint.put("lock_type", "2");
pointTab.update(jsonStartPoint);
} else {
// 判断等待点是否是 未锁定
if (StrUtil.equals(jsonEmpWait.getString("lock_type"), "1")) {
// 创建 养生A区空载具 --> 叠盘架
SchTaskDto dto = SchTaskDto.builder()
.task_id(org.nl.wms.util.IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("")
.task_status(TaskStatusEnum.START_AND_POINT.getCode())
.point_code1(jsonStartPoint.getString("point_code"))
.point_code2(jsonDpjStart2.getString("point_code"))
.vehicle_code(jsonStartPoint.getString("vehicle_code"))
.vehicle_type(jsonStartPoint.getString("vehicle_type"))
.vehicle_qty(jsonStartPoint.getIntValue("vehicle_qty"))
.task_group_id(jsonTask.getLong("task_group_id"))
.handle_class(THIS_CLASS)
.create_time(DateUtil.now())
.build();
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
taskTab.insert(json);
// 锁起点
jsonStartPoint.put("lock_type", "2");
pointTab.update(jsonStartPoint);
// 锁等待点
jsonEmpWait.put("lock_type", "2");
pointTab.update(jsonEmpWait);
} else {
continue;
}
}
}
}
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
String point_code1 = form.getString("point_code1");
String point_code2 = form.getString("point_code2");
String qty = form.getString("qty");
String vehicle_type = form.getString("vehicle_type");
// 出库终点不能为空
if (ObjectUtil.isEmpty(point_code2)) {
throw new BadRequestException("终点不能为空");
} else {
// 判断终点是否有正在执行的任务
JSONObject beforTaskObj = taskTab.query("is_delete='0' and point_code2='" + point_code2 + "' and task_status <>'" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(beforTaskObj))
throw new BadRequestException("存在任务号为'" + beforTaskObj.getString("task_code") + "' 未完成！");
}
// 载具数量不能为空
if (ObjectUtil.isEmpty(qty)) throw new BadRequestException("载具数量不能为空");
/*
* 1. 点对点： 起点和终点都确定,直接创建任务
* 2. 终点确定： 需要找到对应起点，在创建任务 具体找起点货位的规则在findBeginPoint()中
* 1.先生成确定终点的任务
* 2.通过findStartPoint()找起点
* 3.下发给ACS
*/
//起点不确定
if (ObjectUtil.isEmpty(point_code1)) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); // 生产工单表
WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); //点位基础表
JSONObject param = new JSONObject();
param.put("point_code2",point_code2);
param.put("vehicle_qty",qty);
String point_code2 = form.getString("point_code1");
String device_code = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0).getString("device_code");
JSONObject json = this.findBeginPoint(param);
point_code1 = json.getString("start_point_code");
vehicle_type = json.getString("vehicle_type");
} else {
// 判断终点是否是空位
JSONObject jsonPoint = pointTab.query("point_code = '" + point_code1 + "' and lock_type = '00' and point_status <> '02' and is_delete = '0' and is_used = '1'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonPoint)) throw new BadRequestException("起点点位不可用或不存在");
}
JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0);
if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除");
SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("")
.task_status(TaskStatusEnum.SURE_END.getCode())
.point_code2(point_code2)
.vehicle_code(form.getString("vehicle_code"))
.vehicle_type(workOrderObj.getString("vehicle_type"))
.vehicle_qty(form.getIntValue("qty"))
.task_group_id(org.nl.wms.util.IdUtil.getLongId())
.handle_class(THIS_CLASS)
.create_time(DateUtil.now())
.build();
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
taskTab.insert(json);
// 创建任务
JSONObject jsonTask = new JSONObject();
String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
jsonTask.put("task_id", task_id);
jsonTask.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
jsonTask.put("task_type", "04");
jsonTask.put("task_status", "01");
jsonTask.put("point_code1", point_code1);
jsonTask.put("point_code2", point_code2);
jsonTask.put("handle_class", THIS_CLASS);
jsonTask.put("vehicle_type", vehicle_type);
jsonTask.put("create_name", SecurityUtils.getCurrentUsername());
jsonTask.put("create_id", SecurityUtils.getCurrentUserId());
jsonTask.put("create_time", DateUtil.now());
jsonTask.put("acs_task_type", "1");
taskTab.insert(jsonTask);
// 锁定起点点位
JSONObject jsonPoint = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
jsonPoint.put("lock_type", "02");
pointTab.update(jsonPoint);
return task_id;
this.findStartPoint();
// this.immediateNotifyAcs();
return String.valueOf(dto.getTask_id());
}
@Override
@@ -171,128 +349,57 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
}
@Override
public void cancel(String task_id) {
}
@Transactional(rollbackFor = Exception.class)
public JSONObject findBeginPoint(JSONObject json) {
String point_code2 = json.getString("point_code2");
String vehicle_qty = json.getString("vehicle_qty");
if (ObjectUtil.isEmpty(point_code2)) throw new BadRequestException("终点不能为空");
if (ObjectUtil.isEmpty(vehicle_qty)) throw new BadRequestException("载具数量不能为空");
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
WQLObject regionTab = WQLObject.getWQLObject("SCH_BASE_Region");
WQLObject orderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
// 根据终点区域判断优先的起点区域
JSONObject jsonPointEnd = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonPointEnd)) throw new BadRequestException("终点点位不存在");
JSONObject jsonRegionEnd = regionTab.query("region_id ='" + jsonPointEnd.getString("region_id") + "'").uniqueResult(0);
// 根据起点找到对应设备，根据设备查询工单表中 - 正在运行的工单中的载具类型
String device_code = point_code2.substring(0, point_code2.indexOf("_"));
DeviceService deviceBean = SpringContextHolder.getBean(DeviceService.class);
DeviceDto deviceDto = deviceBean.findByCode(device_code);
if (ObjectUtil.isEmpty(deviceDto)) throw new BadRequestException("此设备不存在");
JSONObject jsonOrder = orderTab.query("device_id = '" + deviceDto.getDevice_id() + "' and order_status = '02' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonOrder)) throw new BadRequestException("此设备未在生产中或不存在");
//当前设备所需要的载具类型
String vehicle_type = jsonOrder.getString("vehicle_type");
/*
* 空托盘出库任务：
* 1.叠盘架B区、养生A区 --> 共挤线 （优先级：1叠盘架B区 2养生A区）
* 2.叠盘架A区、养生A区 --> 油漆线 （优先级：1叠盘架A区 2养生A区）
*/
String point_code1 = "";
JSONObject map = new JSONObject();
if (StrUtil.equals(jsonRegionEnd.getString("region_code"), RegionTypeEnum.GJQY.getCode())) {
//1、判断是否有拆托盘任务。
taskTab.query("task_type= 'gjxsqkp' ");
//2、判断是否有到该叠盘位的堆叠任务。
//1、判断叠盘架B是否有对应类型的空载具
JSONObject jsonDpjB = pointTab.query("point_status ='2' and lock_type='00' and can_vehicle_type = '" + vehicle_type + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonDpjB)) {//没有则去空托盘缓存区B和养生A区找
}
// 共挤线呼叫空托盘业务：查找叠盘架B区是否有满足条件的点位
map.put("flag", "1");
map.put("vehicle_qty", vehicle_qty);
map.put("vehicle_type", jsonOrder.getString("vehicle_type"));
map.put("region_code", RegionTypeEnum.DPJQB.getCode());
JSONObject jsonStartPointDPB = WQL.getWO("ST_VEHICLE_OUT_02").addParamMap(map).process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonStartPointDPB)) {
point_code1 = jsonStartPointDPB.getString("point_code");
} else {
// 为空说明叠盘架B区没有，则去养生A区找 : 只能找数量为1的空托盘
map.put("flag", "3");
map.put("region_code", RegionTypeEnum.YSQA.getCode());
JSONObject jsonStartPointYSA = WQL.getWO("ST_VEHICLE_OUT_02").addParamMap(map).process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonStartPointYSA)) {
point_code1 = jsonStartPointYSA.getString("point_code");
} else {
throw new BadRequestException("没有满足需求数量的点位");
/* // 如果没有则需要从养生区A区里找到 > 1的货位 出库到叠盘架B中
map.put("flag", "1");
map.put("region_code", RegionTypeEnum.YSQA.getCode());
// 起点
JSONObject jsonStart = WQL.getWO("ST_VEHICLE_OUT_02").addParamMap(map).process().uniqueResult(0);
if (ObjectUtil.isEmpty(jsonStart)) throw new BadRequestException("没有满足需求数量的点位");
// 终点
JSONObject jsonEnd = pointTab.query("region_id = '" + RegionTypeEnum.DPJQB.getId() + "' and point_status = '00' and lock_type = '00' and is_used = '1' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonEnd)) throw new BadRequestException("叠盘架B货位不足");
JSONObject parem = new JSONObject();
parem.put("point_code1",jsonStart.getString("point_code"));
parem.put("point_code2",jsonEnd.getString("point_code"));
parem.put("qty",jsonStart.getString("vehicle_qty"));
parem.put("vehicle_type",jsonStart.getString("vehicle_qty"));
String task_id = this.createTask(parem);
// 生成 叠盘架 -> 共挤线的任务 返回叠盘架B的点位code
point_code1 = jsonEnd.getString("point_code");*/
}
}
} else if (StrUtil.equals(jsonRegionEnd.getString("region_code"), RegionTypeEnum.YQQY.getCode())) {
// 油漆线呼叫空托盘业务：查找叠盘架A区是否有满足条件的点位
map.put("flag", "1");
map.put("vehicle_qty", vehicle_qty);
map.put("vehicle_type", jsonOrder.getString("vehicle_type"));
map.put("region_code", RegionTypeEnum.DPJQA.getCode());
JSONObject jsonStartPointDPA = WQL.getWO("ST_VEHICLE_OUT_02").addParamMap(map).process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonStartPointDPA)) {
point_code1 = jsonStartPointDPA.getString("point_code");
} else {
// 为空说明叠盘架A区没有，则去养生A区找
map.put("flag", "3");
map.put("region_code", RegionTypeEnum.YSQA.getCode());
JSONObject jsonStartPointYSA = WQL.getWO("ST_VEHICLE_OUT_02").addParamMap(map).process().uniqueResult(0);
if (ObjectUtil.isEmpty(jsonStartPointYSA)) throw new BadRequestException("没有满足需求数量的点位");
point_code1 = jsonStartPointYSA.getString("point_code");
}
}
JSONObject resuft = new JSONObject();
resuft.put("point_code1", point_code1);
resuft.put("vehicle_type", jsonOrder.getString("vehicle_type"));
return resuft;
}
@Override
public List<AcsTaskDto> addTask() {
return null;
/*
* 下发给ACS时需要特殊处理
*/
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '"+THIS_CLASS+"' and task_status = '"+TaskStatusEnum.START_AND_POINT.getCode()+"' and is_delete ='0'").getResultJSONArray(0);
ArrayList<AcsTaskDto> resultList = new ArrayList<>();
for (int i = 0; i < arr.size(); i++) {
JSONObject json = arr.getJSONObject(i);
AcsTaskDto dto = AcsTaskDto.builder()
.task_id(json.getString("task_id"))
.task_code(json.getString("task_code"))
.task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1"))
.next_device_code(json.getString("point_code3"))
.vehicle_code(json.getString("vehicle_code"))
.vehicle_type(json.getString("vehicle_type"))
.priority(json.getString("priority"))
.remark(json.getString("remark"))
.build();
resultList.add(dto);
}
return resultList;
}
@Transactional(rollbackFor = Exception.class)
public boolean isTask(String point_code) {
/*
* 判断点位是否有任务存在
*/
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
boolean result;
JSONObject jsonPointCode1 = tab.query("point_code1 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0);
JSONObject jsonPointCode2 = tab.query("point_code2 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0);
JSONObject jsonPointCode3 = tab.query("point_code3 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0);
JSONObject jsonPointCode4 = tab.query("point_code4 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonPointCode1) && ObjectUtil.isEmpty(jsonPointCode2) && ObjectUtil.isEmpty(jsonPointCode3) && ObjectUtil.isEmpty(jsonPointCode4)) {
result = true;
} else {
result = false;
}
return result;
}
}

60
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/wql/QSCH_YqxCallEmpVehicleTask.wql Normal file
View File

@@ -0,0 +1,60 @@
[交易说明]
交易名： 油漆线申请空盘
所属模块：
功能简述：
版权所有：
表引用：
版本经历：
[数据库]
--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
[IO定义]
#################################################
## 表字段对应输入参数
#################################################
输入.flag TYPEAS s_string
输入.vehicle_type TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
[临时变量]
--所有中间过程变量均可在此处定义
[业务过程]
##########################################
# 1、输入输出检查 #
##########################################
##########################################
# 2、主过程前处理 #
##########################################
##########################################
# 3、业务主过程 #
##########################################
IF 输入.flag = "1"
QUERY
SELECT
*
FROM
SCH_BASE_Point
WHERE
is_used = '1'
AND is_delete = '0'
AND lock_type = '1'
AND point_status = '2'
AND region_code = 'KTPHCQA01'
OPTION 输入.vehicle_type <> ""
can_vehicle_type = 输入.vehicle_type
ENDOPTION
ENDSELECT
ENDQUERY
ENDIF