From d62d6528c90a76e8093eee5734e24154394285ee Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 5 Dec 2024 14:01:53 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=89=98=E7=9B=98=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/impl/PalletInStorageTask.java | 62 +++++++++++++------ 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java index 9daf30f2..cde10200 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/PalletInStorageTask.java @@ -1,6 +1,7 @@ package org.nl.wms.dispatch_manage.task.handler.impl; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -10,6 +11,8 @@ import org.nl.common.domain.exception.BadRequestException; import org.nl.common.enums.StatusEnum; import org.nl.common.publish.BussEventMulticaster; import org.nl.common.utils.MapOf; +import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService; +import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; import org.nl.wms.dispatch_manage.task.handler.AbstractTask; import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService; import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask; @@ -49,30 +52,49 @@ public class PalletInStorageTask extends AbstractTask { private IActRuExecutionService iActRuExecutionService; @Autowired private ISchBaseTaskService iSchBaseTaskService; + @Autowired + private IBmVehicleInfoService iBmVehicleInfoService; @Override public JSONObject createTask(JSONObject data) { - for (String vehicle_code : data.keySet()) { - String point_code1 = data.getString(vehicle_code); - if (StringUtils.isEmpty(point_code1)){ - throw new BadRequestException("申请任务失败:请求参数数据异常"); - } - List item = iMdPbVehicleMaterService.getVehicleMaters(vehicle_code); - if (CollectionUtils.isEmpty(item)){ - throw new BadRequestException("申请任务失败:载具"+vehicle_code+"物料信息不存在"); - } - MdPbVehicleMaterVo vehicleMater = item.get(0); - //拣选回库流程 - BussEventMulticaster.Publish( - new FlowStartEvent("pallet_in", - (proc_inst_id,empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() - .set("proc_inst_id",proc_inst_id) - .eq("vehicle_code",vehicle_code) - .eq("is_delete",false)) - ,new JSONObject(MapOf.of("start_point", point_code1))) - .build("md_pb_vehicleMater",vehicleMater.getId(),null,null, (JSONObject) JSONObject.toJSON(vehicleMater)) - ); +// :{"start_point":"1120","vehicle_code":"T00000199","height":0} + String point_code1 = data.getString("start_point"); + String vehicle_code = data.getString("vehicle_code"); + String h = data.getString("height"); + if (StringUtils.isEmpty(point_code1)){ + throw new BadRequestException("申请任务失败:请求参数点位数据异常"); } + if (StringUtils.isEmpty(vehicle_code)){ + throw new BadRequestException("申请任务失败:请求参数托盘数据异常"); + } + if (StringUtils.isEmpty(h)){ + throw new BadRequestException("申请任务失败:请求参数高度点位数据异常"); + } + BmVehicleInfo vehicleInfo = iBmVehicleInfoService.getOne(new QueryWrapper() + .eq("vehicle_code", vehicle_code)); + if (vehicleInfo==null){ + throw new BadRequestException("申请任务失败:载具"+vehicle_code+"信息不存在"); + } + List item = iMdPbVehicleMaterService.getVehicleMaters(vehicle_code); + if (CollectionUtils.isEmpty(item)){ + throw new BadRequestException("申请任务失败:载具"+vehicle_code+"物料信息不存在"); + } + iBmVehicleInfoService.update(new UpdateWrapper() + .set("h",Integer.valueOf(h)) + .set("update_time", DateUtil.now()) + .set("update_name", "ACS托盘入库申请") + .eq("vehicle_code",vehicle_code)); + MdPbVehicleMaterVo vehicleMater = item.get(0); + //拣选回库流程 + BussEventMulticaster.Publish( + new FlowStartEvent("pallet_in", + (proc_inst_id,empPlace) -> iMdPbVehicleMaterService.update(new UpdateWrapper() + .set("proc_inst_id",proc_inst_id) + .eq("vehicle_code",vehicle_code) + .eq("is_delete",false)) + ,new JSONObject(MapOf.of("start_point", point_code1))) + .build("md_pb_vehicleMater",vehicleMater.getId(),null,null, (JSONObject) JSONObject.toJSON(vehicleMater)) + ); return null; }