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

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
liyongde
2024-07-09 10:44:57 +08:00
parent b343a5c054 a7f879588c
commit 42d280edd7
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,14 +97,15 @@ public class DjqTask extends AbstractAcsTask {
} }
if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------"); log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
//1.改变起点点位状态，二次分配，取货完成就改起点库存 //1.改变起点点位状态，满轴->待检，二次分配取货完成信号发送就改起点库存
//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()));
//2.更新库存记录 //2.更新库存记录
//管制品重新质检
String ivtStatus; String ivtStatus;
if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) { if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) {
if (schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) { if (schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) {
//管制品重新质检
ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("合格品"); ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("合格品");
packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
} else { } else {
ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("有子卷"); ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("有子卷");
} }
@@ -181,6 +182,7 @@ public class DjqTask extends AbstractAcsTask {
.point_code4(form.getString("point_code4")) .point_code4(form.getString("point_code4"))
.task_id(org.nl.common.utils.IdUtil.getStringId()) .task_id(org.nl.common.utils.IdUtil.getStringId())
.task_code(org.nl.common.utils.IdUtil.getStringId()) .task_code(org.nl.common.utils.IdUtil.getStringId())
.request_param(form.getString("request_param"))
.handle_class(THIS_CLASS) .handle_class(THIS_CLASS)
.create_id(SecurityUtils.getCurrentUserId()) .create_id(SecurityUtils.getCurrentUserId())
.create_name(SecurityUtils.getCurrentUsername()) .create_name(SecurityUtils.getCurrentUsername())

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

@@ -157,6 +157,7 @@ public class GzqTask extends AbstractAcsTask {
.point_code2(pointCode2) .point_code2(pointCode2)
.point_code3(form.getString("point_code3")) .point_code3(form.getString("point_code3"))
.point_code4(form.getString("point_code4")) .point_code4(form.getString("point_code4"))
.request_param(form.getString("request_param"))
.task_id(org.nl.common.utils.IdUtil.getStringId()) .task_id(org.nl.common.utils.IdUtil.getStringId())
.task_code(org.nl.common.utils.IdUtil.getStringId()) .task_code(org.nl.common.utils.IdUtil.getStringId())
.handle_class(THIS_CLASS) .handle_class(THIS_CLASS)

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
View File

@@ -271,7 +271,7 @@ public class LashManageServiceImpl implements LashManageService {
// 查询木箱信息 // 查询木箱信息
BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne( BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne(
new QueryWrapper<BstIvtBoxinfo>().lambda() new QueryWrapper<BstIvtBoxinfo>().lambda()
.eq(BstIvtBoxinfo::getBox_no, vehicle_ext.getString("box_no")) .eq(BstIvtBoxinfo::getBox_no, vehicle_ext.getString("pcsn"))
); );
// 根据木箱料号查询木箱类型信息 // 根据木箱料号查询木箱类型信息