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

add： 功能添加

Browse Source
This commit is contained in:
ls
2025-10-29 16:34:52 +08:00
parent f4475d221c
commit 5e3f30363f
10 changed files with 598 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
View File

@@ -168,7 +168,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
}
//手动维护母卷和状态信息
if (ObjectUtil.isNotEmpty(pointStatus) && ObjectUtil.isNotEmpty(entity.getRemark()) && (pointStatus.equals(PointStatusEnum.WAIT_SLITTING.getCode())||pointStatus.equals(PointStatusEnum.WAIT_BIND.getCode()))){
if (ObjectUtil.isNotEmpty(pointStatus) && ObjectUtil.isNotEmpty(entity.getRemark()) && (pointStatus.equals(PointStatusEnum.WAIT_SLITTING.getCode())||pointStatus.equals(PointStatusEnum.WAIT_BIND.getCode())||pointStatus.equals(PointStatusEnum.WAIT_INSPACTION.getCode()))){
//查看是否有工单，如果没有新建一个，如果有则更新
PdmBiRawfoilworkorder order = rawfoilworkorderService.getByContainerName(entity.getRemark());
if (ObjectUtil.isNotEmpty(order)) {

1
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/core/enums/PointStatusEnum.java
View File

@@ -19,6 +19,7 @@ public enum PointStatusEnum {
// 空载具/有货
EMPTY_VEHICLE("2", "空载具/有货"),
WAIT_SLITTING("4", "待分切"),
WAIT_INSPACTION("3", "待质检"),
WAIT_BIND("5", "待绑定");
private final String code;

5
lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java
View File

@@ -103,7 +103,8 @@ public class SlitterDownAGVTask extends AbstractTask {
List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bstIvtCutpointivtService.getAreaNotTaskPointByStatus("1",
"1", "0", "1");
if (areaEmptyNotTaskPoint.size() == 0) {
throw new BadRequestException("请求搬运失败，内包间没有可存放位置！");
throw new BadRequestException("请求搬运失败，" +
"内包间没有可存放位置！");
}
BstIvtCutpointivt endPoint = null;
JSONArray acsArray = new JSONArray();
@@ -150,7 +151,7 @@ public class SlitterDownAGVTask extends AbstractTask {
if (message.containsKey(bstIvtCutpointivt.getPoint_code())) {
//起点和终点轴类型不相等,或者终点轴类型与实际光电不相等都不满足条件
if (!bstIvtCutpointivt.getPlan().equals(message.get(bstIvtCutpointivt.getPoint_code()))){
throw new BadRequestException("请求搬运失败，缓存架气涨轴类型与实际光电检测类型不匹配！");
throw new BadRequestException("请求搬运失败，缓存架气涨轴类型与实际光电检测类型不匹配,请人工纠正缓存架！");
}
if (!stIvtCutpointivt.getPlan().equals(bstIvtCutpointivt.getPlan())) {
continue;