From a363a5b610972cb5da10a7bcc08cd11c746f73fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 26 Sep 2025 09:56:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-755=20=E7=94=9F=E6=88=90=E9=80=81?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=97=B6=E9=80=89=E4=BA=86=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=89=98=E7=9B=98=E4=BB=8D=E7=84=B6=E6=8F=90=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E9=BD=90=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StructuralPackageOrderController.java | 11 ++++------- .../vo/DeliverStructuralPackageOrderExtendVO.java | 5 +++++ .../WmsStructuralPackageOrderTrayMapper.java | 2 +- .../IWmsStructuralPackageOrderTrayService.java | 2 +- .../WmsStructuralPackageOrderTrayServiceImpl.java | 4 ++-- .../WmsStructuralPackageOrderTrayMapper.xml | 15 +++++++-------- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 3c45ece8..f6677e3d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -612,14 +612,11 @@ public class StructuralPackageOrderController extends BaseController { @PostMapping("createDeliverOrder") public ApiResult createDeliverOrder(@Valid @RequestBody @NotEmpty List ids) { List trays = deliverStructuralPackageOrderTrayService.getListByIds(ids); - VUtil.trueThrowBusinessError(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getPackageNo).collect(Collectors.toSet()).size() > 1) - .throwMessage("钢构包必须一致"); - VUtil.trueThrowBusinessError(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getExternalOrderNo).collect(Collectors.toSet()).size() > 1) - .throwMessage("采购单号必须一致"); - Long packageId = trays.get(0).getPackageId(); - String externalOrderNo = trays.get(0).getExternalOrderNo(); + VUtil.trueThrowBusinessError(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getOrderId).collect(Collectors.toSet()).size() > 1) + .throwMessage("订单号必须一致"); + Long orderId = trays.get(0).getOrderId(); Long supplierId = trays.get(0).getSupplierId(); - List tids = deliverStructuralPackageOrderTrayService.getIdsByMaterialAndExternalOrderNo(packageId, externalOrderNo); + List tids = deliverStructuralPackageOrderTrayService.getIdsByOrderId(orderId); VUtil.trueThrowBusinessError(tids.size() != ids.size()).throwMessage("数据未齐套"); String deliverOrderNo = serialNumberControllerService.generateSerialNumber(7); WmsStructuralPackageDeliverOrder deliverOrder = new WmsStructuralPackageDeliverOrder() diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderExtendVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderExtendVO.java index 57fe8629..6729c180 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderExtendVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderExtendVO.java @@ -17,6 +17,11 @@ public class DeliverStructuralPackageOrderExtendVO extends DeliverStructuralPack @ExcelColumn(value = "序号",colIndex = 0) private Integer index; + /** + * 订单id + */ + private Long orderId; + /** * 托盘id */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java index 388ad182..f280c3ab 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java @@ -33,5 +33,5 @@ public interface WmsStructuralPackageOrderTrayMapper extends BaseMapper getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo); + List getIdsByOrderId(Long orderId); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayService.java index 2fc0c4a9..a1e85ea0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayService.java @@ -42,7 +42,7 @@ public interface IWmsStructuralPackageOrderTrayService extends IService getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo); + List getIdsByOrderId(Long orderId); void setStateByIds(@Valid @NotEmpty List ids, OrderState state); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayServiceImpl.java index 1da98925..c5b2058e 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayServiceImpl.java @@ -74,8 +74,8 @@ public class WmsStructuralPackageOrderTrayServiceImpl extends ServiceImpl getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo) { - return baseMapper.getIdsByMaterialAndExternalOrderNo(packageId, externalOrderNo); + public List getIdsByOrderId(Long orderId) { + return baseMapper.getIdsByOrderId(orderId); } @Override diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml index 68d1a5fb..0e367f5b 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml @@ -42,9 +42,9 @@ - + select id + from wms_structural_package_order_tray + where order_id=#{orderId}