From 048a80d9ac990c4dfba80593b58b32ceeced5c97 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 15 Oct 2025 10:17:33 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A1.=E5=89=8D=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96=202.=E6=89=8B=E6=8C=81=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=A2=9E=E5=8A=A0=E7=82=B9=E4=BD=8D=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PdaEmpVehicleServiceImpl.java | 18 ++++++++++++++++++ .../service/impl/PdaIosInServiceImpl.java | 14 ++++++++++++++ .../views/wms/basedata/structattr/index.vue | 10 ++++++++-- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaEmpVehicleServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaEmpVehicleServiceImpl.java index f0581cf..806a2d8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaEmpVehicleServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaEmpVehicleServiceImpl.java @@ -10,6 +10,8 @@ import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.pda.ios_manage.service.PdaEmpVehicleService; import org.nl.wms.pda.util.PdaResponse; +import org.nl.wms.sch_manage.service.ISchBasePointService; +import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.sch_manage.service.util.tasks.EmpVehicleInTask; import org.nl.wms.sch_manage.service.util.tasks.EmpVehicleOutTask; import org.nl.wms.warehouse_management.enums.IOSConstant; @@ -55,6 +57,12 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService { @Autowired private EmpVehicleOutTask empVehicleOutTask; + /** + * 点位服务 + */ + @Autowired + private ISchBasePointService iSchBasePointService; + @Override @Transactional public PdaResponse empVehicleIn(JSONObject whereJson) { @@ -66,6 +74,11 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService { if (ObjectUtil.isEmpty(whereJson.getString("point_code"))) { throw new BadRequestException("起点不能为空！"); } + // 判断点位编码是否存在 + SchBasePoint point_code = iSchBasePointService.getById(whereJson.getString("point_code")); + if (ObjectUtil.isEmpty(point_code)) { + throw new BadRequestException("当前入库点位不存在【"+point_code+"】"); + } // 根据托盘类型，尺寸大小找对应入库货位 Structattr attrDao = queryInPoint(vehicleDao); @@ -98,6 +111,11 @@ public class PdaEmpVehicleServiceImpl implements PdaEmpVehicleService { if (ObjectUtil.isEmpty(whereJson.getString("storagevehicle_type"))) { throw new BadRequestException("载具类型不能为空！"); } + // 判断点位编码是否存在 + SchBasePoint point_code = iSchBasePointService.getById(whereJson.getString("point_code")); + if (ObjectUtil.isEmpty(point_code)) { + throw new BadRequestException("当前出库点位不存在【"+point_code+"】"); + } // 根据载具类型查找对应载具 Structattr attrDao = queryOutPoint(whereJson); if (ObjectUtil.isEmpty(attrDao)) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java index d41631a..c9d130f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -17,6 +17,8 @@ import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; import org.nl.wms.basedata_manage.service.dao.Sectattr; import org.nl.wms.pda.ios_manage.service.PdaIosInService; import org.nl.wms.pda.util.PdaResponse; +import org.nl.wms.sch_manage.service.ISchBasePointService; +import org.nl.wms.sch_manage.service.dao.SchBasePoint; import org.nl.wms.warehouse_management.enums.IOSConstant; import org.nl.wms.warehouse_management.enums.IOSEnum; import org.nl.wms.warehouse_management.service.IMdPbGroupplateService; @@ -92,6 +94,12 @@ public class PdaIosInServiceImpl implements PdaIosInService { @Autowired private IOStorInvDtlMapper ioStorInvDtlMapper; + /** + * 点位服务 + */ + @Autowired + private ISchBasePointService iSchBasePointService; + @Override @Transactional public PdaResponse sweepCode(JSONObject whereJson) { @@ -226,6 +234,12 @@ public class PdaIosInServiceImpl implements PdaIosInService { @Override @Transactional public PdaResponse confirmIn(JSONObject whereJson) { + // 判断点位编码是否存在 + SchBasePoint point_code = iSchBasePointService.getById(whereJson.getString("point_code")); + if (ObjectUtil.isEmpty(point_code)) { + throw new BadRequestException("当前入库点位不存在【"+point_code+"】"); + } + // 组织新增数据 Map jsonMst = organizeInsertData(whereJson); // 调用服务新增数据 diff --git a/wms/nladmin-ui/src/views/wms/basedata/structattr/index.vue b/wms/nladmin-ui/src/views/wms/basedata/structattr/index.vue index 68d85a1..06af75f 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/structattr/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/structattr/index.vue @@ -237,13 +237,19 @@ - - + + 是 否 + + + 是 + 否 + +