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-07-16 14:16:28 +08:00
parent 9938bf4237
commit 782defaee7
3 changed files with 5 additions and 4 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/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
View File

@@ -805,7 +805,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
} }
//复称 //复称
else if (StringUtils.isNotBlank(whereJson.getString("container_name")) && StringUtils.isNotBlank(whereJson.getString("pointCode"))) { else if (StringUtils.isNotBlank(whereJson.getString("container_name")) && StringUtils.isNotBlank(whereJson.getString("pointCode"))) {
dto = bstIvtPackageinfoivtMapper.selectOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("pointCode"))); dto = bstIvtPackageinfoivtMapper.selectOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("pointCode").equals("1")?"ZXQ_135":"ZXQ_136"));
if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) { if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) {
subpackagerelationService.createSubTest(whereJson); subpackagerelationService.createSubTest(whereJson);
dto.setIvt_status(PackageInfoIvtEnum.IVT_STATUS.code("合格品")); dto.setIvt_status(PackageInfoIvtEnum.IVT_STATUS.code("合格品"));

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

@@ -172,9 +172,9 @@ public class DjqTask extends AbstractAcsTask {
throw new BadRequestException("业务类型不能为空"); throw new BadRequestException("业务类型不能为空");
} }
String vehicleCode = form.getString("vehicle_code"); String vehicleCode = form.getString("vehicle_code");
// if (StrUtil.isBlank(vehicleCode)) { if (StrUtil.isBlank(vehicleCode)) {
// throw new BadRequestException("载具号不能为空"); throw new BadRequestException("载具号不能为空");
// } }
String pointCode1 = form.getString("point_code1"); String pointCode1 = form.getString("point_code1");
if (StrUtil.isBlank(pointCode1)) { if (StrUtil.isBlank(pointCode1)) {
throw new BadRequestException("起点不能为空"); throw new BadRequestException("起点不能为空");

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java
View File

@@ -81,6 +81,7 @@ public class AutoSendGzqToDjq {
pointCode4 = packageList.get(0).getPoint_code(); pointCode4 = packageList.get(0).getPoint_code();
task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区")); task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区"));
task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务")); task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
task1.put("vehicle_code", "空载具");
task1.put("point_code1", pointCode3); task1.put("point_code1", pointCode3);
task1.put("point_code2", pointCode4); task1.put("point_code2", pointCode4);
task1.put("request_param", "98"); task1.put("request_param", "98");