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

opt: 载具类型维护

Browse Source
This commit is contained in:
liyongde
2025-08-08 15:12:02 +08:00
parent a761564471
commit 396ee40aec
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/jb/JbUpAgvTask.java
View File

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.nl.common.exception.BadRequestException; import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.IdUtil; import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils; 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.IStructattrService;
import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.basedata_manage.service.dao.Structattr;
import org.nl.wms.pm_manage.service.IPdmBdWorkorderService; import org.nl.wms.pm_manage.service.IPdmBdWorkorderService;
import org.nl.wms.pm_manage.service.dao.PdmBdWorkorder; import org.nl.wms.pm_manage.service.dao.PdmBdWorkorder;
@@ -56,6 +58,8 @@ public class JbUpAgvTask extends AbstractTask {
private IStructattrService structattrService; private IStructattrService structattrService;
@Resource @Resource
private ISchBaseTaskconfigService taskconfigService; private ISchBaseTaskconfigService taskconfigService;
@Resource
private IMdPbStoragevehicleinfoService storagevehicleinfoService;
@Override @Override
public String create(JSONObject json) { public String create(JSONObject json) {
@@ -159,11 +163,14 @@ public class JbUpAgvTask extends AbstractTask {
.set(PdmBdWorkorder::getRealproduceend_date, DateUtil.now()) .set(PdmBdWorkorder::getRealproduceend_date, DateUtil.now())
.eq(PdmBdWorkorder::getWorkorder_id, orderId)); .eq(PdmBdWorkorder::getWorkorder_id, orderId));
} }
// 获取托盘数据
MdPbStoragevehicleinfo v1 = storagevehicleinfoService.getByCode(taskObj.getVehicle_code());
// 点位设置值 // 点位设置值
pointService.update(new LambdaUpdateWrapper<SchBasePoint>() pointService.update(new LambdaUpdateWrapper<SchBasePoint>()
.set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code())
.set(SchBasePoint::getPoint_status, "3") .set(SchBasePoint::getPoint_status, "3")
.set(SchBasePoint::getIng_task_code, null) .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_id, SecurityUtils.getCurrentUserId())
.set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName())
.set(SchBasePoint::getUpdate_time, DateUtil.now()) .set(SchBasePoint::getUpdate_time, DateUtil.now())
@@ -177,9 +184,13 @@ public class JbUpAgvTask extends AbstractTask {
.set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(SchBasePoint::getUpdate_name, SecurityUtils.getCurrentNickName())
.set(SchBasePoint::getUpdate_time, DateUtil.now()) .set(SchBasePoint::getUpdate_time, DateUtil.now())
.eq(SchBasePoint::getPoint_code, taskObj.getPoint_code3())); .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code3()));
// 获取托盘数据
MdPbStoragevehicleinfo v2 = storagevehicleinfoService.getByCode(taskObj.getVehicle_code2());
// 仓位设置空托盘 // 仓位设置空托盘
structattrService.update(new LambdaUpdateWrapper<Structattr>() structattrService.update(new LambdaUpdateWrapper<Structattr>()
.set(Structattr::getStoragevehicle_code, taskObj.getVehicle_code2()) .set(Structattr::getStoragevehicle_code, taskObj.getVehicle_code2())
.set(Structattr::getStoragevehicle_type, ObjectUtil.isNotEmpty(v2) ? v2.getStoragevehicle_type() : "")
.set(Structattr::getOccupancy_state, 2) .set(Structattr::getOccupancy_state, 2)
.eq(Structattr::getStruct_code, taskObj.getPoint_code4())); .eq(Structattr::getStruct_code, taskObj.getPoint_code4()));
} else { } else {