jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

更新字段

Browse Source
tags/yfai-mes-ext-v1.0
administrator 11 months ago
parent b52d8c4c33
commit d8f32bc5a9
8 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File

1
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/ExtProdOrgController.java
Unescape Escape View File

@ -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;

8
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelDetailService.java
Unescape Escape View File

@ -21,14 +21,14 @@ public class MesCustomerCarModelDetailService extends BaseMesService<MesCustomer
// 数据校验
DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", roadPackBean);
DdlPreparedPack.getStringEqualPack(item.getCustPartNo(), "customerPartNo", roadPackBean);
boolean flg = baseRDao.isExitByHql(roadPackBean);
if (flg) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("客户零件号【%s】已经存在，请检查数据", item.getCustomerPartNo())
.setErrorDetail("客户零件号【%s】已经存在，请检查数据", item.getCustPartNo())
.build();
}
@ -38,7 +38,7 @@ public class MesCustomerCarModelDetailService extends BaseMesService<MesCustomer
// 数据校验
DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", roadPackBean);
DdlPreparedPack.getStringEqualPack(item.getCustPartNo(), "customerPartNo", roadPackBean);
DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean);
boolean flg = baseRDao.isExitByHql(roadPackBean);
@ -46,7 +46,7 @@ public class MesCustomerCarModelDetailService extends BaseMesService<MesCustomer
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("客户零件号【%s】已经存在，请检查数据", item.getCustomerPartNo())
.setErrorDetail("客户零件号【%s】已经存在，请检查数据", item.getCustPartNo())
.build();
}
}

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java
Unescape Escape View File

@ -94,7 +94,7 @@ public class MesCustomerPartService extends BaseMesService<MesCustomerPart> impl
if (CollectionUtils.isEmpty(mesCustomerCarModelDetails)) {
return new ArrayList<>();
}
List<String> customerPartNoList = mesCustomerCarModelDetails.stream().map(MesCustomerCarModelDetail::getCustomerPartNo).collect(Collectors.toList());
List<String> customerPartNoList = mesCustomerCarModelDetails.stream().map(MesCustomerCarModelDetail::getCustPartNo).collect(Collectors.toList());
ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode());
DdlPreparedPack.getInPackList(customerPartNoList, "custPartNo", ddlPackBean);
return baseRDao.findByHqlWhere(ddlPackBean);

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectWarnConfigService.java
Unescape Escape View File

@ -129,7 +129,7 @@ public class MesDefectWarnConfigService extends BaseMesService<MesDefectWarnConf
MesDefectWarnConfig config = new MesDefectWarnConfig();
config.setPartNo(part.getPartNo());
config.setPartName(part.getPartName());
// config.setPartName(part.getPartName());
config.setDefectTypeCode(defect.getDefectTypeCode());
config.setDefectTypeName(defect.getDefectTypeName());
config.setDefectLocation(model.getDefectLocation());

18
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
Unescape Escape View File

@ -83,7 +83,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> 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<MesWorkOrder> 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<MesWorkOrder> 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<MesWorkOrder> 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<MesWorkOrder> 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<MesWorkOrder> 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<MesWorkOrder> 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<MesWorkOrder> 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());

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java
Unescape Escape View File

@ -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) {

4
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesCustomerCarModelExcelService.java
Unescape Escape View File

@ -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);

14
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/MesPartPtrExcelService.java
Unescape Escape View File

@ -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);

Write Preview
Loading…
Cancel
Save