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

代码更新

Browse Source
This commit is contained in:
ldj_willow
2022-10-25 08:39:08 +08:00
parent 108885261a
commit 2eb75f782e
8 changed files with 527 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,12 +22,12 @@ import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.service.TaskService; import org.nl.wms.sch.service.TaskService;
import org.nl.wms.sch.service.dto.TaskDto; import org.nl.wms.sch.service.dto.TaskDto;
import org.nl.wms.sch.tasks.PointToPointTask;
import org.nl.wms.sch.tasks.callEmpty.GjxCallEmpVehicleTask; import org.nl.wms.sch.tasks.callEmpty.GjxCallEmpVehicleTask;
import org.nl.wms.sch.tasks.callMaterial.CallMaterialTask; import org.nl.wms.sch.tasks.callMaterial.CallMaterialTask;
import org.nl.wms.sch.tasks.sendEmpty.HtSendEmpVehicleTask; import org.nl.wms.sch.tasks.sendEmpty.HtSendEmpVehicleTask;
import org.nl.wms.sch.tasks.sendEmpty.YqxSendEmpVehicleTask; import org.nl.wms.sch.tasks.sendEmpty.YqxSendEmpVehicleTask;
import org.nl.wms.sch.tasks.sendMaterial.GjxSendMaterial; import org.nl.wms.sch.tasks.sendMaterial.GjxSendMaterialTask;
import org.nl.wms.sch.tasks.sendMaterial.HkxSendMaterialTask;
import org.nl.wms.sch.tasks.sendMaterial.YqxSendMaterialTask; import org.nl.wms.sch.tasks.sendMaterial.YqxSendMaterialTask;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -194,7 +194,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
* 4.油漆线申请物料 * 4.油漆线申请物料
* 5.油漆线空盘入库 * 5.油漆线空盘入库
* 6.一楼空盘入库 （有载具号） * 6.一楼空盘入库 （有载具号）
* 7.油漆线->输送线 * 7.油漆线->输送线(油漆线满料)
* 8.豪凯自动线下料入库 * 8.豪凯自动线下料入库
*/ */
if (StrUtil.equals(type, "1")) { if (StrUtil.equals(type, "1")) {
@@ -220,7 +220,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
param.put("vehicle_type", vehicle_type); param.put("vehicle_type", vehicle_type);
param.put("vehicle_code", vehicle_code); param.put("vehicle_code", vehicle_code);
GjxSendMaterial taskBean = SpringContextHolder.getBean(GjxSendMaterial.class); GjxSendMaterialTask taskBean = SpringContextHolder.getBean(GjxSendMaterialTask.class);
String task_id = taskBean.createTask(param); // 创建任务 String task_id = taskBean.createTask(param); // 创建任务
} else if (StrUtil.equals(type, "3")) { } else if (StrUtil.equals(type, "3")) {
// 3.油漆线申请空盘: 调用空托盘出库处理类创建任务 // 3.油漆线申请空盘: 调用空托盘出库处理类创建任务
@@ -297,12 +297,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("point_code1", point_code); param.put("point_code1", point_code);
// 1.生成起点确定的任务 // 1.生成起点确定的任务
SpringContextHolder.getBean(PointToPointTask.class).createTask(param); SpringContextHolder.getBean(YqxSendMaterialTask.class).createTask(param);
} else if (StrUtil.equals(type, "8")) { } else if (StrUtil.equals(type, "8")) {
// 8.豪凯自动线下料入库 // 8.豪凯自动线下料入库
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("point_code1", point_code); param.put("point_code1", point_code);
YqxSendMaterialTask taskBean = SpringContextHolder.getBean(YqxSendMaterialTask.class); HkxSendMaterialTask taskBean = SpringContextHolder.getBean(HkxSendMaterialTask.class);
String task_id = taskBean.createTask(param); String task_id = taskBean.createTask(param);
} }

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/SchTaskDto.java
View File

@@ -103,7 +103,7 @@ public class SchTaskDto implements Serializable {
*/ */
private Integer sort_seq; private Integer sort_seq;
//物料数量 //物料数量
private Integer material_qty; private String material_qty;
/** /**
* 任务完成类型 * 任务完成类型

9
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterial.java → lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
View File

@@ -13,11 +13,9 @@ import org.nl.modules.common.utils.SecurityUtils;
import org.nl.modules.system.util.CodeUtil; import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL; import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.sch.SchTaskDto; import org.nl.wms.sch.SchTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.tasks.AcsTaskDto; import org.nl.wms.sch.tasks.AcsTaskDto;
import org.nl.wms.util.IdUtil; import org.nl.wms.util.IdUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -33,8 +31,9 @@ import java.util.List;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
public class GjxSendMaterial extends AbstractAcsTask { public class GjxSendMaterialTask extends AbstractAcsTask {
private final String THIS_CLASS = GjxSendMaterial.class.getName();
private final String THIS_CLASS = GjxSendMaterialTask.class.getName();
@Override @Override
@@ -274,7 +273,7 @@ public class GjxSendMaterial extends AbstractAcsTask {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj)) if (ObjectUtil.isNotEmpty(taskObj))
this.updateTaskStatus(taskObj,"2"); this.updateTaskStatus(taskObj, "2");
} }

279
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java Normal file
View File

@@ -0,0 +1,279 @@
package org.nl.wms.sch.tasks.sendMaterial;
import cn.hutool.core.date.DateUtil;
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;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.SecurityUtils;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
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.tasks.AcsTaskDto;
import org.nl.wms.util.IdUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
/**
* 豪凯自动线线送料任务服务
*/
@Service
@RequiredArgsConstructor
@Slf4j
public class HkxSendMaterialTask extends AbstractAcsTask {
private final String THIS_CLASS = HkxSendMaterialTask.class.getName();
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject task, String status) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
String task_id = task.getString("task_id");
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
//任务取消
if (StrUtil.equals(status, "0")) {
// 取消删除任务
if (StrUtil.equals(taskObj.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) {
throw new BadRequestException("已完成不能取消!");
}
String point_code2 = taskObj.getString("point_code2");
if (ObjectUtil.isEmpty(point_code2)) {
JSONObject endPoint = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0);
endPoint.put("lock_type", "1");
pointTab.update(endPoint);
}
taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
taskObj.put("remark", "已取消");
taskTab.update(taskObj);
}
if ("1".equals(status)) {
// 更新任务状态为执行中
taskObj.put("task_status", TaskStatusEnum.EXECUTING.getCode());
taskObj.put("update_time", DateUtil.now());
taskObj.put("car_no", taskObj.getString("car_no"));
taskTab.update(taskObj);
}
if (StrUtil.equals(status, "2")) {
// 更改任务状态为完成
taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());
taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj);
String point_code2 = taskObj.getString("point_code2");
JSONObject point2Obj = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0);
JSONObject requestObj = task.getJSONObject("request_param");
//工单标识
String workorder_id = requestObj.getString("material_info_id");
//生产工单表【PDM_BD_WorkOrder】
WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
JSONObject workorderObj = workOrderTab.query("workorder_id", workorder_id).uniqueResult(0);
//区域出入表【st_ivt_regionIO】
WQLObject regionIoTab = WQLObject.getWQLObject("st_ivt_regionIO");
JSONObject regionIoObj = new JSONObject();
regionIoObj.put("iostorinv_id", IdUtil.getLongId());
regionIoObj.put("bill_code", CodeUtil.getNewCode("IN_STORE_CODE"));
regionIoObj.put("buss_date", DateUtil.today());
regionIoObj.put("io_type", "1");
regionIoObj.put("region_id", point2Obj.getString("region_id"));
regionIoObj.put("region_code", point2Obj.getString("region_code"));
regionIoObj.put("region_name", point2Obj.getString("region_name"));
regionIoObj.put("material_id", taskObj.getString("material_id"));
regionIoObj.put("vehicle_code", taskObj.getString("vehicle_code"));
regionIoObj.put("qty", requestObj.getString("qty"));
regionIoObj.put("bill_status", "3");
regionIoObj.put("start_point_code", taskObj.getString("point_code1"));
regionIoObj.put("end_point_code", taskObj.getString("point_code3"));
regionIoObj.put("create_mode", "2");
regionIoObj.put("pcsn", DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyyMMdd"));
regionIoObj.put("create_id", SecurityUtils.getCurrentUserId());
regionIoObj.put("create_name", SecurityUtils.getCurrentNickName());
regionIoObj.put("create_time", DateUtil.now());
regionIoTab.insert(regionIoObj);
//完成后入库
//仓位库存表【ST_IVT_StructIvt】
WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
JSONObject ivtObj = new JSONObject();
ivtObj.put("stockrecord_id", IdUtil.getLongId());
ivtObj.put("point_id", point2Obj.getString("point_id"));
ivtObj.put("point_code", point2Obj.getString("point_code"));
ivtObj.put("point_name", point2Obj.getString("point_name"));
ivtObj.put("region_id", point2Obj.getString("region_id"));
ivtObj.put("region_code", point2Obj.getString("region_code"));
ivtObj.put("region_name", point2Obj.getString("region_name"));
ivtObj.put("instorage_time", DateUtil.now());
ivtObj.put("pcsn", DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyyMMdd"));
ivtObj.put("ivt_qty", requestObj.getString("qty"));
ivtObj.put("standing_time", workorderObj.getString("standing_time"));
ivtObj.put("material_id", workorderObj.getString("material_id"));
ivtTab.insert(ivtObj);
}
}
@Override
public void findNextPoint() {
/*
* 根据业务找对应的终点
*/
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '2'").getResultJSONArray(0);
for (int i = 0; i < taskArr.size(); i++) {
JSONObject taskObj = taskArr.getJSONObject(i);
String vehicle_type = taskObj.getString("vehicle_type");
JSONObject param1 = new JSONObject();
param1.put("flag", "1");
param1.put("region_code", "CPQYA01");
param1.put("vehicle_type", "%" + vehicle_type + "%");
//1、查找库区类是否有响应的载具类型和对应的物料
JSONObject endPoint = WQL.getWO("QSCH_hkxSendMaterial_01").addParamMap(param1).process().uniqueResult(0);
if (ObjectUtil.isEmpty(endPoint)) {
taskObj.put("remark", "成品区无可用货位!");
taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj);
} else {
taskObj.put("update_time", DateUtil.now());
taskObj.put("point_code2", endPoint.getString("point_code"));
taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
taskTab.update(taskObj);
//锁住终点
endPoint.put("task_id", taskObj.getString("task_id"));
endPoint.put("lock_type", "2");
pointTab.update(endPoint);
}
}
}
@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> acsTaskArr = 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();
acsTaskArr.add(dto);
}
return acsTaskArr;
}
@Override
public String createTask(JSONObject whereJson) {
String point_code1 = whereJson.getString("point_code1");
String vehicle_type = whereJson.getString("vehicle_type");
String vehicle_code = whereJson.getString("vehicle_code");
String qty = whereJson.getString("qty");
//生产工单表【PDM_BD_WorkOrder】
WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
//点位基础表【SCH_BASE_Point】
WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");
String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code");
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(IdUtil.getLongId())
.task_code(CodeUtil.getNewCode("TASK_CODE"))
.task_type("task_type")
.task_status(TaskStatusEnum.SURE_START.getCode())
.point_code1(point_code1)
.vehicle_code(vehicle_code)
.material_info_id(workOrderObj.getLong("workorder_id"))
.material_id(workOrderObj.getLong("material_id"))
.vehicle_type(vehicle_type)
.handle_class(THIS_CLASS)
.create_time(DateUtil.now())
.request_param(whereJson.toJSONString())
.build();
//任务表【SCH_BASE_Task】
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
taskTab.insert(json);
//创建好立即下发
this.immediateNotifyAcs();
return String.valueOf(dto.getTask_id());
}
@Override
public void forceFinish(String task_id) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0);
if (ObjectUtil.isNotEmpty(taskObj))
this.updateTaskStatus(taskObj, "2");
}
@Override
public void cancel(String task_id) {
}
@Transactional(rollbackFor = Exception.class)
@Override
public String againApply(String task_id) {
/*
* 再次下发任务处理方法
* 涉及业务：入空载具、出空载具、入物料、出物料
*/
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表
JSONObject taskObj = taskTab.query("task_id ='" + task_id + "'").uniqueResult(0);
JSONObject jsonPoint2 = pointTab.query("point_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
// 根据 区域、块、列找到第一个有物料的货位
JSONObject jsonOnePoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") +
"' and block_num = '" + jsonPoint2.getString("block_num") +
"' and col_num = '" + jsonPoint2.getString("col_num") +
"' and point_status = '1' order by row_num desc").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonOnePoint)) throw new BadRequestException("该列库存状态有误，请检查!");
taskObj.put("point_code3", jsonOnePoint.getString("point_code"));
taskObj.put("remark", "二次申请货位");
taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj);
return jsonOnePoint.getString("point_code");
}
}

248
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java
View File

@@ -1,9 +1,9 @@
package org.nl.wms.sch.tasks.sendMaterial; package org.nl.wms.sch.tasks.sendMaterial;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -14,18 +14,18 @@ import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL; import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.sch.PointFindUtil; import org.nl.wms.sch.SchTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.service.dto.PointDto; import org.nl.wms.sch.service.dto.PointDto;
import org.nl.wms.sch.service.impl.PointServiceImpl;
import org.nl.wms.sch.tasks.AcsTaskDto; import org.nl.wms.sch.tasks.AcsTaskDto;
import org.nl.wms.sch.tasks.RegionTypeEnum; import org.nl.wms.sch.tasks.RegionTypeEnum;
import org.nl.wms.util.IdUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -47,11 +47,23 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
**/ **/
String task_id = taskObj.getString("task_id"); String task_id = taskObj.getString("task_id");
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
//点位基础表【SCH_BASE_Point】
WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");
JSONObject jsonTask = taskTab.query("task_id='" + task_id + "'").uniqueResult(0); JSONObject jsonTask = taskTab.query("task_id='" + task_id + "'").uniqueResult(0);
if (StrUtil.equals(status, "0")) { if (StrUtil.equals(status, "0")) {
// 取消删除任务 //取消任务，释放相关点位的锁
taskTab.delete("task_id = '" + task_id + "'"); String point_code1 = jsonTask.getString("point_code1");
String point_code2 = jsonTask.getString("point_code1");
JSONObject param = new JSONObject();
param.put("lock_type", "1");
param.put("task_id", "");
pointTab.update(param, "point_code = '" + point_code1 + "'");
pointTab.update(param, "point_code = '" + point_code2 + "'");
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("remark", "已取消");
taskTab.update(jsonTask);
} }
if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
@@ -60,12 +72,6 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
jsonTask.put("update_time", DateUtil.now()); jsonTask.put("update_time", DateUtil.now());
jsonTask.put("car_no", taskObj.getString("car_no")); jsonTask.put("car_no", taskObj.getString("car_no"));
taskTab.update(jsonTask); taskTab.update(jsonTask);
HashMap map = new HashMap();
map.put("update_optid", SecurityUtils.getCurrentUserId());
map.put("update_optname", SecurityUtils.getCurrentNickName());
map.put("update_time", DateUtil.now());
map.put("bill_status", "40");
WQLObject.getWQLObject("ST_IVT_regionIO").update(map, "task_id='" + jsonTask.getString("task_id") + "'");
} }
if (TaskStatusEnum.FINISHED.getCode().equals(status)) { if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
@@ -74,49 +80,20 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode")); jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));
jsonTask.put("update_time", DateUtil.now()); jsonTask.put("update_time", DateUtil.now());
jsonTask.put("remark", "任务执行完成"); jsonTask.put("remark", "任务执行完成");
///审核单据 增加库存 改变出入库表的状态
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_regionIO");
JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
//审核 加库存可和用数量
mstObj.put("bill_status", "50");
mstObj.put("confirm_optid", SecurityUtils.getCurrentUserId());
mstObj.put("confirm_optname", SecurityUtils.getCurrentNickName());
mstObj.put("confirm_time", DateUtil.now());
mstTab.update(mstObj);
String iostorinv_id = mstObj.getString("iostorinv_id");
String bill_code = mstObj.getString("bill_code");
String bill_type_scode = mstObj.getString("bill_type");
String point_code2 = mstObj.getString("end_point_code");
String point_code1 = mstObj.getString("point_code1");
PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class);
PointDto nextPointDto = pointService.findByCode(point_code2);
if (ObjectUtil.isNull(nextPointDto)) {
throw new BadRequestException("未找到可用点位:" + point_code2);
}
PointDto startPointDto = pointService.findByCode(point_code1);
if (ObjectUtil.isNull(startPointDto)) {
throw new BadRequestException("未找到可用点位:" + point_code1);
}
// 解锁点位
String vehicle_code = jsonTask.getString("vehicle_code");
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
JSONObject endpointObj = pointTab.query("point_code='" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
endpointObj.put("lock_type", "1");
endpointObj.put("point_status", "02");
endpointObj.put("vehicle_code", vehicle_code);
endpointObj.put("vehicle_type", jsonTask.getString("vehicle_type"));
pointTab.update(endpointObj);
taskTab.update(jsonTask); taskTab.update(jsonTask);
/* JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
startPointObj.put("lock_type", "1"); //取消任务，释放相关点位的锁
startPointObj.put("point_status", "00"); String point_code1 = jsonTask.getString("point_code1");
startPointObj.put("vehicle_code", ""); String point_code2 = jsonTask.getString("point_code1");
pointTab.update(startPointObj); JSONObject param = new JSONObject();
taskTab.update(jsonTask);*/ param.put("lock_type", "1");
param.put("task_id", "");
pointTab.update(param, "point_code = '" + point_code1 + "'");
param.put("point_status", "3");
pointTab.update(param, "point_code = '" + point_code2 + "'");
} }
} }
@@ -125,108 +102,76 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
public void findNextPoint() { public void findNextPoint() {
String task_status = TaskStatusEnum.SURE_START.getCode(); String task_status = TaskStatusEnum.SURE_START.getCode();
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
//点位基础表【SCH_BASE_Point】
WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");
JSONArray taskArry = taskTab.query("task_status='" + task_status + "' AND handle_class='" + THIS_CLASS + "' AND is_delete='0' ").getResultJSONArray(0); JSONArray taskArry = taskTab.query("task_status='" + task_status + "' AND handle_class='" + THIS_CLASS + "' AND is_delete='0' ").getResultJSONArray(0);
for (int i = 0; i < taskArry.size(); i++) { for (int i = 0; i < taskArry.size(); i++) {
JSONObject taskObj = taskArry.getJSONObject(i); JSONObject taskObj = taskArry.getJSONObject(i);
String task_id = taskObj.getString("task_id"); String task_id = taskObj.getString("task_id");
//1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位
//找一个合适的仓位
WQLObject ProcedureIOStable = WQLObject.getWQLObject("ST_IVT_regionIO");
JSONObject IosObj = ProcedureIOStable.query("task_id='" + task_id + "' and is_delete ='0'").uniqueResult(0);
if (ObjectUtil.isEmpty(IosObj)) {
throw new BadRequestException("未找到任务号为'" + taskObj.getString("task_code") + "'的入库单据！");
}
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("material_id", IosObj.getString("material_id")); param.put("flag", "1");
param.put("area_type", IosObj.getString("end_area")); JSONObject endPoint = WQL.getWO("QSCH_yqxSendMaterial_01").addParamMap(param).process().uniqueResult(0);
param.put("vehicle_code", IosObj.getString("vehicle_code")); if (ObjectUtil.isEmpty(endPoint)) {
JSONObject inStructObj = PointFindUtil.getInStruct(param); taskObj.put("remark", "电梯无可用点");
if (ObjectUtil.isEmpty(inStructObj)) { taskObj.put("update_time", DateUtil.now());
throw new BadRequestException("未找到合适的入库仓位！"); taskTab.update(taskObj);
} else {
//锁住点位
endPoint.put("lock_type", "2");
endPoint.put("task_id", task_id);
pointTab.update(endPoint);
//修改任务状态
taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
taskObj.put("update_optid", SecurityUtils.getCurrentUserId());
taskObj.put("update_optname", SecurityUtils.getCurrentNickName());
taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj);
} }
//修改单据状态，将终点填入
IosObj.put("bill_status", "20");
IosObj.put("end_point_code", inStructObj.getString("struct_code"));
ProcedureIOStable.update(IosObj);
//终点加锁
HashMap lock_map = new HashMap();
lock_map.put("lock_type", "2");
WQLObject.getWQLObject("sch_base_point").update(lock_map, "point_code = '" + inStructObj.getString("struct_code") + "'");
//修改任务状态
taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
taskObj.put("update_optid", SecurityUtils.getCurrentUserId());
taskObj.put("update_optname", SecurityUtils.getCurrentNickName());
taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj);
} }
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) { public String createTask(JSONObject whereJson) {
//请求参数 载具、起点、终点 String point_code1 = whereJson.getString("point_code1");
String vehicle_code = form.getString("vehicle_code"); String vehicle_type = whereJson.getString("vehicle_type");
String vehicle_type = form.getString("vehicle_type"); String vehicle_code = whereJson.getString("vehicle_code");
String point_code1 = form.getString("point_code1"); String qty = whereJson.getString("qty");
String point_code2 = form.getString("point_code2");
WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task"); //生产工单表【PDM_BD_WorkOrder】
WQLObject iosTable = WQLObject.getWQLObject("ST_IVT_regionIO"); WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
//点位基础表【SCH_BASE_Point】
WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");
String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code");
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("该设备当前未生产或者已删除");
if (StrUtil.isEmpty(point_code1)) { SchTaskDto dto = SchTaskDto.builder()
throw new BadRequestException("起点不能为空！"); .task_id(IdUtil.getLongId())
} .task_code(CodeUtil.getNewCode("TASK_CODE"))
//判断起点有没有未完成的指令 .task_type("task_type")
JSONObject beforTaskObj = taskTable. .task_status(TaskStatusEnum.SURE_START.getCode())
query("is_delete='0' and point_code1='" + point_code1 + "' and task_status <>'" + TaskStatusEnum.FINISHED.getCode() + "'") .point_code1(point_code1)
.uniqueResult(0); .vehicle_code(vehicle_code)
if (ObjectUtil.isNotEmpty(beforTaskObj)) { .material_info_id(workOrderObj.getLong("workorder_id"))
throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！"); .material_id(workOrderObj.getLong("material_id"))
} .vehicle_type(vehicle_type)
.handle_class(THIS_CLASS)
.material_qty(qty)
.create_time(DateUtil.now())
.request_param(whereJson.toJSONString())
.build();
//任务表【SCH_BASE_Task】
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
taskTab.insert(json);
//创建好立即下发
if (StrUtil.isEmpty(point_code2)) { this.immediateNotifyAcs();
// 终点为空需要找终点 return String.valueOf(dto.getTask_id());
JSONObject param = new JSONObject();
param.put("point_code1", point_code1);
JSONObject endPoint = this.findEndPoint(param);
point_code2 = endPoint.getString("point_code2");
}
//终点点加锁
WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");
JSONObject endPointObj = pointTable.query("point_code='" + point_code2 + "'").uniqueResult(0);
endPointObj.put("lock_type", "2");
pointTable.update(endPointObj);
// 创建任务
PointService pointService = SpringContextHolder.getBean(PointService.class);
JSONObject taskObj = new JSONObject();
CodeUtil.getNewCode("TASK_CODE");
Long task_id = IdUtil.getSnowflake(1, 1).nextId();
taskObj.put("task_id", task_id);
taskObj.put("task_code", CodeUtil.getNewCode("TASK_CODE"));
taskObj.put("task_type", "01");
taskObj.put("vehicle_type", vehicle_type);
taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
taskObj.put("point_code1", point_code1);
PointDto startPoint = pointService.findByCode(point_code1);
taskObj.put("start_area", startPoint.getRegion_id());
taskObj.put("request_param", form.toJSONString());
taskObj.put("point_code2", point_code2);
PointDto nextPoint = pointService.findByCode(point_code2);
taskObj.put("next_area", nextPoint.getRegion_id());
taskObj.put("vehicle_code", vehicle_code);
taskObj.put("handle_class", THIS_CLASS);
taskObj.put("is_auto_issue", "1");
taskObj.put("create_name", SecurityUtils.getCurrentUsername());
taskObj.put("create_id", SecurityUtils.getCurrentUserId());
taskObj.put("create_time", DateUtil.now());
taskObj.put("is_delete", "0");
taskTable.insert(taskObj);
return String.valueOf(task_id);
} }
@@ -283,7 +228,28 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
@Override @Override
public List<AcsTaskDto> addTask() { 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> acsTaskArr = 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();
acsTaskArr.add(dto);
}
return acsTaskArr;
} }
} }

68
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_hkxSendMaterial_01.wql Normal file
View File

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

62
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_yqxSendMaterial_01.wql Normal file
View File

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

BIN
lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.