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

代码更新

Browse Source
This commit is contained in:
ludj
2023-04-19 09:12:19 +08:00
parent 4a797e9f7d
commit 95e87fac3d
18 changed files with 1642 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
wms/hd/logPath_IS_UNDEFINED/2022-04-25.0.log
View File

0
wms/hd/logPath_IS_UNDEFINED/2022-04-28.0.log
View File

0
wms/hd/logPath_IS_UNDEFINED/2022-04-29.0.log
View File

0
wms/hd/logPath_IS_UNDEFINED/2022-05-18.0.log
View File

28
wms/hd/nladmin-system/src/main/java/org/nl/ACS接口说明 Normal file
View File

@@ -0,0 +1,28 @@
applyTaskManipulatorToWms 机械手申请任务 /api/acsToWms/task/manipulatorApply
queryCribbingInfo 获取木托盘信息 /api/acsToWms/task/queryCribbingInfo
getVehicleCode 获取托盘号 /api/wms/task/getEmptyVehicle_code
feedbackPointStatusToWms 向WMS反馈点位状态 /api/acsToWms/task
applyIntoKiln 申请入窑输送任务 /api/acsToWms/task/group
applyTaskToWms ACS向WMS申请任务 /api/acsToWms/task/apply
requestSignalInteraction 请求信号交互 /api/Wms_AgvApi/SignalInteraction
ispackage 出窑申请去包装 /api/wms/task/ispackage
getVehicleTokiln 获取入窑托盘信息 api/
queryDoorsStatus 查询自动门状态 /api/acsToWms/queryDoorsStatus
isTakePermission 新锐AGV获取对接位是否允许取货 http://127.0.0.1:8080/wcs/isTakePermission/
outKiln 出窑请求 /api/acsToWms/task/ispackage
apply_OutEmpty 申请出空 /api/acsToWms/task/emptyOutApply
feedbackAgvStatus 反馈AGV设备状态 /api/Wms_AgvApi/AgvStatus
lnshApplyTaskToWms 向WMS申请晟华任务 /api/acsToWms/task/apply
apply_InEmpty 申请进空 /api/acsToWms/task/emptyInApply
applyOpenOrCloseDoor 请求开门或关门 /api/acsToWms/task/status
invokeDoor 新锐AGV获取是否允许进入 http://127.0.0.1:8080/wcs/invokeDoor/
enterOrder 排产单确认 /api/acsToWms/task/sureProduceTask
AGVWorkStatus 新锐动作完成接口 http://127.0.0.1:8080/wcs/AGVWorkStatus
inKiln 入窑扫码 /api/acsToWms/task/inKiln
getDeviceStatusToWms 向WMS获取设备状态 /api/Wms_AgvApi/GetDeviceStatus
getVehiclePoint 获取托盘点位 api
deleteTask 向wms申请删除任务 /api/acsToWms/task/deleteTask
isPutPermission 新锐AGV获取对接位是否允许放货 http://127.0.0.1:8080/wcs/isPutPermission/
feedbackTaskStatusToWms 向WMS反馈任务状态 /api/acsToWms/task/status
requestTaskAgain 再次申请任务 /api/acsToWms/task/secondApply
getVehicle 获取托盘信息 /api/acsToWms/task/getVehicleInfoBycode

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

File diff suppressed because it is too large Load Diff

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java
View File

@@ -7,9 +7,9 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.utils.UserInfoUtil;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.common.utils.UserInfoUtil;
import org.nl.utils.SpringContextHolder;
import org.nl.wms.WorkProcedureEnum;
import org.nl.wms.common.SortingUtil;
@@ -24,7 +24,6 @@ import org.nl.wms.sch.service.dto.PointDto;
import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
@@ -87,6 +86,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
endpointObj.put("lock_type", "00");
endpointObj.put("point_status", "01");
endpointObj.put("vehicle_code", vehicle_code);
endpointObj.put("update_time", DateUtil.now());
pointTab.update(endpointObj);
JSONObject startPointObj =
pointTab
@@ -95,13 +95,13 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
startPointObj.put("lock_type", "00");
startPointObj.put("point_status", "00");
startPointObj.put("vehicle_code", "");
startPointObj.put("update_time", DateUtil.now());
pointTab.update(startPointObj);
taskTab.update(jsonTask);
}
}
@Override
@Transactional
public void findStartPoint() {
String task_status = TaskStatusEnum.SURE_END.getCode();
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");

896
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
View File

@@ -33,432 +33,510 @@ import java.util.HashMap;
@Service
public class CallMaterialTask extends AbstractAcsTask {
private final String THIS_CLASS = CallMaterialTask.class.getName();
@Override
public void updateTaskStatus(JSONObject taskObj, String status) {
/**
*改变任务状态
**/
String task_id = taskObj.getString("task_id");
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONObject jsonTask = taskTab.query("task_id='" + task_id + "'").uniqueResult(0);
if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
//更新任务状态为执行中
jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
jsonTask.put("update_time", DateUtil.now());
taskTab.update(jsonTask);
HashMap map = new HashMap();
map.put("bill_status", "40");
map.put("update_optid", UserInfoUtil.getCurrentUserId());
map.put("update_optname", UserInfoUtil.getNickName());
map.put("update_time", DateUtil.now());
WQLObject.getWQLObject("ST_IVT_workProcedureIOS").update(map, "task_id='" + jsonTask.getString("task_id") + "'");
}
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
// 更新任务状态为完成
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));
jsonTask.put("update_time", DateUtil.now());
jsonTask.put("remark", "任务执行完成");
///审核单据 增加库存 改变出入库表的状态
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
//审核 加库存可和用数量
StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
mstObj.put("bill_status", "50");
mstObj.put("confirm_optid", UserInfoUtil.getCurrentUserId());
mstObj.put("confirm_optname", UserInfoUtil.getNickName());
mstObj.put("confirm_time", DateUtil.now());
mstTab.update(mstObj);
String iostorinv_id = mstObj.getString("iostorinv_id");
String next_point_code = mstObj.getString("end_point_code");
String start_point_code = mstObj.getString("start_point_code");
JSONObject param = new JSONObject();
param.put("material_id", mstObj.getString("material_id"));
param.put("bill_id", iostorinv_id);
param.put("qty_unit_id", mstObj.getString("qty_unit_id"));
param.put("pcsn", mstObj.getString("pcsn"));
param.put("change_qty", mstObj.getString("qty"));
param.put("vehicle_code", mstObj.getString("vehicle_code"));
param.put("workprocedure_id", mstObj.getString("ivt_workprocedure_id"));
PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class);
PointDto nextPointDto = pointService.findByCode(next_point_code);
if (ObjectUtil.isNull(nextPointDto)) {
throw new BadRequestException("未找到可用点位:" + next_point_code);
}
PointDto startPointDto = pointService.findByCode(start_point_code);
if (ObjectUtil.isNull(startPointDto)) {
throw new BadRequestException("未找到可用点位:" + start_point_code);
}
param.put("struct_id", startPointDto.getPoint_id());
ivtService.addIvtFlow(param, IvtChangeTypeEnum.SUB_IVT);
//解锁仓位，托盘信息，回写到点位上去
String vehicle_code = jsonTask.getString("vehicle_code");
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
JSONObject endpointObj = pointTab.query("point_code='" + jsonTask.getString("next_point_code") + "'").uniqueResult(0);
endpointObj.put("lock_type", "00");
endpointObj.put("point_status", "02");
endpointObj.put("vehicle_code", vehicle_code);
pointTab.update(endpointObj);
////如果终点是分拣区域，则更新木托盘铁托盘记录表
String next_area = nextPointDto.getArea_type();
if (StrUtil.equals(next_area, AreaEnum.FJQY.getCode())) {
//如果是下料料位置 托盘则是木托盘
if (StrUtil.equals(next_point_code, "FJJXSXLW201") ||
StrUtil.equals(next_point_code, "FJJXSXLW202") ||
StrUtil.equals(next_point_code, "FJJXSXLW301") ||
StrUtil.equals(next_point_code, "FJJXSXLW302")) {
JSONObject jo = new JSONObject();
jo.put("device_code", next_point_code);
jo.put("vehicle_code", vehicle_code);
SortingUtil.record(jo);
}
//如果是上料位置 则需要去找点位记录表上的托盘记录
else {
String flag = "8";
if (StrUtil.equals(next_point_code, "FJJXSSLW101") || StrUtil.equals(next_point_code, "FJJXSSLW102")) {
flag = "7";
}
JSONArray paramArr = WQL.getWO("ACSTOMES_001").addParam("flag", flag).process().getResultJSONArray(0);
for (int i = 0; i < paramArr.size(); i++) {
JSONObject jo = paramArr.getJSONObject(i);
SortingUtil.record(jo);
}
}
}
JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0);
startPointObj.put("lock_type", "00");
startPointObj.put("point_status", "00");
startPointObj.put("vehicle_code", "");
pointTab.update(startPointObj);
taskTab.update(jsonTask);
//2是出窑缓存货架，调用反馈出冷却缓冲区
//3是木托盘缓存货架，调用反馈半木托出临时库区
String point_type = startPointObj.getString("point_type");
JSONObject jo = new JSONObject();
jo.put("task_id", task_id);
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
if (StrUtil.equals(point_type, AreaEnum.CYHCHJ.getCode())) {
wmsToJnServiceImpl.feedBackOutWait(jo);
}
if (StrUtil.equals(point_type, AreaEnum.BTHCQ.getCode())) {
wmsToJnServiceImpl.feedBackOutPartStock(jo);
}
}
private final String THIS_CLASS = CallMaterialTask.class.getName();
@Override
public void updateTaskStatus(JSONObject taskObj, String status) {
/** 改变任务状态 */
String task_id = taskObj.getString("task_id");
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONObject jsonTask = taskTab.query("task_id='" + task_id + "'").uniqueResult(0);
if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {
// 更新任务状态为执行中
jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode());
jsonTask.put("update_time", DateUtil.now());
taskTab.update(jsonTask);
HashMap map = new HashMap();
map.put("bill_status", "40");
map.put("update_optid", UserInfoUtil.getCurrentUserId());
map.put("update_optname", UserInfoUtil.getNickName());
map.put("update_time", DateUtil.now());
WQLObject.getWQLObject("ST_IVT_workProcedureIOS")
.update(map, "task_id='" + jsonTask.getString("task_id") + "'");
}
@Override
public void findStartPoint() {
String task_status = TaskStatusEnum.SURE_START.getCode();
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
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++) {
JSONObject taskObj = taskArry.getJSONObject(i);
String task_id = taskObj.getString("task_id");
//1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位
//找一个合适的仓位
WQLObject ProcedureIOStable = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
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();
param.put("material_id", IosObj.getString("material_id"));
param.put("area_type", IosObj.getString("start_area"));
JSONObject inStructObj = StructFindUtil.getOutStruct(param);
if (ObjectUtil.isEmpty(inStructObj)) {
throw new BadRequestException("未找到合适的出库仓位！");
}
//修改单据状态，将终点填入
IosObj.put("bill_status", "20");
IosObj.put("start_point_code", inStructObj.getString("struct_code"));
ProcedureIOStable.update(IosObj);
//终点加锁
HashMap lock_map = new HashMap();
lock_map.put("lock_type", "01");
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", UserInfoUtil.getCurrentUserId());
taskObj.put("update_optname", UserInfoUtil.getNickName());
taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj);
}
if (TaskStatusEnum.FINISHED.getCode().equals(status)) {
// 更新任务状态为完成
jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));
jsonTask.put("update_time", DateUtil.now());
jsonTask.put("remark", "任务执行完成");
/// 审核单据 增加库存 改变出入库表的状态
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
JSONObject mstObj =
mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
// 审核 加库存可和用数量
StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
mstObj.put("bill_status", "50");
mstObj.put("confirm_optid", UserInfoUtil.getCurrentUserId());
mstObj.put("confirm_optname", UserInfoUtil.getNickName());
mstObj.put("confirm_time", DateUtil.now());
mstTab.update(mstObj);
String iostorinv_id = mstObj.getString("iostorinv_id");
String next_point_code = mstObj.getString("end_point_code");
String start_point_code = mstObj.getString("start_point_code");
JSONObject param = new JSONObject();
param.put("material_id", mstObj.getString("material_id"));
param.put("bill_id", iostorinv_id);
param.put("qty_unit_id", mstObj.getString("qty_unit_id"));
param.put("pcsn", mstObj.getString("pcsn"));
param.put("change_qty", mstObj.getString("qty"));
param.put("vehicle_code", mstObj.getString("vehicle_code"));
param.put("workprocedure_id", mstObj.getString("ivt_workprocedure_id"));
PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class);
PointDto nextPointDto = pointService.findByCode(next_point_code);
if (ObjectUtil.isNull(nextPointDto)) {
throw new BadRequestException("未找到可用点位:" + next_point_code);
}
PointDto startPointDto = pointService.findByCode(start_point_code);
if (ObjectUtil.isNull(startPointDto)) {
throw new BadRequestException("未找到可用点位:" + start_point_code);
}
Long point_id = startPointDto.getPoint_id();
param.put("struct_id", point_id);
ivtService.addIvtFlow(param, IvtChangeTypeEnum.SUB_IVT);
// 解锁仓位，托盘信息，回写到点位上去
String vehicle_code = jsonTask.getString("vehicle_code");
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
JSONObject endpointObj = pointTab
.query("point_code='" + jsonTask.getString("next_point_code") + "'")
.uniqueResult(0);
endpointObj.put("lock_type", "00");
endpointObj.put("point_status", "02");
endpointObj.put("vehicle_code", vehicle_code);
endpointObj.put("update_time", DateUtil.now());
pointTab.update(endpointObj);
//// 如果终点是分拣区域，则更新木托盘铁托盘记录表
String next_area = nextPointDto.getArea_type();
if (StrUtil.equals(next_area, AreaEnum.FJQY.getCode())) {
// 如果是下料料位置 托盘则是木托盘
if (StrUtil.equals(next_point_code, "FJJXSXLW201")
|| StrUtil.equals(next_point_code, "FJJXSXLW202")
|| StrUtil.equals(next_point_code, "FJJXSXLW301")
|| StrUtil.equals(next_point_code, "FJJXSXLW302")) {
JSONObject jo = new JSONObject();
jo.put("device_code", next_point_code);
jo.put("vehicle_code", vehicle_code);
SortingUtil.record(jo);
}
// 如果是上料位置 则需要去找点位记录表上的托盘记录
else {
String flag = "8";
if (StrUtil.equals(next_point_code, "FJJXSSLW101")
|| StrUtil.equals(next_point_code, "FJJXSSLW102")) {
flag = "7";
}
JSONArray paramArr =
WQL.getWO("ACSTOMES_001").addParam("flag", flag).process().getResultJSONArray(0);
for (int i = 0; i < paramArr.size(); i++) {
JSONObject jo = paramArr.getJSONObject(i);
SortingUtil.record(jo);
}
}
}
JSONObject startPointObj =
pointTab
.query("point_code='" + jsonTask.getString("start_point_code") + "'")
.uniqueResult(0);
if (ObjectUtil.isNotEmpty(startPointObj)) {
// 仓位库存表【ST_IVT_StructIvt】
WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
startPointObj.put("lock_type", "00");
startPointObj.put("point_status", "00");
startPointObj.put("vehicle_code", "");
startPointObj.put("update_time", DateUtil.now());
pointTab.update(startPointObj);
taskTab.update(jsonTask);
ivtTab.delete("struct_id = '" + point_id + "'");
}
// 2是出窑缓存货架，调用反馈出冷却缓冲区
// 3是木托盘缓存货架，调用反馈半木托出临时库区
String point_type = startPointObj.getString("point_type");
JSONObject jo = new JSONObject();
jo.put("task_id", task_id);
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
if (StrUtil.equals(point_type, AreaEnum.CYHCHJ.getCode())) {
wmsToJnServiceImpl.feedBackOutWait(jo);
}
if (StrUtil.equals(point_type, AreaEnum.BTHCQ.getCode())) {
wmsToJnServiceImpl.feedBackOutPartStock(jo);
}
}
}
@Override
public void findNextPoint() {
@Override
public void findStartPoint() {
String task_status = TaskStatusEnum.SURE_START.getCode();
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
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++) {
JSONObject taskObj = taskArry.getJSONObject(i);
String task_id = taskObj.getString("task_id");
// 1 将任务修改为分配 2将终点写入，完成分配，3 加锁点位
// 找一个合适的仓位
WQLObject ProcedureIOStable = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
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();
param.put("material_id", IosObj.getString("material_id"));
param.put("area_type", IosObj.getString("start_area"));
JSONObject inStructObj = StructFindUtil.getOutStruct(param);
if (ObjectUtil.isEmpty(inStructObj)) {
throw new BadRequestException("未找到合适的出库仓位！");
}
// 修改单据状态，将终点填入
IosObj.put("bill_status", "20");
IosObj.put("start_point_code", inStructObj.getString("struct_code"));
ProcedureIOStable.update(IosObj);
// 终点加锁
HashMap lock_map = new HashMap();
lock_map.put("lock_type", "01");
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", UserInfoUtil.getCurrentUserId());
taskObj.put("update_optname", UserInfoUtil.getNickName());
taskObj.put("update_time", DateUtil.now());
taskTab.update(taskObj);
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
//请求参数 终点不能为空 物料，数量，客户,批次，创建方式，托盘，是否满托不能为空！ 起点点位不为空时,单据编号不能为空！
String start_point_code = form.getString("start_point_code");
String next_point_code = form.getString("next_point_code");
String vehicle_code = form.getString("vehicle_code");
String task_status = TaskStatusEnum.SURE_START.getCode();
String material_id = form.getString("material_id");
String create_mode = form.getString("create_mode");
String pcsn = form.getString("pcsn");
String is_full = form.getString("is_full");
String workprocedure_id = form.getString("workprocedure_id");
String group_device = form.getString("group_device");
WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task");
String iostorinv_id = form.getString("iostorinv_id");
if (StrUtil.isEmpty(next_point_code)) {
throw new BadRequestException("终点不能为空！");
}
if (StrUtil.isEmpty(material_id)) {
throw new BadRequestException("物料标识不能为空！");
}
if (StrUtil.isEmpty(create_mode)) {
throw new BadRequestException("创建方式不能为空！");
}
if (StrUtil.isEmpty(is_full)) {
throw new BadRequestException("是否满托不能为空！");
}
//判断终点有没有未完成的指令
JSONObject beforTaskObj = taskTable.
query("is_delete='0' and next_point_code='" + next_point_code + "' and task_status <>'" + TaskStatusEnum.FINISHED.getCode() + "'")
@Override
public void findNextPoint() {}
@Override
public String createTask(JSONObject form) {
// 请求参数 终点不能为空 物料，数量，客户,批次，创建方式，托盘，是否满托不能为空！ 起点点位不为空时,单据编号不能为空！
String start_point_code = form.getString("start_point_code");
String next_point_code = form.getString("next_point_code");
String vehicle_code = form.getString("vehicle_code");
String task_status = TaskStatusEnum.SURE_START.getCode();
String material_id = form.getString("material_id");
String create_mode = form.getString("create_mode");
String pcsn = form.getString("pcsn");
String is_full = form.getString("is_full");
String workprocedure_id = form.getString("workprocedure_id");
String group_device = form.getString("group_device");
WQLObject taskTable = WQLObject.getWQLObject("SCH_BASE_Task");
String iostorinv_id = form.getString("iostorinv_id");
if (StrUtil.isEmpty(next_point_code)) {
throw new BadRequestException("终点不能为空！");
}
if (StrUtil.isEmpty(material_id)) {
throw new BadRequestException("物料标识不能为空！");
}
if (StrUtil.isEmpty(create_mode)) {
throw new BadRequestException("创建方式不能为空！");
}
if (StrUtil.isEmpty(is_full)) {
throw new BadRequestException("是否满托不能为空！");
}
// 判断终点有没有未完成的指令
JSONObject beforTaskObj =
taskTable
.query(
"is_delete='0' and next_point_code='"
+ next_point_code
+ "' and task_status <>'"
+ TaskStatusEnum.FINISHED.getCode()
+ "'")
.uniqueResult(0);
if (ObjectUtil.isNotEmpty(beforTaskObj)) {
throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！");
}
PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class);
String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
String start_area = "";
String startArea_type = "";
String bill_type = "";
String qty = "";
String qty_unit_id = "";
String ivt_workprocedure_id = "";
WQLObject iosTable = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
if (StrUtil.isNotEmpty(start_point_code)) {
if (StrUtil.isEmpty(iostorinv_id)) {
throw new BadRequestException("入库单据号不能为空！");
}
JSONObject IosObj = iosTable.query("iostorinv_id='" + iostorinv_id + "'").uniqueResult(0);
IosObj.put("bill_status", "20");
iosTable.update(IosObj);
PointDto StartPoint = pointService.findByCode(start_point_code);
JSONObject ivtObj =
WQLObject.getWQLObject("ST_IVT_StructIvt")
.query("struct_id='" + StartPoint.getPoint_id() + "'")
.uniqueResult(0);
if (ObjectUtil.isEmpty(ivtObj)) {
throw new BadRequestException("仓位为'" + StartPoint.getPoint_code() + "'的库存信息不存在！");
}
qty = ivtObj.getString("canuse_qty");
qty_unit_id = ivtObj.getString("qty_unit_id");
ivt_workprocedure_id = ivtObj.getString("ivt_workprocedure_id");
}
PointDto nextPoint = pointService.findByCode(next_point_code);
// 如果没给起点，根据终点去找工序，找一个合适的仓位 并且生成入库单，并且锁定点位
if (StrUtil.isEmpty(start_point_code)) {
if (StrUtil.isEmpty(workprocedure_id)) {
JSONObject workInfo =
WQL.getWO("QSTRUCT_RULE")
.addParam("flag", "1")
.addParam("code", next_point_code)
.process()
.uniqueResult(0);
if (ObjectUtil.isNotEmpty(beforTaskObj)) {
throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！");
workprocedure_id = workInfo.getString("workprocedure_id");
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
switch (workProcedureEnum) {
// 烧制工序
case SZGX:
startArea_type = AreaEnum.RYHCHJ.getCode();
bill_type = BillTypeEnum.SZCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.YZGX.getId();
break;
// 分拣工序
case FJGX:
startArea_type = AreaEnum.CYHCHJ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.SZGX.getId();
break;
// 包装工序
case BZGX:
startArea_type = AreaEnum.BTHCQ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.FJGX.getId();
break;
}
PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class);
String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
String start_area = "";
String startArea_type = "";
String bill_type = "";
String qty = "";
String qty_unit_id = "";
String ivt_workprocedure_id = "";
WQLObject iosTable = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
if (StrUtil.isNotEmpty(start_point_code)) {
if (StrUtil.isEmpty(iostorinv_id)) {
throw new BadRequestException("入库单据号不能为空！");
}
JSONObject IosObj = iosTable.query("iostorinv_id='" + iostorinv_id + "'").uniqueResult(0);
IosObj.put("bill_status", "20");
iosTable.update(IosObj);
PointDto StartPoint = pointService.findByCode(start_point_code);
JSONObject ivtObj = WQLObject.getWQLObject("ST_IVT_StructIvt").query("struct_id='" + StartPoint.getPoint_id() + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(ivtObj)) {
throw new BadRequestException("仓位为'" + StartPoint.getPoint_code() + "'的库存信息不存在！");
}
qty = ivtObj.getString("canuse_qty");
qty_unit_id = ivtObj.getString("qty_unit_id");
ivt_workprocedure_id = ivtObj.getString("ivt_workprocedure_id");
} else {
// （机械手呼叫空托盘，需要呼叫半满托盘）如果请求有工序，假如是压制工序，则库存工序是压制，起点是出窑货架
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
switch (workProcedureEnum) {
// 烧制工序
case SZGX:
startArea_type = AreaEnum.RYHCHJ.getCode();
bill_type = BillTypeEnum.SZCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.YZGX.getId();
break;
// 分拣工序
case FJGX:
startArea_type = AreaEnum.CYHCHJ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.SZGX.getId();
break;
case BZGX:
startArea_type = AreaEnum.BTHCQ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.FJGX.getId();
break;
}
PointDto nextPoint = pointService.findByCode(next_point_code);
//如果没给起点，根据终点去找工序，找一个合适的仓位 并且生成入库单，并且锁定点位
if (StrUtil.isEmpty(start_point_code)) {
if (StrUtil.isEmpty(workprocedure_id)) {
JSONObject workInfo = WQL.getWO("QSTRUCT_RULE").addParam("flag", "1").addParam("code", next_point_code)
.process().uniqueResult(0);
workprocedure_id = workInfo.getString("workprocedure_id");
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
switch (workProcedureEnum) {
//烧制工序
case SZGX:
startArea_type = AreaEnum.RYHCHJ.getCode();
bill_type = BillTypeEnum.SZCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.YZGX.getId();
break;
//分拣工序
case FJGX:
startArea_type = AreaEnum.CYHCHJ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.SZGX.getId();
break;
//包装工序
case BZGX:
startArea_type = AreaEnum.BTHCQ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.FJGX.getId();
break;
}
} else {
// （机械手呼叫空托盘，需要呼叫半满托盘）如果请求有工序，假如是压制工序，则库存工序是压制，起点是出窑货架
WorkProcedureEnum workProcedureEnum = WorkProcedureEnum.get(workprocedure_id);
switch (workProcedureEnum) {
//烧制工序
case SZGX:
startArea_type = AreaEnum.RYHCHJ.getCode();
bill_type = BillTypeEnum.SZCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.YZGX.getId();
break;
//分拣工序
case FJGX:
startArea_type = AreaEnum.CYHCHJ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.SZGX.getId();
break;
case BZGX:
startArea_type = AreaEnum.BTHCQ.getCode();
bill_type = BillTypeEnum.FJCK.getCode();
ivt_workprocedure_id = WorkProcedureEnum.FJGX.getId();
break;
}
}
JSONObject param = new JSONObject();
param.put("material_id", material_id);
param.put("area_type", startArea_type);
param.put("workprocedure_id", ivt_workprocedure_id);
param.put("is_full", is_full);
param.put("group_device", group_device);
JSONObject outStructObj = StructFindUtil.getOutStruct(param);
if (ObjectUtil.isEmpty(outStructObj) && !StrUtil.equals(ivt_workprocedure_id, WorkProcedureEnum.YZGX.getId())) {
//假如没有货，且下料位两个都为空，并且没有执行中的任务 下发acs动作信号
WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
WmsToAcsServiceImpl wmsToAcsService = new WmsToAcsServiceImpl();
//更新分拣机械手 上下料位置的点位状态
JSONArray parr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.FJQY.getCode()).addParam("flag", "4").process().getResultJSONArray(0);
//JSONArray parr = point_table.query("area_type ='27'").getResultJSONArray(0);
PointUpdateUtil.updatePoint(parr);
JSONObject nextpointObj = point_table.query("point_code ='" + next_point_code + "'").uniqueResult(0);
if (StrUtil.equals(nextpointObj.getString("area_type"), "27")) {
//找拆垛位置的对应的另外一个点位
String other_point_code = point_table.query("point_code<>'" + next_point_code + "' " +
"and device_id='" + nextpointObj.getString("device_id") + "' and device_point_type='02' ").uniqueResult(0).getString("point_code");
String point_status01 = point_table.query("point_code ='" + next_point_code + "'").uniqueResult(0).getString("point_status");
String point_status02 = point_table.query("point_code ='" + other_point_code + "'").uniqueResult(0).getString("point_status");
//没有执行中的任务
WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
JSONObject task1 = task_table.query("next_point_code ='" + next_point_code + "' and is_delete='0' and task_status<>'07'").uniqueResult(0);
JSONObject task2 = task_table.query("next_point_code ='" + other_point_code + "' and is_delete='0' and task_status<>'07'").uniqueResult(0);
if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00") && ObjectUtil.isEmpty(task1) && ObjectUtil.isEmpty(task2)) {
JSONObject jo = new JSONObject();
JSONArray arr = new JSONArray();
// jo.put("device_code", "FJJXS1");
// jo.put("code", "to_feedback");
// jo.put("value", "10");
// arr.add(jo);
// wmsToAcsService.action(arr);
}
}
if (StrUtil.equals(next_point_code, "FJJXSSLW301") || StrUtil.equals(next_point_code, "FJJXSSLW301")) {
String point_status01 = point_table.query("point_code ='FJJXSSLW301'").uniqueResult(0).getString("point_status");
String point_status02 = point_table.query("point_code ='FJJXSSLW301'").uniqueResult(0).getString("point_status");
if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00")) {
JSONObject jo = new JSONObject();
JSONArray arr = new JSONArray();
// jo.put("device_code", "FJJXS3");
// jo.put("code", "to_feedback");
// jo.put("value", "10");
// arr.add(jo);
// wmsToAcsService.action(arr);
}
}
throw new BadRequestException("未找到合适的出库仓位！");
}
qty = outStructObj.getString("canuse_qty");
qty_unit_id = outStructObj.getString("qty_unit_id");
start_point_code = outStructObj.getString("struct_code");
vehicle_code = outStructObj.getString("vehicle_code");
//创建出库单据
JSONObject iosObj = new JSONObject();
iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + "";
iosObj.put("iostorinv_id", iostorinv_id);
iosObj.put("bill_code", CodeUtil.getNewCode("OUT_STORE_CODE"));
iosObj.put("io_type", "1");
iosObj.put("bill_type", bill_type);
iosObj.put("workprocedure_id", workprocedure_id);
iosObj.put("ivt_workprocedure_id", ivt_workprocedure_id);
iosObj.put("material_id", material_id);
iosObj.put("vehicle_code", outStructObj.getString("vehicle_code"));
iosObj.put("producetask_id", outStructObj.getString("producetask_id"));
iosObj.put("qty", qty);
iosObj.put("qty_unit_id", qty_unit_id);
//默认是分配状态
iosObj.put("bill_status", "20");
iosObj.put("start_point_code", start_point_code);
iosObj.put("end_point_code", next_point_code);
iosObj.put("start_area", startArea_type);
iosObj.put("end_area", nextPoint.getArea_type());
iosObj.put("create_mode", create_mode);
iosObj.put("task_id", task_id);
iosObj.put("pcsn", pcsn);
iosObj.put("create_id", "1");
iosObj.put("create_name", "管理员");
iosObj.put("create_time", DateUtil.now());
WQLObject.getWQLObject("ST_IVT_workProcedureIOS").insert(iosObj);
//将组盘里面的task_id改为当前的任务
WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
JSONObject groupObj = groupTable.query("vehicle_code='" + vehicle_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(groupObj)) {
groupObj.put("task_id", task_id);
groupTable.update(groupObj);
}
}
JSONObject param = new JSONObject();
param.put("material_id", material_id);
param.put("area_type", startArea_type);
param.put("workprocedure_id", ivt_workprocedure_id);
param.put("is_full", is_full);
param.put("group_device", group_device);
JSONObject outStructObj = StructFindUtil.getOutStruct(param);
if (ObjectUtil.isEmpty(outStructObj)
&& !StrUtil.equals(ivt_workprocedure_id, WorkProcedureEnum.YZGX.getId())) {
// 假如没有货，且下料位两个都为空，并且没有执行中的任务 下发acs动作信号
WQLObject point_table = WQLObject.getWQLObject("sch_base_point");
WmsToAcsServiceImpl wmsToAcsService = new WmsToAcsServiceImpl();
// 更新分拣机械手 上下料位置的点位状态
JSONArray parr =
WQL.getWO("ACSTOMES_001")
.addParam("area_type", AreaEnum.FJQY.getCode())
.addParam("flag", "4")
.process()
.getResultJSONArray(0);
// JSONArray parr = point_table.query("area_type ='27'").getResultJSONArray(0);
PointUpdateUtil.updatePoint(parr);
JSONObject nextpointObj =
point_table.query("point_code ='" + next_point_code + "'").uniqueResult(0);
if (StrUtil.equals(nextpointObj.getString("area_type"), "27")) {
// 找拆垛位置的对应的另外一个点位
String other_point_code =
point_table
.query(
"point_code<>'"
+ next_point_code
+ "' "
+ "and device_id='"
+ nextpointObj.getString("device_id")
+ "' and device_point_type='02' ")
.uniqueResult(0)
.getString("point_code");
String point_status01 =
point_table
.query("point_code ='" + next_point_code + "'")
.uniqueResult(0)
.getString("point_status");
String point_status02 =
point_table
.query("point_code ='" + other_point_code + "'")
.uniqueResult(0)
.getString("point_status");
// 没有执行中的任务
WQLObject task_table = WQLObject.getWQLObject("sch_base_task");
JSONObject task1 =
task_table
.query(
"next_point_code ='"
+ next_point_code
+ "' and is_delete='0' and task_status<>'07'")
.uniqueResult(0);
JSONObject task2 =
task_table
.query(
"next_point_code ='"
+ other_point_code
+ "' and is_delete='0' and task_status<>'07'")
.uniqueResult(0);
if (StrUtil.equals(point_status01, "00")
&& StrUtil.equals(point_status02, "00")
&& ObjectUtil.isEmpty(task1)
&& ObjectUtil.isEmpty(task2)) {
JSONObject jo = new JSONObject();
JSONArray arr = new JSONArray();
// jo.put("device_code", "FJJXS1");
// jo.put("code", "to_feedback");
// jo.put("value", "10");
// arr.add(jo);
// wmsToAcsService.action(arr);
}
}
if (StrUtil.equals(next_point_code, "FJJXSSLW301")
|| StrUtil.equals(next_point_code, "FJJXSSLW301")) {
String point_status01 =
point_table
.query("point_code ='FJJXSSLW301'")
.uniqueResult(0)
.getString("point_status");
String point_status02 =
point_table
.query("point_code ='FJJXSSLW301'")
.uniqueResult(0)
.getString("point_status");
if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00")) {
JSONObject jo = new JSONObject();
JSONArray arr = new JSONArray();
// jo.put("device_code", "FJJXS3");
// jo.put("code", "to_feedback");
// jo.put("value", "10");
// arr.add(jo);
// wmsToAcsService.action(arr);
}
}
throw new BadRequestException("未找到合适的出库仓位！");
}
qty = outStructObj.getString("canuse_qty");
qty_unit_id = outStructObj.getString("qty_unit_id");
task_status = TaskStatusEnum.START_AND_POINT.getCode();
PointDto startPoint = pointService.findByCode(start_point_code);
start_area = nextPoint.getArea_type();
//起点点加锁
HashMap lock_map = new HashMap();
lock_map.put("lock_type", "01");
WQLObject.getWQLObject("sch_base_point").update(lock_map, "point_code = '" + start_point_code + "'");
//减少库存可用数量
StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
JSONObject param = new JSONObject();
param.put("material_id", material_id);
param.put("bill_id", iostorinv_id);
param.put("qty_unit_id", qty_unit_id);
param.put("change_qty", qty);
param.put("struct_id", startPoint.getPoint_id());
param.put("vehicle_code", startPoint.getVehicle_code());
param.put("workprocedure_id", ivt_workprocedure_id);
ivtService.addIvtFlow(param, IvtChangeTypeEnum.SUB_CAN_USE);
JSONObject taskObj = new JSONObject();
taskObj.put("task_id", task_id);
taskObj.put("task_code", IdUtil.getSnowflake(1, 1).nextId() + "");
taskObj.put("task_type", "01");
taskObj.put("acs_task_type", "1");
taskObj.put("task_status", task_status);
taskObj.put("start_point_code", start_point_code);
taskObj.put("start_area", start_area);
taskObj.put("request_param", form.toJSONString());
taskObj.put("next_point_code", next_point_code);
taskObj.put("next_area", nextPoint.getArea_type());
taskObj.put("vehicle_code", vehicle_code);
taskObj.put("handle_class", THIS_CLASS);
taskObj.put("is_auto_issue", "1");
taskObj.put("create_name", "管理员");
taskObj.put("create_id", "1");
taskObj.put("create_time", DateUtil.now());
taskObj.put("is_delete", "0");
taskTable.insert(taskObj);
return task_id;
start_point_code = outStructObj.getString("struct_code");
vehicle_code = outStructObj.getString("vehicle_code");
// 创建出库单据
JSONObject iosObj = new JSONObject();
iostorinv_id = IdUtil.getSnowflake(1, 1).nextId() + "";
iosObj.put("iostorinv_id", iostorinv_id);
iosObj.put("bill_code", CodeUtil.getNewCode("OUT_STORE_CODE"));
iosObj.put("io_type", "1");
iosObj.put("bill_type", bill_type);
iosObj.put("workprocedure_id", workprocedure_id);
iosObj.put("ivt_workprocedure_id", ivt_workprocedure_id);
iosObj.put("material_id", material_id);
iosObj.put("vehicle_code", outStructObj.getString("vehicle_code"));
iosObj.put("producetask_id", outStructObj.getString("producetask_id"));
iosObj.put("qty", qty);
iosObj.put("qty_unit_id", qty_unit_id);
// 默认是分配状态
iosObj.put("bill_status", "20");
iosObj.put("start_point_code", start_point_code);
iosObj.put("end_point_code", next_point_code);
iosObj.put("start_area", startArea_type);
iosObj.put("end_area", nextPoint.getArea_type());
iosObj.put("create_mode", create_mode);
iosObj.put("task_id", task_id);
iosObj.put("pcsn", pcsn);
iosObj.put("create_id", "1");
iosObj.put("create_name", "管理员");
iosObj.put("create_time", DateUtil.now());
WQLObject.getWQLObject("ST_IVT_workProcedureIOS").insert(iosObj);
// 将组盘里面的task_id改为当前的任务
WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
JSONObject groupObj = groupTable.query("vehicle_code='" + vehicle_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(groupObj)) {
groupObj.put("task_id", task_id);
groupTable.update(groupObj);
}
}
@Override
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
task_status = TaskStatusEnum.START_AND_POINT.getCode();
@Override
public void pullBack(String task_id) {
PointDto startPoint = pointService.findByCode(start_point_code);
start_area = nextPoint.getArea_type();
// 起点点加锁
HashMap lock_map = new HashMap();
lock_map.put("lock_type", "01");
WQLObject.getWQLObject("sch_base_point")
.update(lock_map, "point_code = '" + start_point_code + "'");
// 减少库存可用数量
StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
JSONObject param = new JSONObject();
param.put("material_id", material_id);
param.put("bill_id", iostorinv_id);
param.put("qty_unit_id", qty_unit_id);
param.put("change_qty", qty);
param.put("struct_id", startPoint.getPoint_id());
param.put("vehicle_code", startPoint.getVehicle_code());
param.put("workprocedure_id", ivt_workprocedure_id);
}
ivtService.addIvtFlow(param, IvtChangeTypeEnum.SUB_CAN_USE);
JSONObject taskObj = new JSONObject();
taskObj.put("task_id", task_id);
taskObj.put("task_code", IdUtil.getSnowflake(1, 1).nextId() + "");
taskObj.put("task_type", "01");
taskObj.put("acs_task_type", "1");
taskObj.put("task_status", task_status);
taskObj.put("start_point_code", start_point_code);
taskObj.put("start_area", start_area);
taskObj.put("request_param", form.toJSONString());
taskObj.put("next_point_code", next_point_code);
taskObj.put("next_area", nextPoint.getArea_type());
taskObj.put("vehicle_code", vehicle_code);
taskObj.put("handle_class", THIS_CLASS);
taskObj.put("is_auto_issue", "1");
taskObj.put("create_name", "管理员");
taskObj.put("create_id", "1");
taskObj.put("create_time", DateUtil.now());
taskObj.put("is_delete", "0");
taskTable.insert(taskObj);
return task_id;
}
@Override
public void cancel(String task_id) {
@Override
public void forceFinish(String task_id) {
JSONObject taskObj =
WQLObject.getWQLObject("SCH_BASE_Task")
.query("task_id = '" + task_id + "'")
.uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());
}
}
@Override
public void pullBack(String task_id) {}
@Override
public void cancel(String task_id) {}
}

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ConveyorTask.java
View File

@@ -4,16 +4,13 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.common.utils.UserInfoUtil;
import org.nl.exception.BadRequestException;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.AreaEnum;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.task.TaskTypeEnum;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
*
@@ -53,7 +50,6 @@ public class ConveyorTask extends AbstractAcsTask {
}
@Transactional
@Override
public void findNextPoint() {
}

5
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/FmjToPackIngTask.java
View File

@@ -7,9 +7,9 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.UserInfoUtil;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.common.utils.UserInfoUtil;
import org.nl.utils.SpringContextHolder;
import org.nl.wms.WorkProcedureEnum;
import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
@@ -23,7 +23,6 @@ import org.nl.wms.st.ivt.IvtChangeTypeEnum;
import org.nl.wms.st.ivt.StoreIvtServiceImpl;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
@@ -68,6 +67,7 @@ public class FmjToPackIngTask extends AbstractAcsTask {
startPointObj.put("lock_type", "00");
startPointObj.put("point_status", "00");
startPointObj.put("vehicle_code", "");
startPointObj.put("update_time", DateUtil.now());
pointTab.update(startPointObj);
///审核单据 增加库存 改变出入库表的状态
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
@@ -122,7 +122,6 @@ public class FmjToPackIngTask extends AbstractAcsTask {
}
@Override
@Transactional
public String createTask(JSONObject form) {
String start_point_code = form.getString("start_point_code");
WQLObject point_table = WQLObject.getWQLObject("sch_base_point");

6
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/RgvTask.java
View File

@@ -5,16 +5,13 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.common.utils.UserInfoUtil;
import org.nl.exception.BadRequestException;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.AreaEnum;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.task.TaskTypeEnum;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* 入库任务生成
@@ -54,7 +51,6 @@ public class RgvTask extends AbstractAcsTask {
}
@Transactional
@Override
public void findNextPoint() {
}

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java
View File

@@ -10,7 +10,6 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.UserInfoUtil;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.utils.SpringContextHolder;
import org.nl.wms.common.PointUpdateUtil;
import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
@@ -22,7 +21,6 @@ import org.nl.wms.sch.service.dto.PointDto;
import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
@@ -63,6 +61,7 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
endpointObj.put("lock_type", "00");
endpointObj.put("point_status", "01");
endpointObj.put("vehicle_code", vehicle_code);
endpointObj.put("update_time", DateUtil.now());
pointTab.update(endpointObj);
JSONObject startPointObj =
@@ -78,6 +77,7 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
startPointObj.put("lock_type", "00");
startPointObj.put("point_status", "00");
startPointObj.put("vehicle_code", "");
startPointObj.put("update_time", DateUtil.now());
pointTab.update(startPointObj);
taskTab.update(jsonTask);

18
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
View File

@@ -112,6 +112,7 @@ public class SendMaterialTask extends AbstractAcsTask {
endpointObj.put("lock_type", "00");
endpointObj.put("point_status", "02");
endpointObj.put("vehicle_code", vehicle_code);
endpointObj.put("update_time", DateUtil.now());
pointTab.update(endpointObj);
JSONObject startPointObj =
@@ -122,6 +123,7 @@ public class SendMaterialTask extends AbstractAcsTask {
startPointObj.put("lock_type", "00");
startPointObj.put("point_status", "00");
startPointObj.put("vehicle_code", "");
startPointObj.put("update_time", DateUtil.now());
pointTab.update(startPointObj);
taskTab.update(jsonTask);
@@ -152,14 +154,7 @@ public class SendMaterialTask extends AbstractAcsTask {
public void findNextPoint() {
String task_status = TaskStatusEnum.SURE_START.getCode();
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONArray taskArry =
taskTab
.query(
"task_status='"
+ task_status
+ "' AND handle_class='"
+ THIS_CLASS
+ "' AND is_delete='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++) {
JSONObject taskObj = taskArry.getJSONObject(i);
@@ -200,7 +195,7 @@ public class SendMaterialTask extends AbstractAcsTask {
}
@Override
// @Transactional(rollbackFor = Exception.class)
// @Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
// 请求参数 载具、起点 物料，数量，客户,批次，创建方式 是否满托不能为空！ 终点可以不为空时，入库单据编号不能为空
String start_point_code = form.getString("start_point_code");
@@ -231,7 +226,7 @@ public class SendMaterialTask extends AbstractAcsTask {
+ "'")
.uniqueResult(0);
if (ObjectUtil.isNotEmpty(beforTaskObj)) {
throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！");
// throw new BadRequestException("存在指令号为'" + beforTaskObj.getString("task_code") + "' 未完成！");
}
PointService pointService = SpringContextHolder.getBean(PointService.class);
PointDto startPoint = pointService.findByCode(start_point_code);
@@ -384,8 +379,7 @@ public class SendMaterialTask extends AbstractAcsTask {
.process()
.uniqueResult(0);
if (StrUtil.equals(WorkProcedureEnum.YZGX.getCode(), workInfo.getString("workprocedure_code"))
|| StrUtil.equals(
WorkProcedureEnum.FJGX.getCode(), workInfo.getString("workprocedure_code"))) {
|| StrUtil.equals(WorkProcedureEnum.FJGX.getCode(), workInfo.getString("workprocedure_code"))) {
WQLObject groupTable = WQLObject.getWQLObject("st_buss_vehiclegroup");
JSONObject groupInfo = groupTable.query("group_id='" + group_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(groupInfo)) {

1
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/StructToConveyorTask.java
View File

@@ -101,6 +101,7 @@ public class StructToConveyorTask extends AbstractAcsTask {
startPointObj.put("lock_type", "00");
startPointObj.put("point_status", "00");
startPointObj.put("vehicle_code", "");
startPointObj.put("update_time", DateUtil.now());
pointTab.update(startPointObj);
taskTab.update(jsonTask);
}

19
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToConveyorTask.java
View File

@@ -4,32 +4,19 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.common.utils.UserInfoUtil;
import org.nl.exception.BadRequestException;
import org.nl.utils.SpringContextHolder;
import org.nl.wms.BussConstant;
import org.nl.wms.WorkProcedureEnum;
import org.nl.wms.common.StructFindUtil;
import org.nl.wms.ext.acs.service.WmsToJnService;
import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.AreaEnum;
import org.nl.wms.sch.manage.BillTypeEnum;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.service.dto.PointDto;
import org.nl.wms.sch.service.impl.PointServiceImpl;
import org.nl.wms.st.ivt.IvtChangeTypeEnum;
import org.nl.wms.st.ivt.StoreIvtServiceImpl;
import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
@@ -37,9 +24,6 @@ import java.util.HashMap;
@Slf4j
public class ToConveyorTask extends AbstractAcsTask {
private final String THIS_CLASS = ToConveyorTask.class.getName();
@Override
public void updateTaskStatus(JSONObject taskObj, String status) {
/**
@@ -91,7 +75,6 @@ public class ToConveyorTask extends AbstractAcsTask {
}
@Override
@Transactional
public String createTask(JSONObject form) {
//请求参数 载具、起点 物料，数量，客户,批次，创建方式 是否满托不能为空！ 终点可以不为空时，入库单据编号不能为空
String vehicle_code = form.getString("vehicle_code");

8
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java
View File

@@ -4,15 +4,12 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.common.utils.UserInfoUtil;
import org.nl.exception.BadRequestException;
import org.nl.utils.SpringContextHolder;
import org.nl.wms.common.StructFindUtil;
import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -20,7 +17,6 @@ import org.nl.wms.sch.service.PointService;
import org.nl.wms.sch.service.dto.PointDto;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
@@ -31,7 +27,6 @@ public class ToPackIngTask extends AbstractAcsTask {
private final String THIS_CLASS = ToPackIngTask.class.getName();
@Override
@Transactional
public void updateTaskStatus(JSONObject taskObj, String status) {
/** 改变任务状态 */
String task_id = taskObj.getString("task_id");
@@ -73,6 +68,7 @@ public class ToPackIngTask extends AbstractAcsTask {
startPointObj.put("lock_type", "00");
startPointObj.put("point_status", "00");
startPointObj.put("vehicle_code", "");
startPointObj.put("update_time", DateUtil.now());
pointTab.update(startPointObj);
}
// 调用mes接口

28
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoOutStructTask.java
View File

@@ -10,7 +10,6 @@ import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.WorkProcedureEnum;
import org.nl.wms.common.PointUpdateUtil;
import org.nl.wms.common.StructFindUtil;
import org.nl.wms.sch.manage.buss.CallMaterialTask;
import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject;
@@ -33,7 +32,6 @@ public class AutoOutStructTask {
void doExecute() {
log.info("定时任务AutoOutStructTask开始执行:");
WQLObject param_Table = WQLObject.getWQLObject("sys_param");
//达到可以出库的数量
//1.首先更新所有输送线的点位状态
JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", "07").addParam("flag", "4").process().getResultJSONArray(0);
@@ -42,39 +40,14 @@ public class AutoOutStructTask {
// 查询空余的入窑输送线
JSONArray arr = WQL.getWO("QSTRUCT_RULE").addParam("flag", "13")
.process().getResultJSONArray(0);
/*String material_id = "";
String vehicle_code = "";
String point_code = "";
for (int i = 0; i < arr.size(); i++) {
JSONObject jo = arr.getJSONObject(i);
String material_type = jo.getString("material_type");
String material_code = jo.getString("material_code");
if (StrUtil.equals(material_code, "0")) {
material_code = "";
}
JSONObject outObj = WQL.getWO("QSTRUCT_RULE").addParam("flag", "14")
.addParam("material_type", material_type)
.process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(outObj)) {
material_id = outObj.getString("material_id");
vehicle_code = outObj.getString("vehicle_code");
point_code = jo.getString("point_code");
break;
}
}
if (StrUtil.isEmpty(material_id)) {
return;
}*/
// 遍历输送线，给每一个输送线创建叫料任务
CallMaterialTask callMaterialTask = new CallMaterialTask();
for (Object o : arr) {
JSONObject line = (JSONObject) o;
JSONObject param = new JSONObject();
param.put("flag", "9");
param.put("area_type", "01");
// param.put("if_full", "1");
param.put("material_type", line.getString("material_type"));
String lineMaterialCode = line.getString("material_code");
if (StrUtil.isNotEmpty(lineMaterialCode) && !StrUtil.equals(lineMaterialCode, "0")) {
@@ -87,7 +60,6 @@ public class AutoOutStructTask {
taskObj.put("vehicle_code", structObj.get("vehicle_code"));
taskObj.put("material_id", structObj.get("material_id"));
taskObj.put("create_mode", "02");
// taskObj.put("is_full", "1");
taskObj.put("is_full", structObj.get("is_full"));
taskObj.put("workprocedure_id", WorkProcedureEnum.SZGX.getId());
callMaterialTask.createTask(taskObj);

4
wms/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -63,7 +63,7 @@ https://juejin.cn/post/6844903775631572999
<root level="debug">
<appender-ref ref="CONSOLE"/>
</root>
<logger name="org.springframework" level="ERROR" additivity="false">
<!--<logger name="org.springframework" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="org.hibernate" level="ERROR" additivity="false">
@@ -95,7 +95,7 @@ https://juejin.cn/post/6844903775631572999
</logger>
<logger name="nl.basjes" level="ERROR" additivity="false">
<appender-ref ref="CONSOLE"/>
</logger>
</logger>-->
</springProfile>
<!--测试环境:打印控制台-->
<springProfile name="test">