fix(h5): 解决物料二维码查询和包装码关联查询问题
- 在H5Controller中添加物料不存在的业务异常检查 - 修复WmsShipmentPackagingCodeMapper.xml中的表别名冲突问题 - 将delivery_item表别名从di改为sdi以避免与dictionary_item表别名冲突 - 确保包装码与配送单关联查询的正确性
This commit is contained in:
parent
f13b529f72
commit
7ff1ab70b7
|
|
@ -65,8 +65,8 @@
|
||||||
SELECT pc.*,di."name" AS "type_name"
|
SELECT pc.*,di."name" AS "type_name"
|
||||||
FROM wms_shipment_packaging_code pc
|
FROM wms_shipment_packaging_code pc
|
||||||
LEFT JOIN dictionary_item di ON pc."type"=di."id"
|
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_item sdi ON sdi.packaging_code_id=pc."id"
|
||||||
INNER JOIN wms_shipment_delivery d ON di.delivery_id=d."id"
|
INNER JOIN wms_shipment_delivery d ON sdi.delivery_id=d."id"
|
||||||
where pc.status=3 and d.no=#{code}
|
where pc.status=3 and d.no=#{code}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -161,6 +161,7 @@ public class H5Controller extends BaseController {
|
||||||
return ApiResult.success(packagingCodeService.getForInstall(packagingCode.getId()));
|
return ApiResult.success(packagingCodeService.getForInstall(packagingCode.getId()));
|
||||||
} else {
|
} else {
|
||||||
ShipmentMaterialCodeQRVO vo = materialCodeItemQrService.getInfoByQRCode(code);
|
ShipmentMaterialCodeQRVO vo = materialCodeItemQrService.getInfoByQRCode(code);
|
||||||
|
VUtil.trueThrowBusinessError(Objects.isNull(vo)).throwMessage("未找到该物料");
|
||||||
VUtil.trueThrowBusinessError(vo.getStatus() == 5).throwMessage("该物料已安装");
|
VUtil.trueThrowBusinessError(vo.getStatus() == 5).throwMessage("该物料已安装");
|
||||||
return ApiResult.success(List.of(vo));
|
return ApiResult.success(List.of(vo));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue