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

Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge

Browse Source
This commit is contained in:
liuxy
2024-07-16 15:26:19 +08:00
parent 8081da6c11 7a4899da4b
commit 2ed32a6ab2
3 changed files with 10 additions and 9 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("合格品"));

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

@@ -21,7 +21,6 @@ import org.nl.b_lms.sch.tasks.first_floor_area.auto.TaskQueueManager;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.common.enums.PackageInfoIvtEnum; import org.nl.common.enums.PackageInfoIvtEnum;
import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.SecurityUtils;
import org.nl.common.utils.TaskUtils;
import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.exception.BadRequestException;
import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.AcsTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -105,8 +104,10 @@ public class DjqTask extends AbstractAcsTask {
//1.改变起点点位状态，满轴->待检，二次分配取货完成信号发送就改起点库存,检查起点库存是否清空 //1.改变起点点位状态，满轴->待检，二次分配取货完成信号发送就改起点库存,检查起点库存是否清空
BstIvtPackageinfoivt ivtPoint = packageinfoivtService.getOne(new LambdaUpdateWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, schBaseTask.getPoint_code1())); BstIvtPackageinfoivt ivtPoint = packageinfoivtService.getOne(new LambdaUpdateWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, schBaseTask.getPoint_code1()));
//如果起点库存未清空，则清空 //如果起点库存未清空，则清空
if (ivtPoint.getContainer_name().equals(schBaseTask.getVehicle_code())) { if (ivtPoint.getContainer_name() != null && schBaseTask.getVehicle_code() != null) {
packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1())); if (ivtPoint.getContainer_name().equals(schBaseTask.getVehicle_code())) {
packageinfoivtService.update(null,new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
}
} }
//2.更新终点库存记录 //2.更新终点库存记录
String ivtStatus; String ivtStatus;
@@ -114,8 +115,7 @@ public class DjqTask extends AbstractAcsTask {
if (schBaseTask.getRequest_param().equals("98")) { if (schBaseTask.getRequest_param().equals("98")) {
//管制区送空载具任务 //管制区送空载具任务
ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("空载具"); ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("空载具");
} } else if (schBaseTask.getRequest_param().equals("99")) {
else if (schBaseTask.getRequest_param().equals("99")) {
//管制品重新质检 //管制品重新质检
ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("合格品"); ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("合格品");
} else { } else {
@@ -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");