Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46824' into mes-dev

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

@@ -830,8 +830,11 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         doProductReportReversal(requestModel,productSn,destLocateNo);
         //装配件数据处理
         doRecursionCheck(requestModel.getAssemblyModelList(), requestModel.getOrganizeCode(), requestModel.getUserName(),destLocateNo,responsibleParty);
-        if (!CollectionUtils.isEmpty(requestModel.getProductionRecordIds())) {
-            productionRecordRepository.deleteWeaklyByIds(requestModel.getProductionRecordIds().toArray(new Long[0]), requestModel.getUserName());
+        if (!StringUtils.isEmpty(requestModel.getProductionRecordIds())) {
+            String[] recordIds = requestModel.getProductionRecordIds().split(",");
+            for (String recordId : recordIds) {
+                productionRecordRepository.deleteWeaklyById(Long.parseLong(recordId), requestModel.getUserName());
+            }
         }
     }
 

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java

@@ -68,6 +68,6 @@ public class MesReworkTaskRequestModel {
     private Integer centerType;
 
     @ApiModelProperty("总成回退选中的加工记录ID集合")
-    private List<Long> productionRecordIds;
+    private String productionRecordIds;
 
 }