From 5a6d034d07ad7cdffddd520ea1619b756bc66cc7 Mon Sep 17 00:00:00 2001 From: jason Date: Thu, 26 Jun 2025 18:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=80=BB=E6=88=90=E5=9B=9E?= =?UTF-8?q?=E9=80=80=E5=8A=A0=E5=B7=A5=E8=AE=B0=E5=BD=95=E8=BD=AF=E5=88=A0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java | 7 +++++-- .../i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java index ef12511..5289a95 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java @@ -815,8 +815,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()); + } } } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java index fb23244..4be9141 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskRequestModel.java +++ b/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 productionRecordIds; + private String productionRecordIds; }