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

fix:修复区域问题

Browse Source
This commit is contained in:
gongbaoxiong
2024-06-18 18:19:23 +08:00
parent bee8457496
commit 87dca36386
8 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
View File

@@ -184,7 +184,7 @@ public class DjqTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0") .is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area")) .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build(); .build();
SchBaseTask task = new SchBaseTask(); SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task); BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java
View File

@@ -169,7 +169,7 @@ public class GzqTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0") .is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area")) .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build(); .build();
SchBaseTask task = new SchBaseTask(); SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task); BeanUtils.copyProperties(schBaseTaskVo, task);

14
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/KzjhcwTask.java
View File

@@ -173,7 +173,7 @@ public class KzjhcwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0") .is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area")) .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build(); .build();
SchBaseTask task = new SchBaseTask(); SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task); BeanUtils.copyProperties(schBaseTaskVo, task);
@@ -217,7 +217,7 @@ public class KzjhcwTask extends AbstractAcsTask {
*/ */
public void toKzjHcw1(String pointCode) { public void toKzjHcw1(String pointCode) {
//存在空载具缓存位无空载具的点位 //存在空载具缓存位无空载具的点位
List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2",""); List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2", "");
String pointCode1 = null; String pointCode1 = null;
JSONObject toKzjHcwTask = new JSONObject(); JSONObject toKzjHcwTask = new JSONObject();
if (StringUtils.isNotBlank(pointCode)) { if (StringUtils.isNotBlank(pointCode)) {
@@ -255,21 +255,23 @@ public class KzjhcwTask extends AbstractAcsTask {
public void toKzjHcw(String pointCode) { public void toKzjHcw(String pointCode) {
//存在空载具缓存位无空载具的点位 //存在空载具缓存位无空载具的点位
List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2",""); List<BstIvtPackageinfoivt> kzjIvtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("空载具缓存位"), PackageInfoIvtEnum.IVT_STATUS.code("空"), "2", "");
String pointCode1 = null; String pointCode1 = null;
JSONObject toKzjHcwTask = new JSONObject(); JSONObject toKzjHcwTask = new JSONObject();
if (StringUtils.isNotBlank(pointCode)) { if (StringUtils.isNotBlank(pointCode)) {
pointCode1 = pointCode; pointCode1 = pointCode;
} else { } else {
//查询装箱区有空载具 //查询装箱区有空载具
List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1",""); List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1", "");
//装箱区有空载具 //装箱区有空载具
if (CollectionUtils.isNotEmpty(zxqPointList)) { if (CollectionUtils.isNotEmpty(zxqPointList)) {
pointCode1 = zxqPointList.get(0).getPoint_code(); pointCode1 = zxqPointList.get(0).getPoint_code();
} else { } else {
//待检区有空载具 //待检区有空载具
List<BstIvtPackageinfoivt> djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1",""); List<BstIvtPackageinfoivt> djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), "1", "");
pointCode1 = djqPointList.get(0).getPoint_code(); if (CollectionUtils.isNotEmpty(djqPointList)) {
pointCode1 = djqPointList.get(0).getPoint_code();
}
} }
} }
//去装箱区搬运空载具 //去装箱区搬运空载具

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/MzhcwTask.java
View File

@@ -327,7 +327,7 @@ public class MzhcwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0") .is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area")) .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build(); .build();
SchBaseTask task = new SchBaseTask(); SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task); BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SendKzjTask.java
View File

@@ -146,7 +146,7 @@ public class SendKzjTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0") .is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area")) .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build(); .build();
SchBaseTask task = new SchBaseTask(); SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task); BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/SsxDjwTask.java
View File

@@ -165,7 +165,7 @@ public class SsxDjwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0") .is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area")) .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build(); .build();
SchBaseTask task = new SchBaseTask(); SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task); BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxDjwTask.java
View File

@@ -196,7 +196,7 @@ public class ZxDjwTask extends AbstractAcsTask {
.is_send(isSend ? "1" : "0") .is_send(isSend ? "1" : "0")
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area")) .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build(); .build();
SchBaseTask task = new SchBaseTask(); SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task); BeanUtils.copyProperties(schBaseTaskVo, task);

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/ZxqTask.java
View File

@@ -270,7 +270,7 @@ public class ZxqTask extends AbstractAcsTask {
.request_param(form.getString("request_param")) .request_param(form.getString("request_param"))
.acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type")) .acs_task_type(StrUtil.isEmpty(form.getString("acs_task_type")) ? PackageInfoIvtEnum.ACS_TASK_TYPE.code("agv任务") : form.getString("acs_task_type"))
.task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status")) .task_status(StrUtil.isEmpty(form.getString("task_status")) ? TaskStatusEnum.START_AND_POINT.getCode() : form.getString("task_status"))
.product_area(StrUtil.isEmpty(form.getString("product_area")) ? "B2" : form.getString("product_area")) .product_area(StrUtil.isEmpty(form.getString("product_area")) ? "BLK" : form.getString("product_area"))
.build(); .build();
SchBaseTask task = new SchBaseTask(); SchBaseTask task = new SchBaseTask();
BeanUtils.copyProperties(schBaseTaskVo, task); BeanUtils.copyProperties(schBaseTaskVo, task);