From 7ff1ab70b7fb9ef1f300d1cc77ce31543aa03058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 5 Mar 2026 15:44:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(h5):=20=E8=A7=A3=E5=86=B3=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E7=A0=81=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在H5Controller中添加物料不存在的业务异常检查 - 修复WmsShipmentPackagingCodeMapper.xml中的表别名冲突问题 - 将delivery_item表别名从di改为sdi以避免与dictionary_item表别名冲突 - 确保包装码与配送单关联查询的正确性 --- .../main/resources/mapper/WmsShipmentPackagingCodeMapper.xml | 4 ++-- .../java/com/nflg/wms/shipment/controller/H5Controller.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml index af7b3d06..8de4ac15 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml @@ -65,8 +65,8 @@ SELECT pc.*,di."name" AS "type_name" FROM wms_shipment_packaging_code pc LEFT JOIN dictionary_item di ON pc."type"=di."id" - INNER JOIN wms_shipment_delivery_item di ON di.packaging_code_id=pc."id" - INNER JOIN wms_shipment_delivery d ON di.delivery_id=d."id" + INNER JOIN wms_shipment_delivery_item sdi ON sdi.packaging_code_id=pc."id" + INNER JOIN wms_shipment_delivery d ON sdi.delivery_id=d."id" where pc.status=3 and d.no=#{code} diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java index c10e51e9..e70594e6 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java @@ -161,6 +161,7 @@ public class H5Controller extends BaseController { return ApiResult.success(packagingCodeService.getForInstall(packagingCode.getId())); } else { ShipmentMaterialCodeQRVO vo = materialCodeItemQrService.getInfoByQRCode(code); + VUtil.trueThrowBusinessError(Objects.isNull(vo)).throwMessage("未找到该物料"); VUtil.trueThrowBusinessError(vo.getStatus() == 5).throwMessage("该物料已安装"); return ApiResult.success(List.of(vo)); }