From a0b7e39b4dd3d75133584478a6b5fd621d918b52 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 9 Jul 2024 10:13:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E5=BA=93=E5=AD=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java | 6 ++++-- .../org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java index 1e3652510..780ba1bf9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java @@ -97,14 +97,15 @@ public class DjqTask extends AbstractAcsTask { } if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------"); - //1.改变起点点位状态，二次分配，取货完成就改起点库存 + //1.改变起点点位状态，满轴->待检，二次分配取货完成信号发送就改起点库存 //packageinfoivtService.update(new UpdateWrapper().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1())); //2.更新库存记录 - //管制品重新质检 String ivtStatus; if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) { if (schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) { + //管制品重新质检 ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("合格品"); + packageinfoivtService.update(new UpdateWrapper().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1())); } else { ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("有子卷"); } @@ -181,6 +182,7 @@ public class DjqTask extends AbstractAcsTask { .point_code4(form.getString("point_code4")) .task_id(org.nl.common.utils.IdUtil.getStringId()) .task_code(org.nl.common.utils.IdUtil.getStringId()) + .request_param(form.getString("request_param")) .handle_class(THIS_CLASS) .create_id(SecurityUtils.getCurrentUserId()) .create_name(SecurityUtils.getCurrentUsername()) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java index 874045bba..52c6a28b7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java @@ -157,6 +157,7 @@ public class GzqTask extends AbstractAcsTask { .point_code2(pointCode2) .point_code3(form.getString("point_code3")) .point_code4(form.getString("point_code4")) + .request_param(form.getString("request_param")) .task_id(org.nl.common.utils.IdUtil.getStringId()) .task_code(org.nl.common.utils.IdUtil.getStringId()) .handle_class(THIS_CLASS) From da43d917080f86f7d57d4db4dd41f8da81ea9209 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Tue, 9 Jul 2024 10:28:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=8D=86=E6=89=8E=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios/service/iostorInv/util/impl/LashManageServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java index 2d63457d7..101e06597 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java @@ -271,7 +271,7 @@ public class LashManageServiceImpl implements LashManageService { // 查询木箱信息 BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne( new QueryWrapper().lambda() - .eq(BstIvtBoxinfo::getBox_no, vehicle_ext.getString("box_no")) + .eq(BstIvtBoxinfo::getBox_no, vehicle_ext.getString("pcsn")) ); // 根据木箱料号查询木箱类型信息