Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道bug#1649修复

Browse Source
This commit is contained in:
gaoqr
2026-06-08 17:52:24 +08:00
parent e055ffa3d3
commit 033f993668
10 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/PackController.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class PackController {
@PostMapping("/scan/correlation")
@Operation(summary = "查询扫描类型相关的板件+配件id")
@PreAuthorize("@ss.hasPermission('manage:pack:query')")
public CommonResult<List<Long>> getComponentCorrelation(@Valid @RequestBody PackScanComponentCorrelationReqVO reqVO) {
public CommonResult<List<String>> getComponentCorrelation(@Valid @RequestBody PackScanComponentCorrelationReqVO reqVO) {
return success(packService.getComponentCorrelation(reqVO));
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackScanComponentCorrelationReqVO.java
+1 -1
View File
@@ -27,7 +27,7 @@ public class PackScanComponentCorrelationReqVO {
@Schema(description = "扫描本体编号")
@NotNull(message = "扫描本体编号不能为空")
private Long id;
private String id;
@InEnum(OrderItemTypeEnum.class)
@Schema(description = "扫描本体类型")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java
+2 -2
View File
@@ -282,7 +282,7 @@ public interface OrderItemMapper extends BaseMapperX<OrderItemDO> {
* @param groupIds
* @return
*/
List<Long> selectComponentCorrelationPlateIds(@Param("orderIds") List<Long> orderIds, @Param("componentIds") List<Long> componentIds, @Param("groupIds") List<Long> groupIds);
List<String> selectComponentCorrelationPlateIds(@Param("orderIds") List<Long> orderIds, @Param("componentIds") List<Long> componentIds, @Param("groupIds") List<Long> groupIds);
/**
* 查询部件关联的部件ID列表
@@ -292,7 +292,7 @@ public interface OrderItemMapper extends BaseMapperX<OrderItemDO> {
* @param groupIds
* @return
*/
List<Long> selectComponentCorrelationPartsIds(@Param("orderIds") List<Long> orderIds, @Param("componentIds") List<Long> componentIds, @Param("groupIds") List<Long> groupIds);
List<String> selectComponentCorrelationPartsIds(@Param("orderIds") List<Long> orderIds, @Param("componentIds") List<Long> componentIds, @Param("groupIds") List<Long> groupIds);
/**
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackService.java
+1 -1
View File
@@ -65,7 +65,7 @@ public interface PackService {
* @param reqVO
* @return
*/
List<Long> getComponentCorrelation(PackScanComponentCorrelationReqVO reqVO);
List<String> getComponentCorrelation(PackScanComponentCorrelationReqVO reqVO);
/**
* 获取订单列表下未打包的明细
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
+7 -6
View File
@@ -1015,14 +1015,14 @@ public class PackServiceImpl implements PackService {
}
@Override
public List<Long> getComponentCorrelation(PackScanComponentCorrelationReqVO reqVO) {
public List<String> getComponentCorrelation(PackScanComponentCorrelationReqVO reqVO) {
// 进来是板用的是板编号，配件用的是配件id
Long id = reqVO.getId();
String id = reqVO.getId();
Integer itemType = reqVO.getItemType();
Integer type = reqVO.getType();
List<Long> orderIds = reqVO.getOrderIds();
// 没有归属部件返回自己本身
List<Long> self = List.of(id);
List<String> self = List.of(id);
List<OrderItemDO> 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<Long> componentIdsCorrelationItemIds = orderItemService.getComponentIdsCorrelationItemIds(orderIds, componentIdList, groupIds);
List<String> componentIdsCorrelationItemIds = orderItemService.getComponentIdsCorrelationItemIds(orderIds, componentIdList, groupIds);
if (CollUtil.isEmpty(componentIdsCorrelationItemIds)) {
return self;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemService.java
+1 -1
View File
@@ -34,5 +34,5 @@ public interface OrderItemService {
* @param orderIds
* @return
*/
List<Long> getComponentIdsCorrelationItemIds(List<Long> orderIds, List<Long> componentIds, List<Long> groupIds);
List<String> getComponentIdsCorrelationItemIds(List<Long> orderIds, List<Long> componentIds, List<Long> groupIds);
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemServiceImpl.java
+2 -2
View File
@@ -44,8 +44,8 @@ public class OrderItemServiceImpl implements OrderItemService {
}
@Override
public List<Long> getComponentIdsCorrelationItemIds(List<Long> orderIds, List<Long> componentIds, List<Long> groupIds) {
List<Long> resultList = new ArrayList<>();
public List<String> getComponentIdsCorrelationItemIds(List<Long> orderIds, List<Long> componentIds, List<Long> groupIds) {
List<String> resultList = new ArrayList<>();
if (CollUtil.isEmpty(componentIds) && CollUtil.isEmpty(groupIds)) {
return resultList;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java
+1 -1
View File
@@ -34,7 +34,7 @@ public interface PlateService {
* @param orderIds
* @return
*/
PlateDO getPlateByNo(Long plateNo, Long... orderIds);
PlateDO getPlateByNo(String plateNo, Long... orderIds);
/**
* 创建订单板件
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
+1 -1
View File
@@ -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<PlateDO>()
.eq(PlateDO::getPlateNo, plateNo)
.inIfPresent(PlateDO::getOrderId, orderIds)
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
+2 -2
View File
@@ -730,7 +730,7 @@
ORDER BY op.type, op.id
</select>
<select id="selectComponentCorrelationPlateIds" resultType="java.lang.Long">
<select id="selectComponentCorrelationPlateIds" resultType="java.lang.String">
SELECT DISTINCT op.plate_no
FROM order_item oi
JOIN order_plate op
@@ -765,7 +765,7 @@
</if>
</select>
<select id="selectComponentCorrelationPartsIds" resultType="java.lang.Long">
<select id="selectComponentCorrelationPartsIds" resultType="java.lang.String">
SELECT oi.parts_id
FROM order_item oi
WHERE oi.parts_id != 0