From 033f9936688bd8ef9c2a22decb7efc6db937be16 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 8 Jun 2026 17:52:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1649=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/manage/pack/PackController.java | 2 +- .../pack/vo/PackScanComponentCorrelationReqVO.java | 2 +- .../dal/mysql/orderItem/OrderItemMapper.java | 4 ++-- .../executor/service/manage/pack/PackService.java | 2 +- .../service/manage/pack/PackServiceImpl.java | 13 +++++++------ .../service/orderitem/OrderItemService.java | 2 +- .../service/orderitem/OrderItemServiceImpl.java | 4 ++-- .../module/executor/service/plate/PlateService.java | 2 +- .../executor/service/plate/PlateServiceImpl.java | 2 +- .../resources/mapper/orderItem/OrderItemMapper.xml | 4 ++-- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java index b740a1d49..3fcd61f51 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java @@ -126,7 +126,7 @@ public class PackController { @PostMapping("/scan/correlation") @Operation(summary = "查询扫描类型相关的板件+配件id") @PreAuthorize("@ss.hasPermission('manage:pack:query')") - public CommonResult> getComponentCorrelation(@Valid @RequestBody PackScanComponentCorrelationReqVO reqVO) { + public CommonResult> getComponentCorrelation(@Valid @RequestBody PackScanComponentCorrelationReqVO reqVO) { return success(packService.getComponentCorrelation(reqVO)); } } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackScanComponentCorrelationReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackScanComponentCorrelationReqVO.java index 92731cbf2..b657ac8ca 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackScanComponentCorrelationReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackScanComponentCorrelationReqVO.java @@ -27,7 +27,7 @@ public class PackScanComponentCorrelationReqVO { @Schema(description = "扫描本体编号") @NotNull(message = "扫描本体编号不能为空") - private Long id; + private String id; @InEnum(OrderItemTypeEnum.class) @Schema(description = "扫描本体类型") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java index 16752970b..20f4178e8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java @@ -282,7 +282,7 @@ public interface OrderItemMapper extends BaseMapperX { * @param groupIds * @return */ - List selectComponentCorrelationPlateIds(@Param("orderIds") List orderIds, @Param("componentIds") List componentIds, @Param("groupIds") List groupIds); + List selectComponentCorrelationPlateIds(@Param("orderIds") List orderIds, @Param("componentIds") List componentIds, @Param("groupIds") List groupIds); /** * 查询部件关联的部件ID列表 @@ -292,7 +292,7 @@ public interface OrderItemMapper extends BaseMapperX { * @param groupIds * @return */ - List selectComponentCorrelationPartsIds(@Param("orderIds") List orderIds, @Param("componentIds") List componentIds, @Param("groupIds") List groupIds); + List selectComponentCorrelationPartsIds(@Param("orderIds") List orderIds, @Param("componentIds") List componentIds, @Param("groupIds") List groupIds); /** diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackService.java index 46865cbfd..2e7c87213 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackService.java @@ -65,7 +65,7 @@ public interface PackService { * @param reqVO * @return */ - List getComponentCorrelation(PackScanComponentCorrelationReqVO reqVO); + List getComponentCorrelation(PackScanComponentCorrelationReqVO reqVO); /** * 获取订单列表下未打包的明细 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java index ce0f8c14b..e563127a1 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java @@ -1015,14 +1015,14 @@ public class PackServiceImpl implements PackService { } @Override - public List getComponentCorrelation(PackScanComponentCorrelationReqVO reqVO) { + public List getComponentCorrelation(PackScanComponentCorrelationReqVO reqVO) { // 进来是板用的是板编号，配件用的是配件id - Long id = reqVO.getId(); + String id = reqVO.getId(); Integer itemType = reqVO.getItemType(); Integer type = reqVO.getType(); List orderIds = reqVO.getOrderIds(); // 没有归属部件返回自己本身 - List self = List.of(id); + List self = List.of(id); List itemDOS; if (com.cf.imes.module.executor.enums.OrderItemTypeEnum.PLATE_ITEM.getStatus().equals(itemType)) { @@ -1032,11 +1032,12 @@ public class PackServiceImpl implements PackService { // 查询关联部件id itemDOS = orderItemService.getPlateItemCompId(plate.getId()); } else { + Long partsId = Long.valueOf(id); // 配件 - OrderPartsDO part = orderPartsService.getPart(id); + OrderPartsDO part = orderPartsService.getPart(partsId); AssertUtils.notEmpty(part, ORDER_PARTS_NOT_EXISTS); // 查询关联部件id - itemDOS = orderItemService.getPartItemCompId(id); + itemDOS = orderItemService.getPartItemCompId(partsId); } if (ObjectUtil.isEmpty(itemDOS)) { @@ -1066,7 +1067,7 @@ public class PackServiceImpl implements PackService { } // 是否勾选了加工组 - List componentIdsCorrelationItemIds = orderItemService.getComponentIdsCorrelationItemIds(orderIds, componentIdList, groupIds); + List componentIdsCorrelationItemIds = orderItemService.getComponentIdsCorrelationItemIds(orderIds, componentIdList, groupIds); if (CollUtil.isEmpty(componentIdsCorrelationItemIds)) { return self; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemService.java index d297ca6a2..9561dcfce 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemService.java @@ -34,5 +34,5 @@ public interface OrderItemService { * @param orderIds * @return */ - List getComponentIdsCorrelationItemIds(List orderIds, List componentIds, List groupIds); + List getComponentIdsCorrelationItemIds(List orderIds, List componentIds, List groupIds); } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemServiceImpl.java index 74bcf2555..c899e660e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemServiceImpl.java @@ -44,8 +44,8 @@ public class OrderItemServiceImpl implements OrderItemService { } @Override - public List getComponentIdsCorrelationItemIds(List orderIds, List componentIds, List groupIds) { - List resultList = new ArrayList<>(); + public List getComponentIdsCorrelationItemIds(List orderIds, List componentIds, List groupIds) { + List resultList = new ArrayList<>(); if (CollUtil.isEmpty(componentIds) && CollUtil.isEmpty(groupIds)) { return resultList; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java index 549167028..a93ae3bf2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java @@ -34,7 +34,7 @@ public interface PlateService { * @param orderIds * @return */ - PlateDO getPlateByNo(Long plateNo, Long... orderIds); + PlateDO getPlateByNo(String plateNo, Long... orderIds); /** * 创建订单板件 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 25f8584d6..79807f9ea 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -164,7 +164,7 @@ public class PlateServiceImpl implements PlateService { } @Override - public PlateDO getPlateByNo(Long plateNo, Long... orderIds) { + public PlateDO getPlateByNo(String plateNo, Long... orderIds) { return plateMapper.selectOne(new LambdaQueryWrapperX() .eq(PlateDO::getPlateNo, plateNo) .inIfPresent(PlateDO::getOrderId, orderIds) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml index 589401fbf..c56612eea 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml @@ -730,7 +730,7 @@ ORDER BY op.type, op.id - SELECT DISTINCT op.plate_no FROM order_item oi JOIN order_plate op @@ -765,7 +765,7 @@ - SELECT oi.parts_id FROM order_item oi WHERE oi.parts_id != 0