From 58fa56ad12fa62c59194d0179aaf48dfb6a6f45a Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 20 Jan 2026 14:08:47 +0800 Subject: [PATCH 1/2] no message --- .../service/impl/PdaCommonServiceImpl.java | 8 +++++++- .../service/dao/mapper/MdPbGroupplateMapper.xml | 4 ++-- .../service/impl/MdPbGroupplateServiceImpl.java | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java index daa1b8b..a3b2eeb 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java @@ -182,6 +182,7 @@ public class PdaCommonServiceImpl implements PdaCommonService { } @Override + @Transactional public PdaResponse confirmPalletAssembly(AssemblyPalletParam param) { // 判断此载具状态 JSONObject jsonObject = new JSONObject(); @@ -273,8 +274,13 @@ public class PdaCommonServiceImpl implements PdaCommonService { throw new BadRequestException("当前点位不存在【" + whereJson.getString("point_code") + "】"); } - // 计算叠盘位是否还能继续叠盘 JSONObject row = whereJson.getJSONObject("row"); + // 判断起点和终点不能相同 + if (startPointDao.getPoint_code().equals(row.getString("point_code"))) { + throw new BadRequestException("起点和终点不能相同!"); + } + + // 计算叠盘位是否还能继续叠盘 if (row.getIntValue("remaining_qty") == 0) { throw new BadRequestException("当前堆叠位空托盘数量已满【" + row.getString("point_code") + "】"); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml index a5b3621..d0f5a0f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/MdPbGroupplateMapper.xml @@ -236,9 +236,9 @@ LEFT JOIN md_cs_supplierbase s ON s.supp_code = mg.supp_code WHERE mg.status = '0' - + AND - mg.bag_code = #{param.bag_code} + mg.bag_code = #{param.bag_no} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java index d15b1e7..8f6741b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java @@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -76,6 +77,12 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page) { return this.baseMapper.queryAllByPage(new Page<>(page.getPage() + 1, page.getSize()), @@ -155,6 +162,13 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl vehicleList = iStructattrService.list(new LambdaQueryWrapper<>(Structattr.class) + .eq(Structattr::getStoragevehicle_code, whereJson.get("vehicle_code"))); + if (ObjectUtil.isNotEmpty(vehicleList)) { + throw new BadRequestException("载具编码：" + whereJson.getString("vehicle_code") + "已存在库内，请对数据进行核实！"); + } + // 校验此载具下的组盘信息是否有入库或者出库的信息 List groupList = this.baseMapper.queryVehicleGroupInfo(whereJson); boolean is_all = groupList.stream() From 561d9b61a3795d6fd02454328aea75e37404f66d Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 20 Jan 2026 14:09:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?rev=EF=BC=9A=E6=B5=8B=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../general_management/service/impl/PdaCommonServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java index fbfa3d4..c8cb74a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaCommonServiceImpl.java @@ -186,6 +186,7 @@ public class PdaCommonServiceImpl implements PdaCommonService { @Transactional public PdaResponse confirmPalletAssembly(AssemblyPalletParam param) { // 判断此载具状态 + JSONObject jsonObject = new JSONObject(); jsonObject.put("vehicle_code", param.getVehicle_code()); groupplateService.checkVehicle(jsonObject);