From d8f32bc5a9756e48bbdec347ebcf1221421ea182 Mon Sep 17 00:00:00 2001 From: administrator Date: Wed, 5 Jun 2024 14:37:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/ExtProdOrgController.java | 1 - .../base/MesCustomerCarModelDetailService.java | 8 ++++---- .../serviceimpl/base/MesCustomerPartService.java | 2 +- .../serviceimpl/base/MesDefectWarnConfigService.java | 2 +- .../serviceimpl/base/MesWorkOrderService.java | 18 +++++++++--------- .../base/roundness/MesTimeRoundnessService.java | 2 +- .../excel/MesCustomerCarModelExcelService.java | 4 ++-- .../serviceimpl/excel/MesPartPtrExcelService.java | 14 +++++++------- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java index 06536f0..054b419 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java @@ -7,7 +7,6 @@ import cn.estsh.i3plus.ext.mes.api.busi.IEquipmentExtService; import cn.estsh.i3plus.ext.mes.api.busi.IProdExtOrgService; import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.mes.api.iservice.base.IProdOrgService; import cn.estsh.i3plus.mes.apiservice.util.MesCommConstWords; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java index e4be9be..5195092 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java @@ -21,14 +21,14 @@ public class MesCustomerCarModelDetailService extends BaseMesService impl if (CollectionUtils.isEmpty(mesCustomerCarModelDetails)) { return new ArrayList<>(); } - List customerPartNoList = mesCustomerCarModelDetails.stream().map(MesCustomerCarModelDetail::getCustomerPartNo).collect(Collectors.toList()); + List customerPartNoList = mesCustomerCarModelDetails.stream().map(MesCustomerCarModelDetail::getCustPartNo).collect(Collectors.toList()); ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode()); DdlPreparedPack.getInPackList(customerPartNoList, "custPartNo", ddlPackBean); return baseRDao.findByHqlWhere(ddlPackBean); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java index 6c3cf88..cea3e0f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java @@ -129,7 +129,7 @@ public class MesDefectWarnConfigService extends BaseMesService implements if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) { Long produceSeq = 0L; if (null != result && result.getProduceSeq() != null) { - produceSeq = Math.toIntExact(result.getProduceSeq()); + produceSeq = (long) Math.toIntExact(result.getProduceSeq()); } //生成工单号 @@ -113,7 +113,7 @@ public class MesWorkOrderService extends BaseMesService implements genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO); Long produceSeq = 0L; if (null != result && result.getProduceSeq() != null) { - produceSeq = Math.toIntExact(result.getProduceSeq()); + produceSeq = (long) Math.toIntExact(result.getProduceSeq()); } bean.setProduceSeq((long) (produceSeq + 1)); GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO_SEQ); @@ -259,10 +259,10 @@ public class MesWorkOrderService extends BaseMesService implements @Override protected void setPackQueryBean(MesWorkOrder bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getWorkOrderNo(), "workOrderNo", packBean); - DdlPreparedPack.getStringLikerPack(bean.getPartNameRdd(), "partNameRdd", packBean); + DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partNameRdd", packBean); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", packBean); DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean); + DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), "customerPartNo", packBean); DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getNumEqualPack(bean.getWorkOrderStatus(), "workOrderStatus", packBean); DdlPreparedPack.getNumEqualPack(bean.getWorkOrderType(), "workOrderType", packBean); @@ -354,7 +354,7 @@ public class MesWorkOrderService extends BaseMesService implements if (StringUtil.isEmpty(item.getPlanStartTime()) || StringUtil.isEmpty(item.getPlanEndTime())) { packPlanTime(item); } - if(StringUtil.isEmpty(item.getCustomerPartNo())){ + if(StringUtil.isEmpty(item.getCustPartNo())){ getCustomerPart(item); } //校验物料生产版本是否存在 @@ -368,7 +368,7 @@ public class MesWorkOrderService extends BaseMesService implements MesProductVersion mesProductVersion = getMesProductVersion(item, mesWorkCenter); item.setProductVersion(mesProductVersion.getProductVersion()); } - if(StringUtil.isEmpty(item.getCustomerPartNo())){ + if(StringUtil.isEmpty(item.getCustPartNo())){ getCustomerPart(item); } //拼接 @@ -378,7 +378,7 @@ public class MesWorkOrderService extends BaseMesService implements } //物料名称不存在，从物料信息中获取 MesPartSap mesPart = iMesPartSapService.getMesPartSapByPartNo(item.getPartNo(), item.getOrganizeCode()); - item.setPartNameRdd(mesPart.getPartName()); + item.setPartName(mesPart.getPartName()); item.setUnit(mesPart.getUnit()); //生产时间新增取当天 if(StringUtil.isEmpty(item.getProduceTime())){ @@ -392,7 +392,7 @@ public class MesWorkOrderService extends BaseMesService implements DdlPreparedPack.getStringEqualPack(item.getPartNo(), "erpPartNo", ddlPackBean); MesCustomerPart customerPart = mesCustomerPartRDao.getByProperty(ddlPackBean); if(!Objects.isNull(customerPart)){ - item.setCustomerPartNo(customerPart.getCustPartNo()); + item.setCustPartNo(customerPart.getCustPartNo()); item.setCustomerPartName(customerPart.getCustPartName()); } } @@ -537,7 +537,7 @@ public class MesWorkOrderService extends BaseMesService implements for (MesBom mesBom : mesBoms) { newMesProductOffLine = new MesProductOffLine(); newMesProductOffLine.setReportPartNo(mesWorkOrder.getPartNo()); - newMesProductOffLine.setReportPartNameRdd(mesWorkOrder.getPartNameRdd()); + newMesProductOffLine.setReportPartNameRdd(mesWorkOrder.getPartName()); newMesProductOffLine.setItemPartNo(mesBom.getItemPartNo()); newMesProductOffLine.setItemPartName(mesBom.getItemPartName()); newMesProductOffLine.setItemQty(mesBom.getItemQty()); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java index 4d655db..d4f292f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java @@ -106,7 +106,7 @@ public class MesTimeRoundnessService implements IRoundnessStrategy { // 11. 是否将生成日期减一天 // 12.零件相关 mesWorkOrder.setPartNo(mesPartSap.getPartNo()); - mesWorkOrder.setPartNameRdd(mesPartSap.getPartName()); + mesWorkOrder.setPartName(mesPartSap.getPartName()); // 13.生产版本 organizeCode + partNo MesProductVersion prodVersion = getProdVersion(detail.getOrganizeCode(), mesPartSap.getPartNo()); if (prodVersion == null) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesCustomerCarModelExcelService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesCustomerCarModelExcelService.java index 4fc7f9c..d65e190 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesCustomerCarModelExcelService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesCustomerCarModelExcelService.java @@ -322,10 +322,10 @@ public class MesCustomerCarModelExcelService implements IExcelImportService { MesCustomerCarModelDetail modelDetail = new MesCustomerCarModelDetail(); modelDetail.setOrganizeCode(organizeCode); - modelDetail.setCustomerPartNo(customerPartNo); + modelDetail.setCustPartNo(customerPartNo); modelDetail.setPartNo(partNo); modelDetail.setSupperPartNo(supperPartNo); - modelDetail.setQty(Integer.parseInt(qty)); +// modelDetail.setQty(Integer.parseInt(qty)); ConvertBean.serviceModelInitialize(modelDetail, AuthUtil.getSessionUser().getUserName()); modelDetailList.add(modelDetail); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesPartPtrExcelService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesPartPtrExcelService.java index c326046..ce267cc 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesPartPtrExcelService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesPartPtrExcelService.java @@ -334,19 +334,19 @@ public class MesPartPtrExcelService implements IExcelImportService { partPtr.setEndTime(endTime); partPtr.setPrtVehicleCount(Integer.parseInt(prtVehicleCount)); partPtr.setPrtVehicleActualCount(Integer.parseInt(prtVehicleActualCount)); - partPtr.setSourcePartNo(sourcePartNo); - partPtr.setTargetPartNo(targetPartNo); + partPtr.setSrcPartNo(sourcePartNo); + partPtr.setDestPartNo(targetPartNo); partPtr.setIsCustomerSendPrtInfo(Integer.parseInt(isCustomerSendPrtInfo)); partPtr.setSeqInfoPrtPart(seqInfoPrtPart); partPtr.setPtrProjectNo(ptrProjectNo); - partPtr.setTargetPartNoSnRuleCode(targetPartNoSnRuleCode); + partPtr.setReplacePartSnRule(targetPartNoSnRuleCode); partPtr.setPartTypeCode(Integer.parseInt(partTypeCode)); partPtr.setIsInterPrt(Integer.parseInt(isInterPrt)); - partPtr.setVisualSingleDisplayItem(visualSingleDisplayItem); + partPtr.setVisualItem(visualSingleDisplayItem); partPtr.setStartSeq(startSeq); - partPtr.setVisualSingleReplacePosition(visualSingleReplacePosition); - partPtr.setHardwareVersionNo(hardwareVersionNo); - partPtr.setSoftwareVersionNo(softwareVersionNo); + partPtr.setVisualReplaceIndex(visualSingleReplacePosition); + partPtr.setHardwareVersion(hardwareVersionNo); + partPtr.setSoftVersion(softwareVersionNo); partPtr.setStatus(Integer.parseInt(status)); partPtr.setMemo(memo); partPtrList.add(partPtr);