From cc7b1ce7d9ade05e3bbd2a555351f9bc5175dbb1 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Mon, 9 Dec 2024 13:22:55 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/PalletIostorinvService.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java index 10b7fa2a..0c101976 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/palletio/service/PalletIostorinvService.java @@ -10,6 +10,10 @@ import org.nl.common.domain.exception.BadRequestException; import org.nl.common.enums.StatusEnum; import org.nl.common.publish.BussEventMulticaster; import org.nl.common.utils.*; +import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService; +import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase; +import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService; +import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; import org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl.DecisionHandler; import org.nl.wms.flow_manage.monitor.event.FlowStartEvent; import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; @@ -36,17 +40,29 @@ public class PalletIostorinvService { private IMdPbVehicleMaterService iMdPbVehicleMaterService; @Autowired private IStIvtStructattrService iStIvtStructattrService; + @Autowired + private IMdMeMaterialbaseService iMdMeMaterialbaseService; + @Autowired + private IBmVehicleInfoService iBmVehicleInfoService; //托盘库 static String STOR_CODE = "FStockPallet"; public void inStorage(JSONObject form){ Assert.notNull(form, "参数不能为空"); String vehicle_code = form.getString("vehicle_code"); String material_id = form.getString("material_id"); + BmVehicleInfo vehicleInfo = iBmVehicleInfoService.getOne(new QueryWrapper().eq("vehicle_code", vehicle_code)); + if (vehicleInfo ==null ){ + throw new BadRequestException("入库失败：载具信息不存在已经存在"); + } int count = iMdPbVehicleMaterService.count(new QueryWrapper() .eq("vehicle_code", vehicle_code) .eq("is_delete",false)); if (count>0){ - throw new BadRequestException("入库失败：当前载具信息已经存在"); + throw new BadRequestException("入库失败：当前载具组盘已经存在"); + } + MdMeMaterialbase mdMeMaterialbase = iMdMeMaterialbaseService.getById(material_id); + if (mdMeMaterialbase == null){ + throw new BadRequestException("入库失败：物料信息不存在"); } RedissonUtils.lock(()->{ QueryWrapper query = new QueryWrapper()