lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 测试修改

Browse Source
This commit is contained in:
liyongde
2025-12-25 17:17:04 +08:00
parent 80a63776c2
commit 75cd7e6a04
24 changed files with 1262 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/nlsso-server/pom.xml
View File

@@ -33,13 +33,6 @@
</properties>
<dependencies>
<!-- 控制台高亮-->
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>1.17.1</version>
</dependency>
<dependency>
<groupId>org.dromara.dynamictp</groupId>
<artifactId>dynamic-tp-spring-boot-starter-adapter-webserver</artifactId>

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

@@ -660,10 +660,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 获取点位实体
SchBasePoint basePoint = pointService.getById(deviceCode);
switch (basePoint.getRegion_code()) {
// 如果是困料线位置就是判断是否静置完成
case GeneralDefinition.LZKLX:
// 直接返回
return this.isStandingFinish(baseRequest);
// 如果是入窑口就是记录数据
case GeneralDefinition.GZY:
return this.recordKilnTime(baseRequest);
@@ -787,7 +783,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
baseRequest.setVehicle_code(TaskUtils.defaultVehicleCode(baseRequest.getVehicle_code()));
baseRequest.setVehicle_type(GeneralDefinition.STEEL_TRAY);
SchBasePoint basePoint = pointService.getById(baseRequest.getDevice_code());
if (ObjectUtil.isEmpty(basePoint)) {
throw new BadRequestException("扫码入窑失败，不存在站点：" + baseRequest.getDevice_code());
}
if ("1".equals(baseRequest.getIsEmpty())) {
// 入窑记录时间
SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(baseRequest.getVehicle_code(),
baseRequest.getVehicle_type(), GroupBindMaterialStatusEnum.BOUND.getValue());
if (ObjectUtil.isNotEmpty(groupInfo)) {
throw new BadRequestException("入窑失败：载具[" + baseRequest.getVehicle_code() + "]存在组盘信息，请确认是否为空托盘！");
}
// 记录入窑记录
kilnRecordService.recordEmptyKilnInfo(baseRequest.getVehicle_code(), basePoint);
} else {
@@ -797,14 +802,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(groupInfo)) {
throw new BadRequestException("入窑失败：载具[" + baseRequest.getVehicle_code() + "]组盘信息不存在！");
}
// 记录入窑数据给MES
groupInfo.setInto_kiln_time(DateUtil.now());
if (ObjectUtil.isNotEmpty(basePoint)) {
// 记录当前位置
groupInfo.setPoint_code(basePoint.getPoint_code());
groupInfo.setPoint_name(basePoint.getPoint_name());
groupInfo.setMove_way(groupInfo.getMove_way() + " -> " + basePoint.getPoint_code());
}
// 记录当前位置
groupInfo.setPoint_code(basePoint.getPoint_code());
groupInfo.setPoint_name(basePoint.getPoint_name());
groupInfo.setMove_way(groupInfo.getMove_way() + " -> " + basePoint.getPoint_code());
TaskUtils.setGroupUpdateByAcs(groupInfo);
vehiclematerialgroupService.updateById(groupInfo);
// 记录入窑记录
@@ -1080,13 +1082,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override
public ApplyTaskResponse recordOutCoolKilnTime(ApplyTaskRequest baseRequest) {
// todo: 校验托盘是否正确
log.info("扫码成功申请 - 出冷却窑记录时间的参数: {}", baseRequest);
if (ObjectUtil.isEmpty(baseRequest.getVehicle_code())) {
throw new BadRequestException("载具编码不能为空");
}
baseRequest.setVehicle_code(TaskUtils.defaultVehicleCode(baseRequest.getVehicle_code()));
baseRequest.setVehicle_type(GeneralDefinition.STEEL_TRAY);
SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(baseRequest.getVehicle_code(), GeneralDefinition.STEEL_TRAY, GroupBindMaterialStatusEnum.BOUND.getValue());
if ("1".equals(baseRequest.getIsEmpty())) {
if (null != groupInfo) {
throw new BadRequestException("检测到组盘信息，请确认是否为空盘！");
}
// 空盘只做记录
// 记录入窑记录
PdmBdKilnRecord record = kilnRecordService.oneByVehicleAndStatus(baseRequest.getVehicle_code(), "2");
@@ -1095,6 +1102,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
kilnRecordService.outCoolEmptyKilnInfo(record);
} else {
if (null == groupInfo) {
throw new BadRequestException("组盘信息不存在，请确认是否为空盘！");
}
JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(baseRequest));
jsonObject.put("config_code", "LQYMLTask");
// 创建任务

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
View File

@@ -22,6 +22,9 @@
<if test="query.point_code != null and query.point_code != ''">
AND LOWER(wo.point_code) LIKE LOWER(CONCAT('%', #{query.point_code}, '%'))
</if>
<if test="query.region_code != null and query.region_code != ''">
AND wo.region_code = #{query.region_code}
</if>
<if test="query.begin_time != null and query.begin_time != ''">
AND wo.create_time <![CDATA[ >= ]]> #{query.begin_time}
</if>
@@ -29,7 +32,7 @@
AND wo.create_time <![CDATA[ <= ]]> #{query.end_time}
</if>
</where>
ORDER BY wo.update_time DESC
ORDER BY wo.workorder_status, wo.update_time DESC
</select>
<select id="toAcsWorkOrderById" resultType="org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo">
SELECT w.workorder_code,

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderQuery.java
View File

@@ -14,6 +14,7 @@ public class PdmBdWorkorderQuery implements Serializable {
private String workorder_code;
private String point_code;
private String begin_time;
private String region_code;
private String end_time;
private List<String> more_order_status;
private String materialId;

169
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/common/MDOutMoveTask.java Normal file
View File

@@ -0,0 +1,169 @@
package org.nl.wms.sch.task_manage.task.tasks.common;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.nl.common.exception.BadRequestException;
import org.nl.wms.pdm.track.service.IPdmBdProductionProcessTrackingService;
import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import org.nl.wms.sch.task.service.ISchBaseTaskService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
/**
* 码垛移库
* @Author: lyd
* @Date: 2025/12/22
*/
@Component("MDOutMoveTask")
public class MDOutMoveTask extends AbstractTask {
private static final String TASK_CONFIG_CODE = "MDOutMoveTask";
@Resource
private ISchBaseTaskService taskService;
@Resource
private ISchBasePointService pointService;
@Autowired
private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
@Autowired
private IPdmBdProductionProcessTrackingService processTrackingService;
@Override
public void create() throws BadRequestException {
}
@Override
public void createCompletion(SchBaseTask task) {
JSONObject req = JSONObject.parseObject(task.getRequest_param());
task.setPoint_code2(req.getString("target"));
task.setTask_status(TaskStatus.CREATED.getCode());
task.setRemark("");
TaskUtils.setUpdateByAcs(task);
taskService.save(task);
}
@Override
public String setGroupPlate(JSONObject param) {
return param.getString("group_id");
}
@Override
protected void updateStatus(String task_code, TaskStatus status) {
// 校验任务
SchBaseTask taskObj = taskService.getByCode(task_code);
if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
throw new BadRequestException("该任务已完成!");
}
if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
throw new BadRequestException("该任务已取消!");
}
// 根据传来的类型去对任务进行操作
if (status.equals(TaskStatus.EXECUTING)) {
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
TaskUtils.setUpdateByAcs(taskObj);
taskService.updateById(taskObj);
}
if (status.equals(TaskStatus.FINISHED)) {
this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
}
if (status.equals(TaskStatus.CANCELED)) {
this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
}
}
@Override
public void forceFinish(String task_code) {
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
}
@Override
public void cancel(String task_code) {
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
}
@Transactional(rollbackFor = Exception.class)
public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
// 载具编码：前面需要根据任务判断，没有载具不能生成任务
String vehicle_code = taskObj.getVehicle_code();
String vehicleType = taskObj.getVehicle_type();
if (vehicleType == null || vehicleType.equals(GeneralDefinition.NO)) {
vehicleType = GeneralDefinition.STEEL_TRAY;
}
String endPoint = taskObj.getPoint_code2();
SchBasePoint endPointObj = pointService.getById(endPoint);
// 终点解锁
if (ObjectUtil.isNotEmpty(endPointObj)) {
// 修改组盘信息
SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getOne(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicle_code)
.eq(SchBaseVehiclematerialgroup::getVehicle_type, vehicleType)
.eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status,
GroupBindMaterialStatusEnum.BOUND.getValue()));
if (ObjectUtil.isEmpty(one)) {
throw new BadRequestException(vehicle_code + " => " + vehicleType + "的组盘信息未找到");
}
one.setTask_code(taskObj.getTask_code());
one.setPoint_code(endPointObj.getPoint_code());
one.setPoint_name(endPointObj.getPoint_name());
one.setMove_way(one.getMove_way() + " -> " + endPointObj.getPoint_code());
TaskUtils.setGroupUpdateByType(one, taskFinishedType);
vehiclematerialgroupService.updateById(one);
// 记录库存并解锁
endPointObj.setIng_task_code("");
endPointObj.setVehicle_code(vehicle_code);
endPointObj.setVehicle_type(vehicleType);
endPointObj.setVehicle_qty(1);
endPointObj.setPoint_status(PointStatusEnum.FULL_POINT.getCode());
PointUtils.setUpdateByType(endPointObj, taskFinishedType);
pointService.updateById(endPointObj);
// 起点解锁，创建四点任务
}
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());
taskObj.setRemark(GeneralDefinition.TASK_FINISH);
taskObj.setFinished_type(taskFinishedType.getCode());
TaskUtils.setUpdateByType(taskObj, taskFinishedType);
taskService.updateById(taskObj);
}
@Transactional(rollbackFor = Exception.class)
public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
String endPoint = taskObj.getPoint_code2();
SchBasePoint endPointObj = pointService.getById(endPoint);
// 终点解锁
if (ObjectUtil.isNotEmpty(endPointObj)) {
endPointObj.setIng_task_code("");
pointService.update(endPointObj);
}
taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
taskObj.setTask_status(TaskStatus.CANCELED.getCode());
taskObj.setFinished_type(taskFinishedType.getCode());
TaskUtils.setUpdateByType(taskObj, taskFinishedType);
taskService.updateById(taskObj);
}
}

188
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMLTask.java
View File

@@ -3,14 +3,14 @@ package org.nl.wms.sch.task_manage.task.tasks.fj;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.system.service.notice.ISysNoticeService;
import org.nl.wms.ext.mes.service.WmsToMesService;
import org.nl.wms.ext.mes.service.dto.MesSemiProDto;
import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder;
import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
@@ -40,12 +40,13 @@ import java.util.stream.Collectors;
/**
* @Author: lyd
* @Description: 分拣满空任务 - 4点
* @Description: 分拣满料任务，半满才有流程，全满没有业务
* @Date: 2023/6/21
*/
@Slf4j
@Component(value = "FJMLTask")
@TaskType("FJMLTask")
public class FJMKTask extends AbstractTask {
public class FJMLTask extends AbstractTask {
private static final String TASK_CONFIG_CODE = "FJMLTask";
@Autowired
private ISchBasePointService pointService;
@@ -99,33 +100,6 @@ public class FJMKTask extends AbstractTask {
}
// 包装线
task.setPoint_code2(packagePoint.getPoint_code());
// 大于等于2就可以码
if (jsonObject.getInteger("special_param") == 0) {
/** 覆膜机木托盘位 */
SchBasePoint LaminatePoint = findStartPoint(startRegionStr, jsonObject);
if (ObjectUtil.isEmpty(LaminatePoint)) {
noticeService.createNotice("覆膜区不可用!", TASK_CONFIG_CODE + task.getPoint_code1(),
NoticeTypeEnum.WARN.getCode());
// 消息通知
throw new BadRequestException("覆膜区不可用!");
}
// 把这个设备位放到任务中
JSONObject response = new JSONObject();
String responseParam = task.getResponse_param();
if (ObjectUtil.isNotEmpty(responseParam)) {
response = JSON.parseObject(responseParam);
}
response.put("fmj_device", LaminatePoint.getPoint_code());
// 设置终点并修改创建成功状态
task.setPoint_code3(LaminatePoint.getParent_point_code());
task.setPoint_code4(startPoint);
task.setResponse_param(response.toJSONString());
// 覆膜机对接位上锁
SchBasePoint basePoint = pointService.getById(LaminatePoint.getParent_point_code());
basePoint.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(basePoint);
pointService.updateById(basePoint);
}
task.setTask_status(TaskStatus.CREATED.getCode());
task.setRemark("");
taskService.save(task);
@@ -145,49 +119,19 @@ public class FJMKTask extends AbstractTask {
TaskUtils.setUpdateByAcs(task);
List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
.collect(Collectors.toList());
List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
.collect(Collectors.toList());
JSONObject jsonObject = JSONObject.parseObject(task.getRequest_param());
String startPoint = task.getPoint_code1();
task.setGroup_id(setGroupPlate(jsonObject));
// 找终点
/** 包装位 */
/** 包装位/半托缓存 */
SchBasePoint packagePoint = findNextPoint(nextRegionStr, jsonObject);
if (ObjectUtil.isEmpty(packagePoint)) {
// 消息通知
noticeService.createNotice("包装线不可用!", TASK_CONFIG_CODE + task.getPoint_code1(),
noticeService.createNotice("包装线不可用!", task.getPoint_code1() + "分拣满料找不到点位",
NoticeTypeEnum.WARN.getCode());
throw new BadRequestException("包装线不可用!");
}
// 设置组盘 - 需要的话由子类自行实现
task.setGroup_id(setGroupPlate(jsonObject));
task.setPoint_code2(packagePoint.getPoint_code());
// 为0就呼叫
if (jsonObject.getInteger(FieldConstant.SPECIAL_PARAM) == 0) {
/** 覆膜机木托盘位 */
SchBasePoint LaminatePoint = findStartPoint(startRegionStr, jsonObject);
if (ObjectUtil.isEmpty(LaminatePoint)) {
noticeService.createNotice("覆膜区不可用!", TASK_CONFIG_CODE + task.getPoint_code1(),
NoticeTypeEnum.WARN.getCode());
// 消息通知
throw new BadRequestException("覆膜区不可用!");
}
// 把这个设备位放到任务中
JSONObject response = new JSONObject();
String responseParam = task.getResponse_param();
if (ObjectUtil.isNotEmpty(responseParam)) {
response = JSON.parseObject(responseParam);
}
response.put("fmj_device", LaminatePoint.getPoint_code());
// 设置终点并修改创建成功状态
task.setPoint_code3(LaminatePoint.getParent_point_code());
task.setPoint_code4(startPoint);
task.setResponse_param(response.toJSONString());
// 覆膜机对接位上锁
SchBasePoint basePoint = pointService.getById(LaminatePoint.getParent_point_code());
basePoint.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(basePoint);
pointService.updateById(basePoint);
}
task.setTask_status(TaskStatus.CREATED.getCode());
task.setRemark("");
taskService.save(task);
@@ -200,48 +144,46 @@ public class FJMKTask extends AbstractTask {
// 组盘，返回组盘标识，设置待绑定，搬运结束就设置已绑定
JSONObject stackParameters = param.getJSONObject("palletize");
String deviceCode = param.getString("device_code");
String vehicleCode = TaskUtils.defaultVehicleCode(param.getString("vehicle_code"));
if (vehicleCode == null) {
throw new BadRequestException("载具号不能为空");
}
String isFull = param.getString("is_full");
if (isFull == null) {
isFull = GeneralDefinition.YES;
}
// update: 新增钢托盘对应的数量和批次和钢托盘号
// hint: 获取各自组盘信息。这里可能被解绑了，所以，未解绑的数据没拿到，就拿解绑的数据
String qty1 = ObjectUtil.isNotEmpty(param.getString("qty1")) ? param.getString("qty1") : "-";
String vehicleCode1 = ObjectUtil.isNotEmpty(param.getString("vehicle_code1"))
? TaskUtils.defaultVehicleCode(param.getString("vehicle_code1")) : "-";
String pcsn1 = vehiclematerialgroupService.getNowOrOldPcsnByVehicleCode(vehicleCode1, GeneralDefinition.STEEL_TRAY);
String qty2 = ObjectUtil.isNotEmpty(param.getString("qty2")) ? param.getString("qty2") : "-";
String vehicleCode2 = ObjectUtil.isNotEmpty(param.getString("vehicle_code2"))
? TaskUtils.defaultVehicleCode(param.getString("vehicle_code2")) : "-";
String pcsn2 = vehiclematerialgroupService.getNowOrOldPcsnByVehicleCode(vehicleCode2, GeneralDefinition.STEEL_TRAY);
String qty3 = ObjectUtil.isNotEmpty(param.getString("qty3")) ? param.getString("qty3") : "-";
String vehicleCode3 = ObjectUtil.isNotEmpty(param.getString("vehicle_code3"))
? TaskUtils.defaultVehicleCode(param.getString("vehicle_code3")) : "-";
String pcsn3 = vehiclematerialgroupService.getNowOrOldPcsnByVehicleCode(vehicleCode3, GeneralDefinition.STEEL_TRAY);
// 砖块数量
Integer qty = param.getInteger("qty");
SchBasePoint basePoint = pointService.getById(deviceCode);
String vehicleCode;
if (ObjectUtil.isNotEmpty(basePoint.getVehicle_code())) {
vehicleCode = basePoint.getVehicle_code();
} else {
vehicleCode = CodeUtil.getNewCode("wooden_pallet_coding");
}
PdmBdWorkorder workorderObject = workorderService.getDeviceProductionTask(basePoint.getParent_point_code());
if (ObjectUtil.isEmpty(workorderObject)) {
throw new BadRequestException("分拣工单不能为空！");
}
String vehicleType = workorderObject.getVehicle_type();
// 找到相同组盘信息就直接返回id，避免任务取消组盘信息还存在，重复插入
// 解绑同载具的信息
vehiclematerialgroupService.unBindingSameVehicleMaterial(vehicleCode, vehicleType);
SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(vehicleCode, vehicleType, GroupBindMaterialStatusEnum.BOUND.getValue());
SchBaseVehiclematerialgroup groupEntity = new SchBaseVehiclematerialgroup();
groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
// 要把数据存到组盘表
groupEntity.setMaterial_id(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getMaterial_id()
: "");
groupEntity.setStanding_time(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getStanding_time()
: 0);
groupEntity.setWorkorder_code(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getWorkorder_code()
: "");
// 如果是半托变成整托
if (ObjectUtil.isNotEmpty(groupInfo)) {
groupEntity = groupInfo;
groupEntity.setMove_way(groupEntity.getMove_way() + "->" + basePoint.getPoint_code());
} else {
// 解绑同载具的信息
vehiclematerialgroupService.unBindingSameVehicleMaterial(vehicleCode, vehicleType);
groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
// 要把数据存到组盘表
groupEntity.setMaterial_id(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getMaterial_id()
: "");
groupEntity.setStanding_time(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getStanding_time()
: 0);
groupEntity.setWorkorder_code(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getWorkorder_code()
: "");
groupEntity.setMove_way(basePoint.getPoint_code());
}
groupEntity.setCreate_id(GeneralDefinition.ACS_ID);
groupEntity.setCreate_name(GeneralDefinition.ACS_NAME);
groupEntity.setCreate_time(DateUtil.now());
@@ -253,66 +195,21 @@ public class FJMKTask extends AbstractTask {
groupEntity.setPoint_code(basePoint.getPoint_code());
groupEntity.setPoint_name(basePoint.getPoint_name());
groupEntity.setSource_vehicle_code(basePoint.getPoint_code());
groupEntity.setMove_way(basePoint.getPoint_code());
groupEntity.setPcsn(DateUtil.format(DateUtil.date(), "yyyyMMdd"));
groupEntity.setInstorage_time(DateUtil.now());
groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
groupEntity.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
groupEntity.setGroup_status(GroupStatusEnum.IN_STORAGE.getType());
groupEntity.setIs_delete(false);
groupEntity.setIs_full(isFull.equals(GeneralDefinition.YES));
vehiclematerialgroupService.saveOrUpdate(groupEntity);
// hint: 记录数据上报MES
// update: 木托批次：成品物料号+日期
MesSemiProDto mesSemiProDto = new MesSemiProDto();
mesSemiProDto.setRECORD_ID(IdUtil.getSnowflake(1, 1).nextIdStr());
mesSemiProDto.setWOOD_VEHICLE_CODE(vehicleCode);
mesSemiProDto.setWOOD_QTY(String.valueOf(qty));
mesSemiProDto.setWOOD_PCSN(groupEntity.getMaterial_id() + groupEntity.getPcsn());
mesSemiProDto.setSTEEL_VEHICLE_CODE1(vehicleCode1);
mesSemiProDto.setSTEEL_VEHICLE_CODE2(vehicleCode2);
mesSemiProDto.setSTEEL_VEHICLE_CODE3(vehicleCode3);
mesSemiProDto.setSTEEL_PCSN1(pcsn1);
mesSemiProDto.setSTEEL_PCSN2(pcsn2);
mesSemiProDto.setSTEEL_PCSN3(pcsn3);
mesSemiProDto.setSTEEL_QTY1(qty1);
mesSemiProDto.setSTEEL_QTY2(qty2);
mesSemiProDto.setSTEEL_QTY3(qty3);
mesSemiProDto.setRECORD_TIME(DateUtil.now());
mesSemiProDto.setCREATE_TM(DateUtil.now());
mesSemiProDto.setOP_FLAG(GeneralDefinition.NO);
wmsToMesService.reportSemiProToMes(mesSemiProDto);
// 返回组盘id记录任务中
return groupEntity.getGroup_id();
return isFull.equals(GeneralDefinition.YES) ? null : groupEntity.getGroup_id();
}
/**
* 从覆膜区找个空木托盘
*
* @param startRegionStr
* @param extData
* @return
*/
private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject extData) {
// 当前设备的工单
String workorderCode = extData.getString("workorder_code");
PdmBdWorkorder one = ObjectUtil.isNotEmpty(workorderCode)
? workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>()
.eq(PdmBdWorkorder::getWorkorder_code, workorderCode))
: null;
if (one == null) {
throw new BadRequestException("工单不能为空!");
}
String vehicleType = one.getVehicle_type();
// 向ACS请求所需木托盘在那个栈拆盘机？已经实时更新,故只需要自己查询即可
SchBasePoint endPointObj = fjMapper.findPointForFJQK(startRegionStr, new JSONObject()
.fluentPut("vehicleType", vehicleType).fluentPut("pointType", GeneralDefinition.DEVICE_POINT));
// 这个点的父点位为起点
return ObjectUtil.isNotEmpty(endPointObj) ? endPointObj : null;
}
/**
* 从包装线找个位置放货
* 包装位/半托缓存
*
* @param nextRegionStr
* @param requestParam
@@ -322,7 +219,6 @@ public class FJMKTask extends AbstractTask {
LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
lam.in(SchBasePoint::getRegion_code, nextRegionStr)
.eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
// 当前执行的任务为空或者NULL，有数据表示锁住
.and(la -> la.isNull(SchBasePoint::getIng_task_code)
.or()
.eq(SchBasePoint::getIng_task_code, ""))

103
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java
View File

@@ -23,6 +23,7 @@ import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.common.MDOutMoveTask;
import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
@@ -30,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
@@ -59,6 +61,8 @@ public class FJQKTask extends AbstractTask {
private WmsToAcsService wmsToAcsService;
@Autowired
private FJMapper fjMapper;
@Resource(name = "MDOutMoveTask")
private MDOutMoveTask mdOutMoveTask;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -137,38 +141,74 @@ public class FJQKTask extends AbstractTask {
throw new BadRequestException("覆膜机不可用!");
}
// 将覆膜机设备放到任务中
String responseParam = task.getResponse_param();
JSONObject param = new JSONObject();
if (ObjectUtil.isNotEmpty(responseParam)) {
param = JSON.parseObject(responseParam);
if ("1".equals(extGroupData.getString("isEmpty"))) {
// 把这个设备位放到任务中
extGroupData.put("fmj_device", point.getPoint_code());
// 设置起点并修改创建成功状态
task.setPoint_code1(point.getParent_point_code());
// 父点位锁住
SchBasePoint basePoint = pointService.getById(point.getParent_point_code());
basePoint.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(basePoint);
pointService.updateById(basePoint);
} else {
// 半托任务
if ("1".equals(extGroupData.getString("flag"))) {
// 查找移库点
LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
lam.eq(SchBasePoint::getRegion_code, point.getRegion_code())
// 当前执行的任务为空或者NULL，有数据表示锁住
.and(la -> la.isNull(SchBasePoint::getIng_task_code)
.or()
.eq(SchBasePoint::getIng_task_code, ""))
.eq(SchBasePoint::getIs_used, true)
.eq(SchBasePoint::getPoint_type, "2")
.eq(SchBasePoint::getPoint_status, "1")
.orderByAsc(SchBasePoint::getPoint_type)
.orderByAsc(SchBasePoint::getPoint_code);
SchBasePoint movePoint = pointService.getOne(lam);
if (ObjectUtil.isEmpty(movePoint)) {
throw new BadRequestException("找不到可用的中转点位！");
}
// 需要移库
JSONObject param = new JSONObject();
// 移动的货位
param.put("device_code", point.getFlagPoint().getPoint_code());
// 中转位
param.put("target", movePoint.getPoint_code());
// 所需要的半托位置
param.put("point_code1", point.getPoint_code());
// 分拣码垛位
param.put("point_code2", task.getPoint_code2());
param.put("vehicle_code", task.getVehicle_code());
param.put("vehicle_type", task.getVehicle_type());
mdOutMoveTask.apply(param);
return;
} else {
// 不需要移库
// 设置起点并修改创建成功状态
task.setPoint_code1(point.getPoint_code());
}
}
// 把这个设备位放到任务中
param.put("fmj_device", point.getPoint_code());
// 设置起点并修改创建成功状态
task.setPoint_code1(point.getParent_point_code());
task.setTask_status(TaskStatus.CREATED.getCode());
task.setResponse_param(param.toJSONString());
// mark: 未确认是否放在1还是2，目前规定四点任务空盘的载具编码是2
task.setResponse_param(extGroupData.toJSONString());
task.setRemark("");
task.setGroup_id(point.getGroup_id());
taskService.save(task);
// 父点位锁住
SchBasePoint basePoint = pointService.getById(point.getParent_point_code());
basePoint.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(basePoint);
pointService.updateById(basePoint);
}
/**
* 先找半托的库存信息
* 找到的是覆膜机设备位置,父位才是对接位
*
* @param startRegionStr
* @param extGroupData
* @return
*/
private SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject extGroupData) {
public SchBasePoint findStartPoint(List<String> startRegionStr, JSONObject extGroupData) {
// 当前设备的工单: 工单的载具是木托盘
extGroupData.put("flag", "0");
extGroupData.put("isEmpty", "1");
String workorderCode = extGroupData.getString("workorder_code");
PdmBdWorkorder one = ObjectUtil.isNotEmpty(workorderCode)
? workorderService.getOne(new LambdaQueryWrapper<PdmBdWorkorder>()
@@ -178,8 +218,35 @@ public class FJQKTask extends AbstractTask {
throw new BadRequestException("工单不能为空!");
}
String vehicleType = one.getVehicle_type();
// 查找半托缓存
SchBasePoint endPointObj = fjMapper.findPointForBt(one.getMaterial_id());
if (endPointObj != null) {
extGroupData.put("isEmpty", "0");
// 判断是否需要移库
if (endPointObj.getRow_num() == 2) {
LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
lam.eq(SchBasePoint::getRegion_code, endPointObj.getRegion_code())
// 当前执行的任务为空或者NULL，有数据表示锁住
.and(la -> la.isNull(SchBasePoint::getIng_task_code)
.or()
.eq(SchBasePoint::getIng_task_code, ""))
.eq(SchBasePoint::getIs_used, true)
.eq(SchBasePoint::getPoint_status, "2")
.eq(SchBasePoint::getCol_num, endPointObj.getCol_num())
.ne(SchBasePoint::getRow_num, endPointObj.getRow_num())
.orderByAsc(SchBasePoint::getPoint_type)
.orderByAsc(SchBasePoint::getPoint_code);
SchBasePoint movePoint = pointService.getOne(lam);
if (ObjectUtil.isNotEmpty(movePoint)) {
// 创建移库
extGroupData.put("flag", "1");
endPointObj.setFlagPoint(movePoint);
}
}
return endPointObj;
}
// 向ACS请求所需木托盘在那个栈拆盘机？已经实时更新,故只需要自己查询即可
SchBasePoint endPointObj = fjMapper.findPointForFJQK(startRegionStr, new JSONObject()
endPointObj = fjMapper.findPointForFJQK(startRegionStr, new JSONObject()
.fluentPut("vehicleType", vehicleType).fluentPut("pointType", GeneralDefinition.DEVICE_POINT));
// 这个点的父点位为起点
return ObjectUtil.isNotEmpty(endPointObj) ? endPointObj : null;

50
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
View File

@@ -26,6 +26,7 @@ import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.common.MoveTask;
import org.nl.wms.sch.task_manage.task.tasks.fj.mapper.FJMapper;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
@@ -61,6 +62,8 @@ public class FJQLTask extends AbstractTask {
private ISysNoticeService noticeService;
@Autowired
private FJMapper fjMapper;
@Autowired
private MoveTask moveTask;
@Autowired
private IPdmBdProductionProcessTrackingService processTrackingService;
@@ -132,6 +135,7 @@ public class FJQLTask extends AbstractTask {
throw new BadRequestException("钢托盘砖块数已达到所需数量!");
}
extGroupData.put("vehicle_type", task.getVehicle_type());
extGroupData.put("flag", "0");
SchBasePoint point = findStartPoint(startRegionStr, extGroupData);
if (ObjectUtil.isEmpty(point)) {
// 消息通知
@@ -145,6 +149,16 @@ public class FJQLTask extends AbstractTask {
task.setVehicle_code(point.getVehicle_code());
task.setGroup_id(point.getGroup_id());
task.setRemark("");
if ("1".equals(point.getTask_warn())) {
// 提前分配的货位需要锁住
SchBasePoint flagPoint = point.getFlagPoint();
flagPoint.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(flagPoint);
pointService.updateById(flagPoint);
task.setPoint_code3(task.getPoint_code2());
task.setPoint_code2(flagPoint.getPoint_code());
task.setRequest_param(JSONObject.toJSONString(extGroupData));
}
taskService.save(task);
point.setIng_task_code(task.getTask_code());
@@ -153,8 +167,8 @@ public class FJQLTask extends AbstractTask {
}
/**
* 找起点：到钢托盘缓存找一个物料与分拣工单的物料相同的物料
* 还需要判断是否烧制，选择已经烧制的物料
* 找起点：到钢托盘缓存/双层输送线找一个物料与分拣工单的物料相同的物料
* 还需要判断是否烧制，选择已经烧制的物料（不考虑冷却时间）
*
* @param startRegionStr
* @param requestParam
@@ -170,7 +184,23 @@ public class FJQLTask extends AbstractTask {
Assert.notNull(workOrder, "工单不能为空!");
// 从所选区域中，选择满料位、无锁、可用的点位
List<SchBasePoint> points = fjMapper.findPointForFJQL(startRegionStr, workOrder.getMaterial_id());
return ObjectUtil.isNotEmpty(points) ? points.get(0) : null;
if (points.size() == 0) {
return null;
}
// 判断点位是否需要先AGV中转
SchBasePoint basePoint = points.get(0);
if ("GTPHC".equals(basePoint.getRegion_code())
|| ("HCSSX".equals(basePoint.getRegion_code()) && "2".equals(basePoint.getPoint_type()))) {
// 获取中转位（默认中转位不为空且均可用）
SchBasePoint hcssx = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getRegion_code, "HCSSX")
.eq(SchBasePoint::getPoint_type, "3"), false);
requestParam.put("flag", "1");
requestParam.put("target", hcssx.getPoint_code());
basePoint.setTask_warn("1");
basePoint.setFlagPoint(basePoint);
}
return basePoint;
}
@Override
@@ -257,6 +287,20 @@ public class FJQLTask extends AbstractTask {
vehicleMaterialGroupObj.getMaterial_qty())));
TaskUtils.setWorkOrderUpdateByType(workorderCode, taskFinishedType);
workorderService.updateById(workorderCode);
// 创建中转任务
// 判断是否转运
String flag = extGroupData.getString("flag");
if (ObjectUtil.isNotEmpty(flag) && "1".equals(flag)) {
// 创建AGV任务
JSONObject param = new JSONObject();
param.put("device_code", taskObj.getPoint_code2());
param.put("target", taskObj.getPoint_code3());
param.put("vehicle_code", taskObj.getVehicle_code());
param.put("vehicle_type", taskObj.getVehicle_type());
param.put("config_code", "MoveTask");
param.put("group_id", vehicleMaterialGroupObj.getGroup_id());
moveTask.apply(param);
}
}
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
View File

@@ -40,6 +40,7 @@ import java.util.stream.Collectors;
* @Description: rgv - 分拣强制入库任务 - 2点
* @Date: 2023/6/21
*/
@Deprecated
@Component(value = "FJQZRKTask")
@TaskType("FJQZRKTask")
public class FJQZRKTask extends AbstractTask {

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
View File

@@ -42,6 +42,7 @@ import java.util.stream.Collectors;
* @Description: rgv - 分拣强制入库任务 - 2点 改：不需要强制入库，改为人工分拣入库的方法
* @Date: 2023/6/21
*/
@Deprecated
@Component(value = "RGFJRKTask")
@TaskType("RGFJRKTask")
public class FJRKTask extends AbstractTask {

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
View File

@@ -39,6 +39,7 @@ import java.util.stream.Collectors;
* @Description: 分拣送空托 -> 叠托位
* @Date: 2023/6/20
*/
@Deprecated
@Slf4j
@Component(value = "FJSKTask")
@TaskType("FJSKTask")

50
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
View File

@@ -23,6 +23,7 @@ import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.sch.task_manage.task.tasks.common.MoveTask;
import org.nl.wms.util.PointUtils;
import org.nl.wms.util.TaskUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +56,8 @@ public class FJSLTask extends AbstractTask {
@Autowired
private ISysNoticeService noticeService;
@Autowired
private MoveTask moveTask;
@Override
public void create() throws BadRequestException {
@@ -83,6 +86,17 @@ public class FJSLTask extends AbstractTask {
task.setPoint_code2(point.getPoint_code());
task.setTask_status(TaskStatus.CREATED.getCode());
task.setRemark("");
if ("1".equals(point.getTask_warn())) {
// 提前分配的货位需要锁住
SchBasePoint flagPoint = point.getFlagPoint();
flagPoint.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(flagPoint);
pointService.updateById(flagPoint);
jsonObject.put("flag", "1");
jsonObject.put("target", flagPoint.getPoint_code());
task.setPoint_code3(flagPoint.getPoint_code());
task.setRequest_param(JSONObject.toJSONString(jsonObject));
}
TaskUtils.setUpdateByAcs(task);
taskService.updateById(task);
@@ -117,6 +131,17 @@ public class FJSLTask extends AbstractTask {
task.setPoint_code2(point.getPoint_code());
task.setTask_status(TaskStatus.CREATED.getCode());
task.setRemark("");
if ("1".equals(point.getTask_warn())) {
// 提前分配的货位需要锁住
SchBasePoint flagPoint = point.getFlagPoint();
flagPoint.setIng_task_code(task.getTask_code());
PointUtils.setUpdateByAcs(flagPoint);
pointService.updateById(flagPoint);
jsonObject.put("flag", "1");
jsonObject.put("target", flagPoint.getPoint_code());
task.setPoint_code3(flagPoint.getPoint_code());
task.setRequest_param(JSONObject.toJSONString(jsonObject));
}
task.setVehicle_type(GeneralDefinition.STEEL_TRAY);
TaskUtils.setUpdateByAcs(task);
taskService.save(task);
@@ -135,11 +160,21 @@ public class FJSLTask extends AbstractTask {
.or()
.eq(SchBasePoint::getIng_task_code, ""))
.eq(SchBasePoint::getIs_used, true)
.ne(SchBasePoint::getLayer_num, "3")
.eq(SchBasePoint::getPoint_type, "2")
.orderByAsc(SchBasePoint::getIn_order_seq)
.orderByAsc(SchBasePoint::getPoint_code);
List<SchBasePoint> schBasePoints = pointService.list(lam);
return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
if (schBasePoints.size() == 0) {
return null;
}
SchBasePoint basePoint = schBasePoints.get(0);
// 获取中转位（默认中转位不为空且均可用）
SchBasePoint hcssx = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getRegion_code, "HCSSX")
.eq(SchBasePoint::getPoint_type, "3"), false);
hcssx.setTask_warn("1");
hcssx.setFlagPoint(basePoint);
return hcssx;
}
@Override
@@ -229,13 +264,22 @@ public class FJSLTask extends AbstractTask {
endPointObj.setPoint_status(PointStatusEnum.FULL_POINT.getCode());
PointUtils.setUpdateByType(endPointObj, taskFinishedType);
pointService.updateById(endPointObj);
// 组盘表数据改成已绑定
SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id());
TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code());
vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name());
vehiclematerialgroup.setMove_way(vehiclematerialgroup.getMove_way() + " -> " + endPointObj.getPoint_code());
vehiclematerialgroupService.updateById(vehiclematerialgroup);
// 创建转移任务
// 创建AGV任务
JSONObject param = new JSONObject();
param.put("device_code", taskObj.getPoint_code2());
param.put("target", taskObj.getPoint_code3());
param.put("vehicle_code", taskObj.getVehicle_code());
param.put("vehicle_type", taskObj.getVehicle_type());
param.put("config_code", "MoveTask");
param.put("group_id", vehiclematerialgroup.getGroup_id());
moveTask.apply(param);
}
// 起点清空
PointUtils.setUpdateByType(startPointObj, taskFinishedType);

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/RGBZTask.java
View File

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Component;
* @Author: lyd
* @Date: 2024/10/29
*/
@Deprecated
@Component(value = "RGBZTask")
@TaskType("RGBZTask")
public class RGBZTask extends AbstractTask {

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java
View File

@@ -39,4 +39,6 @@ public interface FJMapper {
* @return
*/
String getNeedFullNumber(String materialId);
SchBasePoint findPointForBt(String materialId);
}

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

@@ -14,7 +14,7 @@
AND p.is_used = 1
AND p.point_status = '3'
AND vg.material_id = #{materialId}
AND TIMESTAMPDIFF(HOUR, vg.instorage_time, NOW()) >= ma.cooling_time
-- AND TIMESTAMPDIFF(HOUR, vg.instorage_time, NOW()) >= ma.cooling_time
AND p.region_code IN
<foreach collection="regionCode" item="code" separator="," open="(" close=")">
#{code}
@@ -75,4 +75,24 @@
region_code = 'GTPHC'
AND material_id = #{materialId}
</select>
<select id="findPointForBt" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
SELECT
p.*
FROM
`sch_base_point` p
LEFT JOIN sch_base_vehiclematerialgroup g ON g.vehicle_code = p.vehicle_code
AND g.vehicle_type = p.vehicle_type
AND g.group_bind_material_status = '2'
WHERE
p.region_code = 'BTHC'
AND p.point_type = '1'
AND p.is_used = TRUE
AND p.point_status = '2'
AND IFNULL( p.ing_task_code, '' ) = ''
AND g.material_id = #{materialId}
ORDER BY
g.material_qty DESC,
p.out_order_seq
LIMIT 1
</select>
</mapper>

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
View File

@@ -125,7 +125,6 @@ public class HNMLTask extends AbstractTask {
task.setPoint_code2(point.getPoint_code());
task.setTask_status(TaskStatus.CREATED.getCode());
task.setRemark("");
task.setVehicle_type(point.getVehicle_type());
task.setRequest_param(jsonObject.toString());
taskService.updateById(task);
@@ -159,7 +158,6 @@ public class HNMLTask extends AbstractTask {
task.setPoint_code2(point.getPoint_code());
task.setTask_status(TaskStatus.CREATED.getCode());
task.setRemark("");
task.setVehicle_type(point.getVehicle_type());
task.setRequest_param(jsonObject.toString());
taskService.save(task);
@@ -295,6 +293,11 @@ public class HNMLTask extends AbstractTask {
PointUtils.setUpdateByType(one, taskFinishedType);
pointService.updateById(one);
}
// 删除组盘信息
vehiclematerialgroupService.remove(new LambdaQueryWrapper<SchBaseVehiclematerialgroup>()
.eq(SchBaseVehiclematerialgroup::getVehicle_code, taskObj.getVehicle_code())
.eq(SchBaseVehiclematerialgroup::getVehicle_type, taskObj.getVehicle_type())
.eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, "2"));
taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
taskObj.setTask_status(TaskStatus.CANCELED.getCode());
taskObj.setFinished_type(taskFinishedType.getCode());

100
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
View File

@@ -18,6 +18,7 @@ import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
import org.nl.wms.sch.task_manage.task.TaskType;
import org.nl.wms.sch.task_manage.task.core.TaskStatus;
import org.nl.wms.util.PointUtils;
@@ -77,6 +78,7 @@ public class HNQKTask extends AbstractTask {
}
// 设置终点并修改创建成功状态
task.setPoint_code1(point.getPoint_code());
task.setVehicle_code(point.getVehicle_code());
task.setRemark("");
task.setTask_status(TaskStatus.CREATED.getCode());
taskService.update(task);
@@ -144,7 +146,6 @@ public class HNQKTask extends AbstractTask {
}
@Override
@Transactional(rollbackFor = Exception.class)
protected void updateStatus(String task_code, TaskStatus status) {
// 校验任务
SchBaseTask taskObj = taskService.getByCode(task_code);
@@ -154,51 +155,72 @@ public class HNQKTask extends AbstractTask {
if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
throw new BadRequestException("该任务已取消!");
}
if (status.equals(TaskStatus.EXECUTING)) {
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
TaskUtils.setUpdateByAcs(taskObj);
taskService.updateById(taskObj);
} else if (status.equals(TaskStatus.FINISHED)) {
this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
} else if (status.equals(TaskStatus.CANCELED)) {
this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
}
}
@Override
public void forceFinish(String task_code) {
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
}
@Override
public void cancel(String task_code) {
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
}
public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
// 获取参数
String startPoint = taskObj.getPoint_code1();
String endPoint = taskObj.getPoint_code2();
SchBasePoint startPointObj = pointService.getById(startPoint);
SchBasePoint endPointObj = pointService.getById(endPoint);
// 根据传来的类型去对任务进行操作
if (status.equals(TaskStatus.EXECUTING)) {
taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
taskObj.setRemark("执行中");
// 起点清空
if (ObjectUtil.isNotEmpty(startPointObj)) {
PointUtils.clearPoint(startPointObj);
taskObj.setVehicle_code(startPointObj.getVehicle_code());
endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
endPointObj.setVehicle_type(taskObj.getVehicle_type());
endPointObj.setVehicle_code(taskObj.getVehicle_code());
endPointObj.setVehicle_qty(1);
endPointObj.setUpdate_time(DateUtil.now());
pointService.updateById(endPointObj);
}
if (status.equals(TaskStatus.FINISHED)) {
// 起点清空
if (ObjectUtil.isNotEmpty(startPointObj)) {
PointUtils.clearPoint(startPointObj);
taskObj.setVehicle_code(startPointObj.getVehicle_code());
endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
endPointObj.setVehicle_type(taskObj.getVehicle_type());
endPointObj.setVehicle_code(taskObj.getVehicle_code());
endPointObj.setVehicle_qty(1);
endPointObj.setUpdate_time(DateUtil.now());
pointService.updateById(endPointObj);
}
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());
taskObj.setRemark(GeneralDefinition.TASK_FINISH);
}
if (status.equals(TaskStatus.CANCELED)) {
// 起点解锁
if (ObjectUtil.isNotEmpty(startPointObj)) {
startPointObj.setIng_task_code("");
pointService.update(startPointObj);
}
taskObj.setTask_status(TaskStatus.CANCELED.getCode());
}
taskService.update(taskObj);
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());
taskObj.setRemark(GeneralDefinition.TASK_FINISH);
taskObj.setFinished_type(taskFinishedType.getCode());
TaskUtils.setUpdateByType(taskObj, taskFinishedType);
taskService.updateById(taskObj);
}
@Override
public void forceFinish(String task_code) {
this.updateStatus(task_code, TaskStatus.FINISHED);
}
@Override
public void cancel(String task_code) {
this.updateStatus(task_code, TaskStatus.CANCELED);
public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
String startPoint = taskObj.getPoint_code1();
SchBasePoint startPointObj = pointService.getById(startPoint);
// 起点解锁
if (ObjectUtil.isNotEmpty(startPointObj)) {
startPointObj.setIng_task_code("");
pointService.update(startPointObj);
}
taskObj.setTask_status(TaskStatus.CANCELED.getCode());
taskObj.setFinished_type(taskFinishedType.getCode());
TaskUtils.setUpdateByType(taskObj, taskFinishedType);
taskService.updateById(taskObj);
}
}

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml
View File

@@ -106,6 +106,7 @@
FROM sch_base_point p
WHERE p.region_code = 'YZ'
AND p.point_type = '2'
AND p.point_status = '1'
AND p.is_used = TRUE
AND p.can_vehicle_type LIKE '%${vehicleType}%'
AND 0 <![CDATA[<]]> (SELECT COUNT(*)

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
View File

@@ -7,6 +7,8 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.system.service.notice.ISysNoticeService;
import org.nl.wms.ext.mes.service.WmsToMesService;
import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import org.nl.wms.sch.task.service.ISchBaseTaskService;
@@ -15,6 +17,7 @@ import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
import org.nl.wms.sch.task_manage.AbstractTask;
import org.nl.wms.sch.task_manage.GeneralDefinition;
import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
@@ -54,6 +57,8 @@ public class GZYQLTask extends AbstractTask {
private ISysNoticeService noticeService;
@Autowired
private GZYMapper gzyMapper;
@Autowired
private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
@Override
public void create() throws BadRequestException {
@@ -113,6 +118,8 @@ public class GZYQLTask extends AbstractTask {
}
// 设置终点并修改创建成功状态
task.setPoint_code1(point.getPoint_code());
task.setVehicle_code(point.getVehicle_code());
task.setVehicle_type(point.getVehicle_type());
task.setTask_status(TaskStatus.CREATED.getCode());
task.setRemark("");
TaskUtils.setUpdateByAcs(task);
@@ -201,10 +208,8 @@ public class GZYQLTask extends AbstractTask {
SchBasePoint startPointObj = pointService.getById(startPoint);
// 起点解锁
if (ObjectUtil.isNotEmpty(startPointObj)) {
startPointObj.setIng_task_code("");
PointUtils.setUpdateByType(startPointObj, taskFinishedType);
PointUtils.clearPointAndRetainNum(startPointObj);
pointService.updateById(startPointObj);
PointUtils.clearPoint(startPointObj);
}
// 任务完成
taskObj.setTask_status(TaskStatus.FINISHED.getCode());

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/LQYMLTask.java
View File

@@ -270,8 +270,6 @@ public class LQYMLTask extends AbstractTask {
}
if (status.equals(TaskStatus.FINISHED)) {
this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
// todo 出窑上报出窑记录
// wmsToMesService.reportGdyMaterialInfoOut(taskObj.getGroup_id());
}
if (status.equals(TaskStatus.CANCELED)) {
this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/mapper/GZYMapper.xml
View File

@@ -13,11 +13,12 @@
WHERE p.is_used = TRUE AND IFNULL(p.ing_task_code,'') = ''
AND p.point_status = '3'
AND IFNULL(g.group_id,'') <![CDATA[<>]]> ''
AND g.is_firing = '0' AND o.is_urgent = TRUE
AND g.is_firing = '0'
AND p.region_code IN
<foreach collection="regionCode" item="code" separator="," open="(" close=")">
#{code}
</foreach>
ORDER BY o.is_urgent DESC, g.instorage_time
</select>
<select id="getPointByML" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
SELECT p.*

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
View File

@@ -115,7 +115,7 @@ public class YZSLTask extends AbstractTask {
}
/**
* 判断是否加急：是->入窑口，否->双层缓存线
* 入窑口，没位置则去刚托盘缓存架
*
* @param nextRegionStr /
* @param requestParam /
@@ -147,15 +147,16 @@ public class YZSLTask extends AbstractTask {
// todo: 判断该入窑口的位置是否能用
if (schBasePoints.size() == 0 && nextRegionStr.size() > 1) {
// 去另一个区域
LambdaQueryWrapper<SchBasePoint> lam2 = new QueryWrapper<SchBasePoint>().lambda();
regionCode = nextRegionStr.get(1);
lam.eq(SchBasePoint::getRegion_code, regionCode)
lam2.eq(SchBasePoint::getRegion_code, regionCode)
.eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
.eq(SchBasePoint::getPoint_type, GeneralDefinition.MATERIAL_POINT)
.and(la -> la.isNull(SchBasePoint::getIng_task_code)
.or()
.eq(SchBasePoint::getIng_task_code, ""))
.eq(SchBasePoint::getIs_used, true);
schBasePoints = pointService.list(lam);
schBasePoints = pointService.list(lam2);
}
return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
}
@@ -298,6 +299,12 @@ public class YZSLTask extends AbstractTask {
bdWorkorder.setReal_qty(NumberUtil.add(realQty, materialQty));
TaskUtils.setWorkOrderUpdateByType(bdWorkorder, taskFinishedType);
workorderService.updateById(bdWorkorder);
if ("GTPHC".equals(endPointObj.getRegion_code())) {
endPointObj.setVehicle_code(taskObj.getVehicle_code());
endPointObj.setVehicle_type(taskObj.getVehicle_type());
endPointObj.setVehicle_qty(1);
endPointObj.setPoint_status("3");
}
endPointObj.setIng_task_code("");
PointUtils.setUpdateByType(endPointObj, taskFinishedType);
pointService.updateById(endPointObj);