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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
tags/yfai-pcn-ext-v1.0
微笑着面对明天 10 months ago
parent f1f3a0d74b 0cc0ad93e7
commit 8dcb485117
5 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File

5
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/GqxnyNumberRuleStrategyService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule;
import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
import cn.estsh.i3plus.mes.pcn.api.iservice.base.IConfigService;
import cn.estsh.i3plus.mes.pcn.api.iservice.busi.INumberRulePackAttributeStrategyService;
@ -18,6 +19,7 @@ import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
/**
* @Description :
@ -106,6 +108,9 @@ public class GqxnyNumberRuleStrategyService implements INumberRulePackAttributeS
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(orgaizeCode);
DdlPreparedPack.getStringEqualPack(partNo, MesPcnExtConstWords.ERP_PART_NO, ddlPackBean);
MesCustomerPart customerPart = customerPartRepository.getByProperty(ddlPackBean);
if (Objects.isNull(customerPart)) {
MesPcnException.throwMesBusiException("物料【%s】客户零件关系未维护", partNo);
}
return customerPart;
}

7
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/XiaoPengNumberRuleStrategyService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule;
import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
import cn.estsh.i3plus.mes.pcn.api.iservice.busi.INumberRulePackAttributeStrategyService;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
@ -36,7 +37,11 @@ public class XiaoPengNumberRuleStrategyService implements INumberRulePackAttribu
Map<String, Object> dataMap = genSerialNoModel.getDataMap();
MesCustomerPart customerPart = (!CollectionUtils.isEmpty(dataMap) && dataMap.containsKey(MesCustomerPart.class.getSimpleName())) ?
(MesCustomerPart)dataMap.get(MesCustomerPart.class.getSimpleName()) : getMesCustomerPart(genSerialNoModel.getOrganizeCode(), genSerialNoModel.getPartNo());
if (null != customerPart) genSerialNoModel.setCustPartNo(customerPart.getCustPartNo());
if (null != customerPart) {
genSerialNoModel.setCustPartNo(customerPart.getCustPartNo());
}else {
MesPcnException.throwMesBusiException("请检查客户零件信息,零件[%s]客户零件关系未维护", genSerialNoModel.getPartNo());
}
//年月日缩写
Date date = new Date();

14
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AionPrintStrategy.java
Unescape Escape View File

@ -73,6 +73,7 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService {
String organizeName = mesConfig.getCfgValue();
String format ="yyyy/MM/dd";
MesCustomerPart mesCustomerPart = getMesCustomerPart(mesProduceSnPrintModel);
String custPartNo = mesCustomerPart == null ? "" : mesCustomerPart.getCustPartNo();
//物料信息
MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode);
if (!isStep){
@ -90,7 +91,7 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService {
//保存条码信息
MesProduceSn produceSn = generateMesProduceSn(mesPart, sn, mesProduceSnPrintModel.getUserName(), mesProduceSnPrintModel.getQty(), format);
//封装打印信息
MesProduceSnPrintDataModel printDataModel = getModel(produceSn, serialNo, mesCustomerPart.getCustPartNo(), organizeName);
MesProduceSnPrintDataModel printDataModel = getModel(produceSn, serialNo, custPartNo, organizeName);
mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
mesProduceSnPrintModel.getMesProduceSnList().add(produceSn);
//保存打印记录
@ -113,7 +114,7 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService {
serialNo34 = stringFormat(serialNo34, 4, false, "0");
sn = snPrefix + serialNo34 + snSuffix;
//封装打印信息
MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo34, mesCustomerPart.getCustPartNo(), organizeName);
MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo34, custPartNo, organizeName);
printDataModel.setBarcode(sn);
mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
//保存打印记录
@ -211,9 +212,12 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesProduceSnPrintModel.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesProduceSnPrintModel.getPartNo(), "erpPartNo", ddlPackBean);
MesCustomerPart mesCustomerPart = mesCustomerPartRDao.getByProperty(ddlPackBean);
if (Objects.isNull(mesCustomerPart)) {
MesPcnException.throwMesBusiException("物料【%s】客户零件关系未维护", mesProduceSnPrintModel.getPartNo());
}
/**
* 2024/07/25 打印模板不校验 客户零件号，校验客户零件号移动到条码规则中 numberRule的策略中
*/
// if (Objects.isNull(mesCustomerPart)) {
// MesPcnException.throwMesBusiException("物料【%s】客户零件关系未维护", mesProduceSnPrintModel.getPartNo());
// }
return mesCustomerPart;
}
}

12
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/XiaoPengNewPrintStrategy.java
Unescape Escape View File

@ -69,7 +69,8 @@ public class XiaoPengNewPrintStrategy implements IPrintTemplateStrategyService {
//客户条码-小鹏汽车 gz-xiaopeng
//{custPartNo}{year}{month}{day}{serialNo}
//客户零件号
String custPartNo = getMesCustomerPart(mesProduceSnPrintModel).getCustPartNo();
MesCustomerPart mesCustomerPart = getMesCustomerPart(mesProduceSnPrintModel);
String custPartNo = mesCustomerPart == null ? "" : mesCustomerPart.getCustPartNo();
MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode);
MesConfig mesConfig = configService.getMesConfigByCfgCode(MesPcnExtConstWords.ORGANIZE_NAME, organizeCode);
String organizeName = mesConfig.getCfgValue();
@ -130,9 +131,12 @@ public class XiaoPengNewPrintStrategy implements IPrintTemplateStrategyService {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesProduceSnPrintModel.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesProduceSnPrintModel.getPartNo(), "erpPartNo", ddlPackBean);
MesCustomerPart mesCustomerPart = mesCustomerPartRDao.getByProperty(ddlPackBean);
if (Objects.isNull(mesCustomerPart)) {
MesPcnException.throwMesBusiException("物料【%s】客户零件关系未维护", mesProduceSnPrintModel.getPartNo());
}
/**
* 2024/07/25 打印模板不校验 客户零件号，校验客户零件号移动到条码规则中 numberRule的策略中
*/
// if (Objects.isNull(mesCustomerPart)) {
// MesPcnException.throwMesBusiException("物料【%s】客户零件关系未维护", mesProduceSnPrintModel.getPartNo());
// }
return mesCustomerPart;
}

12
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/XiaoPengPrintStrategy.java
Unescape Escape View File

@ -69,7 +69,8 @@ public class XiaoPengPrintStrategy implements IPrintTemplateStrategyService {
//客户条码-小鹏汽车 gz-xiaopeng
//{custPartNo}{year}{month}{day}{serialNo}
//客户零件号
String custPartNo = getMesCustomerPart(mesProduceSnPrintModel).getCustPartNo();
MesCustomerPart mesCustomerPart = getMesCustomerPart(mesProduceSnPrintModel);
String custPartNo = mesCustomerPart == null ? "" : mesCustomerPart.getCustPartNo();
MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode);
numberRule = null != numberRule ? numberRule : getNumberRule(organizeCode, mesPart);
MesConfig mesConfig = configService.getMesConfigByCfgCode(MesPcnExtConstWords.ORGANIZE_NAME, organizeCode);
@ -132,9 +133,12 @@ public class XiaoPengPrintStrategy implements IPrintTemplateStrategyService {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesProduceSnPrintModel.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(mesProduceSnPrintModel.getPartNo(), "erpPartNo", ddlPackBean);
MesCustomerPart mesCustomerPart = mesCustomerPartRDao.getByProperty(ddlPackBean);
if (Objects.isNull(mesCustomerPart)) {
MesPcnException.throwMesBusiException("物料【%s】客户零件关系未维护", mesProduceSnPrintModel.getPartNo());
}
/**
* 2024/07/25 打印模板不校验 客户零件号，校验客户零件号移动到条码规则中 numberRule的策略中
*/
// if (Objects.isNull(mesCustomerPart)) {
// MesPcnException.throwMesBusiException("物料【%s】客户零件关系未维护", mesProduceSnPrintModel.getPartNo());
// }
return mesCustomerPart;
}

Write Preview
Loading…
Cancel
Save