diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesLoadingListDetail.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesLoadingListDetail.groovy index 6b0c7b7..ec1d06f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesLoadingListDetail.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesLoadingListDetail.groovy @@ -53,7 +53,9 @@ class MesToPiscesMesLoadingListDetail { if (!StringUtils.isEmpty(rowMap.get("pid"))) { long id = Long.parseLong(String.valueOf(rowMap.get("pid"))); if (Objects.isNull(mesLoadingListMap) || !mesLoadingListMap.containsKey(id)) { - mesLoadingListMap.put(id, mesLoadingListRepository.getById(id)) + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode) + DdlPreparedPack.getNumEqualPack(id,"id",packBean) + mesLoadingListMap.put(id, mesLoadingListRepository.getByProperty(packBean)) } MesLoadingList mesLoadingList = mesLoadingListMap.get(id) if (!Objects.isNull(mesLoadingList)) { diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesShippingDetail.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesShippingDetail.groovy index 7c6a304..fa4269e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesShippingDetail.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/Mes2Pisces/MesToPiscesMesShippingDetail.groovy @@ -51,7 +51,9 @@ class MesToPiscesMesShippingDetail { if (!StringUtils.isEmpty(rowMap.get("pid"))) { long id = Long.parseLong(String.valueOf(rowMap.get("pid"))); if (Objects.isNull(mesProductionRecordMap) || !mesProductionRecordMap.containsKey(id)) { - mesProductionRecordMap.put(id, mesShippingRepository.getById(id)) + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode) + DdlPreparedPack.getNumEqualPack(id,"id",packBean) + mesProductionRecordMap.put(id, mesShippingRepository.getByProperty(packBean)) } MesShippingOrderManagement mesProductionRecord = mesProductionRecordMap.get(id) if (!Objects.isNull(mesProductionRecord)) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesDefectAlarmConfigJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesDefectAlarmConfigJob.java index a3a9b67..e8de73e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesDefectAlarmConfigJob.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesDefectAlarmConfigJob.java @@ -58,22 +58,7 @@ public class MesDefectAlarmConfigJob extends BaseMesScheduleJob { throw new IllegalArgumentException("jobc参数为空，请检查参数"); } - Map paramMap = new HashMap<>(); - - try { - paramMap = (Map) JSONObject.parse(jobParam); - } catch (Exception e) { - LOGGER.error("参数格式不是JSON"); - return; - - } - - if (CollectionUtils.isEmpty(paramMap)) { - LOGGER.error("检测数据同步定时任务,没有配置参数"); - return; - } - - List organizeCodeList = (List) paramMap.get("org"); + String[] organizeCodeList = jobParam.split(","); for (String organizeCode : organizeCodeList) { @@ -83,7 +68,6 @@ public class MesDefectAlarmConfigJob extends BaseMesScheduleJob { } catch (Exception e) { LOGGER.error("SAP接口表数据同步作业任务结束e:{}", e.toString()); - //sendErrorMessage(e.toString()); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesSendOutTimeReworkOrderEmailJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesSendOutTimeReworkOrderEmailJob.java index 44aba01..79432b2 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesSendOutTimeReworkOrderEmailJob.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesSendOutTimeReworkOrderEmailJob.java @@ -92,8 +92,7 @@ public class MesSendOutTimeReworkOrderEmailJob extends BaseMesScheduleJob { DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.REWORK_TASK_STATUS.CREATE.getValue(), "status", packBean); packBean.setWhereAppend(packBean.getWhereAppend() + " and model.createDatetime <= '" + TimeTool.pareDateToString(DateUtil.addMinutes(new Date(), -minutes)) + "'"); - List mesReworkTaskList = mesReworkTaskRepository.findByHqlWhere(packBean); - return mesReworkTaskList; + return mesReworkTaskRepository.findByHqlWhere(packBean); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLabelTemplateServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLabelTemplateServiceImpl.java index 309eddc..706961f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLabelTemplateServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLabelTemplateServiceImpl.java @@ -72,7 +72,7 @@ public class MesLabelTemplateServiceImpl extends BaseMesService params = mesLabelTemplateParamRDao.findByHqlWhere(templateParamPackBean); mesLabelTemplate.setLabelTemplateParamList(params); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java index fd0b691..ff14373 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartService.java @@ -83,7 +83,7 @@ public class MesPartService extends BaseMesService implements IMesPartS @Override public ListPager queryMesPartByPagerExt(MesPart mesPart, Pager pager) { - DdlPackBean partQueryPackBean = DdlPackBean.getDdlPackBean(); + DdlPackBean partQueryPackBean = DdlPackBean.getDdlPackBean(mesPart.getOrganizeCode()); DdlPreparedPack.getNumEqualPack(mesPart.getIsValid(), "isValid", partQueryPackBean); DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", partQueryPackBean); DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", partQueryPackBean); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductVersionService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductVersionService.java index 26e518a..d72dc67 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductVersionService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductVersionService.java @@ -33,7 +33,7 @@ public class MesProductVersionService extends BaseMesService @Override public ListPager queryMesProductVersionByPagerExt(MesProductVersion mesProductVersion, Pager pager) { - DdlPackBean productVersionQueryPackBean = DdlPackBean.getDdlPackBean(); + DdlPackBean productVersionQueryPackBean = DdlPackBean.getDdlPackBean(mesProductVersion.getOrganizeCode()); DdlPreparedPack.getNumEqualPack(mesProductVersion.getIsValid(), "isValid", productVersionQueryPackBean); DdlPreparedPack.getStringLikerPack(mesProductVersion.getProductVersion(), "productVersion", productVersionQueryPackBean); DdlPreparedPack.getStringLikerPack(mesProductVersion.getPartNo(), "partNo", productVersionQueryPackBean); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsSuspiciousService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsSuspiciousService.java index b067db4..d2018a6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsSuspiciousService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsSuspiciousService.java @@ -182,7 +182,9 @@ public class MesQmsSuspiciousService extends BaseMesService im } //计算返工数量 if (mesPartInspection.getNcStatus() == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.REWORK.getValue()) { - MesReworkTask reworkTask = mesReworkTaskRepository.getById(mesPartInspection.getReworkTaskId()); + packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(mesPartInspection.getReworkTaskId(),"id",packBean); + MesReworkTask reworkTask = mesReworkTaskRepository.getByProperty(packBean); if (!StringUtil.isEmpty(reworkTask)) { //返工是否完成 if (reworkTask.getStatus() == MesExtEnumUtil.REWORK_TASK_STATUS.FINISH.getValue()) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java index 554dcbd..c5462d3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesLabelTemplateService; import cn.estsh.i3plus.ext.mes.api.base.IMesWorkOrderCutService; import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.print.IPrintTemplateStrategyService; import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException; @@ -60,13 +61,10 @@ public class MesWorkOrderCutService extends BaseMesService impl private MesWorkOrderCutDetailRepository workOrderCutDetailRepository; @Autowired - private MesLabelTemplateRepository labelTemplateRepository; - - @Autowired - private MesLabelTemplateParamRepository labelTemplateParamRepository; + private IMesPrintedSnLogRepository printedSnLogRepository; @Autowired - private IMesPrintedSnLogRepository printedSnLogRepository; + private IMesLabelTemplateService mesLabelTemplateService; protected void setPackQueryBean(MesWorkOrderCut bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getCutWorkOrderNo(), MesExtConstWords.CUT_WORK_ORDER_NO, packBean); @@ -370,7 +368,7 @@ public class MesWorkOrderCutService extends BaseMesService impl MesCutScheme cutScheme = entry.getValue(); List workOrderCutList = workOrderCutMapByCutCode.get(cutScheme.getCutCode()); - MesLabelTemplate labelTemplate = getLabelTemplate(cutScheme.getTemplateCode(), organizeCode); + MesLabelTemplate labelTemplate = mesLabelTemplateService.getLabelTemplate(cutScheme.getTemplateCode(), organizeCode); //模板信息丢失抛出异常 if (labelTemplate == null) @@ -421,20 +419,6 @@ public class MesWorkOrderCutService extends BaseMesService impl } - private MesLabelTemplate getLabelTemplate(String templateCode, String organizeCode) { - DdlPackBean templatePackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(templateCode, MesExtConstWords.TEMPLATE_CODE, templatePackBean); - MesLabelTemplate mesLabelTemplate = labelTemplateRepository.getByProperty(templatePackBean); - if (mesLabelTemplate != null) { - //级联获取labelTemplateParam - DdlPackBean templateParamPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getNumEqualPack(mesLabelTemplate.getId(), "templateId", templateParamPackBean); - List params = labelTemplateParamRepository.findByHqlWhere(templateParamPackBean); - mesLabelTemplate.setLabelTemplateParamList(params); - } - return mesLabelTemplate; - } - @Override public void doUpdatePrintStatus(List cutWorkOrderIds, String organizeCode, String userName) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ProdExtOrgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ProdExtOrgService.java index 21e8694..9711233 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ProdExtOrgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ProdExtOrgService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.busi; import cn.estsh.i3plus.ext.mes.api.busi.IProdExtOrgService; +import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.ext.mes.apiservice.dao.IEquipmentExtDao; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.mes.api.iservice.base.IEnumService; @@ -222,7 +223,9 @@ public class ProdExtOrgService implements IProdExtOrgService { public MesArea updateMesArea(MesArea mesArea) { //对id做有效性校验 - MesArea mesAreaDb = areaRepository.getById(mesArea.getId()); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(AuthUtilExt.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(mesArea.getId(),"id",packBean); + MesArea mesAreaDb = areaRepository.getByProperty(packBean); if (mesAreaDb == null) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java index 2a2ec06..38147d2 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java @@ -58,9 +58,9 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic - Map> cutSchemeFgMapByCutCode = getCutSchemeFgMapByCutCode(cutCodeList); + Map> cutSchemeFgMapByCutCode = getCutSchemeFgMapByCutCode(cutCodeList,model.getOrganizeCode()); - List cutSchemeMaterialList = getMesCutSchemeMaterials(cutCodeList); + List cutSchemeMaterialList = getMesCutSchemeMaterials(cutCodeList, model.getOrganizeCode()); //根据裁片方案代码对裁片方案原材料分组 Map> cutSchemeMaterialMapByCutCode = cutSchemeMaterialList.stream().collect(Collectors.groupingBy(MesCutSchemeMaterial::getCutCode)); @@ -151,12 +151,11 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic return val == null ? "" : val.toString(); } - private Map> getCutSchemeFgMapByCutCode(List cutCodeList) { - List cutSchemeFgList = getMesCutSchemeFgs(cutCodeList); + private Map> getCutSchemeFgMapByCutCode(List cutCodeList,String organizeCode) { + List cutSchemeFgList = getMesCutSchemeFgs(cutCodeList,organizeCode); //根据裁片方案代码对裁片方案成品明细分组 - Map> cutSchemeFgMapByCutCode = cutSchemeFgList.stream().collect(Collectors.groupingBy(MesCutSchemeFg::getCutCode)); - return cutSchemeFgMapByCutCode; + return cutSchemeFgList.stream().collect(Collectors.groupingBy(MesCutSchemeFg::getCutCode)); } private BigDecimal[] divideAndRemainder(Double qty, Double packageQty) { @@ -178,22 +177,19 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic private List getMesCutSchemeEquipments(MesProduceSnPrintModel model, List cutCodeList) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode()); DdlPreparedPack.getInPackList(cutCodeList, MesExtConstWords.CUT_CODE, packBean); - List cutSchemeEquipmentList = cutSchemeEquipmentRepository.findByHqlWhere(packBean); - return cutSchemeEquipmentList; + return cutSchemeEquipmentRepository.findByHqlWhere(packBean); } - private List getMesCutSchemeMaterials(List cutCodeList) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + private List getMesCutSchemeMaterials(List cutCodeList,String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getInPackList(cutCodeList, MesExtConstWords.CUT_CODE, packBean); - List cutSchemeMaterialList = cutSchemeMaterialRepository.findByHqlWhere(packBean); - return cutSchemeMaterialList; + return cutSchemeMaterialRepository.findByHqlWhere(packBean); } - private List getMesCutSchemeFgs(List cutCodeList) { - DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + private List getMesCutSchemeFgs(List cutCodeList,String organizeCode) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getInPackList(cutCodeList, MesExtConstWords.CUT_CODE, packBean); - List cutSchemeFgList = cutSchemeFgRepository.findByHqlWhere(packBean); - return cutSchemeFgList; + return cutSchemeFgRepository.findByHqlWhere(packBean); } private List> packResultMapList(MesProduceSnPrintModel printModel, List> printTemplateDateList) {