From 2a0cb8222a3d9ee09f113a738ccc769ba7865135 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Thu, 15 May 2025 19:06:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?46970=20=E7=A4=BC=E5=98=89=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E6=89=B9=E9=87=8F=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BB=8E=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E5=BA=93=E4=BD=8D=E7=A7=BB=E5=88=B0=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E5=BA=93=E4=BD=8D=EF=BC=8C=E4=BF=9D=E6=8C=81=E4=B8=8D?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 2c09905..f76ac77 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 @@ -396,8 +396,9 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { if (mesPartInspection != null) { workCenterCode = mesPartInspection.getWorkCenterCode(); } - doCreateReworkMove(requestModel,getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()),target,workCenterCode,mesReworkTask.getPartNo(), mesPartInspection.getId()); - + if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) { + doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId()); + } } else { //拆解 if(!CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){ From e608665df9713fedd4f5212d74a87dd836a025cb Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Fri, 16 May 2025 17:59:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?46970=20=E8=BF=94=E5=B7=A5=E6=8B=86?= =?UTF-8?q?=E8=A7=A3=E6=9F=A5=E8=AF=A2=E8=A3=85=E9=85=8D=E4=BB=B6=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=B8=8D=E8=83=BD=E6=A0=B9=E6=8D=AE=E8=A3=85?= =?UTF-8?q?=E9=85=8D=E4=BB=B6=E6=9D=A1=E7=A0=81=E8=80=8C=E8=A6=81=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEid=E5=8E=BB=E6=9F=A5=E8=AF=A2=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/api/busi/IMesAssemblyExtService.java | 3 +++ .../pcn/api/busi/IMesProductionRecordService.java | 2 ++ .../serviceimpl/base/MesReworkTaskServiceImpl.java | 6 ++--- .../serviceimpl/busi/MesAssemblyExtService.java | 8 ++++++ .../busi/MesProductionRecordService.java | 29 ++++++++++++++++++++++ 5 files changed, 45 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesAssemblyExtService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesAssemblyExtService.java index f5d4ed7..f040b3a 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesAssemblyExtService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesAssemblyExtService.java @@ -31,6 +31,9 @@ public interface IMesAssemblyExtService { @ApiOperation(value = "获取装配件绑定记录") List getProductionAssemblyList(String organizeCode, String assemblySn); + @ApiOperation(value = "获取装配件绑定记录") + public List getProductionAssemblyById(String organizeCode, Long id); + @ApiOperation(value = "获取装配件规则且唯一绑定记录") List getProductionAssemblyUniqueList(String organizeCode, String assemblySn); diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionRecordService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionRecordService.java index 43b280c..d9555da 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionRecordService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionRecordService.java @@ -40,6 +40,8 @@ public interface IMesProductionRecordService { void updateProductionRecord(String organizeCode, String userName, Long id, String errorMsg); + void updateProductionRecordList(String organizeCode, String userName, List id, String errorMsg); + @ApiOperation(value = "查询加工记录信息PDA报表") ResultBean queryMesProductionRecordReport(String organizeCode, String productSn); 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 f76ac77..f4bc6ce 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 @@ -875,7 +875,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { } } else if (assemblyModel.getFlag() == CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { //装配解绑 - saveProductionAssembly(organizeCode, userName, assemblyModel.getAssemblySn()); + saveProductionAssembly(organizeCode, userName, assemblyModel.getId()); //自制件更新条码状态 条码状态可用 if(MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.MATCH_TYPE_10.getValue() == assemblyModel.getMatchType()){ updateOldSn(organizeCode,assemblyModel.getAssemblySn(), userName, null); @@ -917,8 +917,8 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { } } - private void saveProductionAssembly(String organizeCode,String userName, String assemblySN) { - List assemblyList = mesAssemblyExtService.getProductionAssemblyList(organizeCode, assemblySN); + private void saveProductionAssembly(String organizeCode,String userName, Long id) { + List assemblyList = mesAssemblyExtService.getProductionAssemblyById(organizeCode, id); if(CollectionUtils.isEmpty(assemblyList)){ return; } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java index bbdfb4b..9f80904 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesAssemblyExtService.java @@ -253,6 +253,14 @@ public class MesAssemblyExtService implements IMesAssemblyExtService { new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), assemblySn}); } + + @Override + public List getProductionAssemblyById(String organizeCode, Long id) { + return productionAssemblyRepository.findByProperty( + new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.ID}, + new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), id}); + } + @Override public List getProductionAssemblyUniqueList(String organizeCode, String assemblySn) { return productionAssemblyUniqueRepository.findByProperty( diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java index aef56de..2de51c3 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java @@ -145,6 +145,35 @@ public class MesProductionRecordService implements IMesProductionRecordService { } } + + @Override + public void updateProductionRecordList(String organizeCode, String userName, List ids, String errorMsg) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getInPackList(ids, "id", ddlPackBean); + + List mesProductionRecordList = productionRecordRepository.findByHqlWhere(ddlPackBean); + + List failList = new ArrayList<>(); + List noFailList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(mesProductionRecordList)) { + failList = mesProductionRecordList.stream().filter(mesProductionRecord -> Objects.equals(mesProductionRecord.getReportStatus(), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue())).map(MesProductionRecord::getId).collect(Collectors.toList()); + noFailList = mesProductionRecordList.stream().filter(mesProductionRecord -> !Objects.equals(mesProductionRecord.getReportStatus(), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue())).map(MesProductionRecord::getId).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(failList)) { + DdlPackBean failPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getInPackList(failList, "id", failPackBean); + + productionRecordRepository.updateByPropertiesNoSync(new String[]{"modifyUser", "modifyDatetime", "reportStatus", "remark"}, + new Object[]{userName, DateUtil.format(new Date(), MesPcnExtConstWords.DATE_FORMAT_SSS), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue(), errorMsg}, failPackBean); + } + if (!CollectionUtils.isEmpty(noFailList)) { + DdlPackBean nofailPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getInPackList(noFailList, "id", nofailPackBean); + + productionRecordRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime","reportStatus", "remark"}, + new Object[]{userName, DateUtil.format(new Date(), MesPcnExtConstWords.DATE_FORMAT_SSS), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue(), errorMsg }, nofailPackBean); + } + } + } @Override public ResultBean queryMesProductionRecordReport(String organizeCode, String productSn) {