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

Merge branch 'refs/heads/b_lms' into master_merge

Browse Source
This commit is contained in:
zhouz
2024-06-27 11:04:21 +08:00
parent d1a269d284 590e7ec713
commit cba03a45ad
4 changed files with 14 additions and 15 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

@@ -104,7 +104,7 @@ public class DjqTask extends AbstractAcsTask {
//1.更改任务状态为完成 //1.更改任务状态为完成
schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode()); schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode());
//2.改变起点点位状态，二次分配，取货完成就改起点库存 //2.改变起点点位状态，二次分配，取货完成就改起点库存
//packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1())); packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
//3更新库存记录 //3更新库存记录
//todo 暂时改为质检合格品 //todo 暂时改为质检合格品
packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2())); packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("有子卷")).set("container_name", schBaseTask.getVehicle_code()).eq("point_code", schBaseTask.getPoint_code2()));

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

@@ -124,7 +124,7 @@ public class ZxqTask extends AbstractAcsTask {
PdmBiSlittingproductionplan containerInfo = productionPlanService.getOne(new LambdaUpdateWrapper<PdmBiSlittingproductionplan>() PdmBiSlittingproductionplan containerInfo = productionPlanService.getOne(new LambdaUpdateWrapper<PdmBiSlittingproductionplan>()
.eq(PdmBiSlittingproductionplan::getContainer_name, schBaseTask.getVehicle_code())); .eq(PdmBiSlittingproductionplan::getContainer_name, schBaseTask.getVehicle_code()));
if (containerInfo == null) { if (containerInfo == null) {
throw new BadRequestException("找不到子卷信息!"); throw new BadRequestException("该子卷信息不存在!");
} else if (StrUtil.isEmpty(containerInfo.getContainer_name())) { } else if (StrUtil.isEmpty(containerInfo.getContainer_name())) {
throw new BadRequestException("子卷号不能为空!"); throw new BadRequestException("子卷号不能为空!");
} }

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

@@ -96,16 +96,15 @@ public class AutoSendVehicleToKzj {
} }
String pointCode1 = null; String pointCode1 = null;
JSONObject toKzjHcwTask = new JSONObject(); JSONObject toKzjHcwTask = new JSONObject();
//查询装箱区有空载具 //待检区有空载具
List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", ""); List<BstIvtPackageinfoivt> djqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", "");
//装箱区有空载具 if (CollectionUtils.isNotEmpty(djqPointList)) {
if (CollectionUtils.isNotEmpty(zxqPointList)) { pointCode1 = djqPointList.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("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", ""); List<BstIvtPackageinfoivt> zxqPointList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("空载具"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), "", "");
if (CollectionUtils.isNotEmpty(djqPointList)) { if (CollectionUtils.isNotEmpty(zxqPointList)) {
pointCode1 = djqPointList.get(0).getPoint_code(); pointCode1 = zxqPointList.get(0).getPoint_code();
} }
} }
//去装箱区搬运空载具 //去装箱区搬运空载具

8
lms/nladmin-system/src/main/java/org/nl/config/WebSocketConfig.java
View File

@@ -31,9 +31,9 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
@Configuration @Configuration
public class WebSocketConfig { public class WebSocketConfig {
// @Bean @Bean
// public ServerEndpointExporter serverEndpointExporter() { public ServerEndpointExporter serverEndpointExporter() {
// return new ServerEndpointExporter(); return new ServerEndpointExporter();
// } }
} }