From 396ee40aec906a3deaf101961cd70b6d6ec690af Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 8 Aug 2025 15:12:02 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E8=BD=BD=E5=85=B7=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch_manage/service/util/tasks/jb/JbUpAgvTask.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbUpAgvTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbUpAgvTask.java index f438e65..24bb270 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbUpAgvTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbUpAgvTask.java @@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService; import org.nl.wms.basedata_manage.service.IStructattrService; +import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.pm_manage.service.IPdmBdWorkorderService; import org.nl.wms.pm_manage.service.dao.PdmBdWorkorder; @@ -56,6 +58,8 @@ public class JbUpAgvTask extends AbstractTask { private IStructattrService structattrService; @Resource private ISchBaseTaskconfigService taskconfigService; + @Resource + private IMdPbStoragevehicleinfoService storagevehicleinfoService; @Override public String create(JSONObject json) { @@ -159,11 +163,14 @@ public class JbUpAgvTask extends AbstractTask { .set(PdmBdWorkorder::getRealproduceend_date, DateUtil.now()) .eq(PdmBdWorkorder::getWorkorder_id, orderId)); } + // 获取托盘数据 + MdPbStoragevehicleinfo v1 = storagevehicleinfoService.getByCode(taskObj.getVehicle_code()); // 点位设置值 pointService.update(new LambdaUpdateWrapper() .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) .set(SchBasePoint::getPoint_status, "3") .set(SchBasePoint::getIng_task_code, null) + .set(SchBasePoint::getVehicle_type, ObjectUtil.isNotEmpty(v1) ? v1.getStoragevehicle_type() : "") .set(SchBasePoint::getUpdate_id, SecurityUtils.getCurrentUserId()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) @@ -177,9 +184,13 @@ public class JbUpAgvTask extends AbstractTask { .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_time, DateUtil.now()) .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code3())); + // 获取托盘数据 + MdPbStoragevehicleinfo v2 = storagevehicleinfoService.getByCode(taskObj.getVehicle_code2()); + // 仓位设置空托盘 structattrService.update(new LambdaUpdateWrapper() .set(Structattr::getStoragevehicle_code, taskObj.getVehicle_code2()) + .set(Structattr::getStoragevehicle_type, ObjectUtil.isNotEmpty(v2) ? v2.getStoragevehicle_type() : "") .set(Structattr::getOccupancy_state, 2) .eq(Structattr::getStruct_code, taskObj.getPoint_code4())); } else {