Merge branch 'dev-temp-wj-2412190000-44423' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java

@@ -387,7 +387,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         produceSnExtService.saveProduceSntatusByDdlPackBean(packBean, requestModel.getUserName(), MesExtEnumUtil.PRODUCE_SN_STATUS.ASSEMBLY_DISASSEMBLY.getValue());
 
         //查询装配件绑定记录表
-        List<MesProductionAssembly> productionAssemblyList = mesAssemblyExtService.getProductionAssemblyList(requestModel.getOrganizeCode(), workOrder.getWorkOrderNo());
+        List<MesProductionAssembly> productionAssemblyList = mesAssemblyExtService.getProductionAssemblySortList(requestModel.getOrganizeCode(), workOrder.getWorkOrderNo());
         productionAssemblyList = CollectionUtils.isEmpty(productionAssemblyList) ? null :
                 productionAssemblyList.stream().filter(o -> (null != o && o.getAssemblyStatus().compareTo(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_20.getValue()) != 0)).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(productionAssemblyList)) return;