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

生产零件号是用来查找生产版本与bom 存在于零件生产组中

Browse Source
tags/yfai-mes-ext-v2.3
臧学普 6 months ago
parent d6bddfff1a
commit 68908190ed
5 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File

4
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/IMesSortRuleCfgOfflineService.java
Unescape Escape View File

@ -14,7 +14,7 @@ public interface IMesSortRuleCfgOfflineService {
void deleteSortRuleOffline(String organizeCode); void deleteSortRuleOffline(String organizeCode);
void doCreateSortRuleOffline(String custPartNo, String erpPartNo, String organizeCode, MesPartProdGroup mesPartProdGroup, MesPartProdGroupDetail detail); void doCreateSortRuleOffline(String custPartNo, String erpPartNo, String productPartNo,String organizeCode, MesPartProdGroup mesPartProdGroup, MesPartProdGroupDetail detail);
void deletePullOffline(String organizeCode); void deletePullOffline(String organizeCode);
@ -22,5 +22,5 @@ public interface IMesSortRuleCfgOfflineService {
void deletePullDetailOffline(String organizeCode); void deletePullDetailOffline(String organizeCode);
void doCreatePullOffline(String custPartNo, String erpPartNo, String organizeCode, MesPartProdGroup mesPartProdGroup, MesPartProdGroupDetail detail, MesPartPull partPull, List<MesPartPullDetail> pullDetailList); void doCreatePullOffline(String custPartNo, String erpPartNo,String productPartNo, String organizeCode, MesPartProdGroup mesPartProdGroup, MesPartProdGroupDetail detail, MesPartPull partPull, List<MesPartPullDetail> pullDetailList);
} }

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

@ -184,10 +184,15 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
if (mesPartProdGroupDetail.getProductPartNo() == null) { if (mesPartProdGroupDetail.getProductPartNo() == null) {
mesPartProdGroupDetail.setProductPartNo(mesPartProdGroupDetail.getPartNo()); mesPartProdGroupDetail.setProductPartNo(mesPartProdGroupDetail.getPartNo());
} }
MesPartSap mesPart = this.getMesPart(mesPartProdGroupDetail.getProductPartNo(), partProdGroup.getOrganizeCode()); /**
* 2024/11/14
* 生产零件号用于拆分bom
* 零件号是erp零件号
*/
MesPartSap mesPart = this.getMesPart(mesPartProdGroupDetail.getPartNo(), partProdGroup.getOrganizeCode());
if (mesPart == null) { if (mesPart == null) {
log.info("{}工厂没有,零件:{}信息", partProdGroup.getOrganizeCode(), mesPartProdGroupDetail.getProductPartNo()); log.info("{}工厂没有,零件:{}信息", partProdGroup.getOrganizeCode(), mesPartProdGroupDetail.getPartNo());
return; return;
} }

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

@ -188,18 +188,27 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
//工单号生成规则 【工厂号+yyyyMMdd+5位流水】 //工单号生成规则 【工厂号+yyyyMMdd+5位流水】
// 13.生产版本 organizeCode + partNo // 13.生产版本 organizeCode + partNo
MesProductVersion prodVersion = getProdVersion(organizeCode, partSap.getPartNo()); /**
* 生产版本是根据 生产零检号查询，不是根据erp零件号查询
*/
MesProductVersion prodVersion = getProdVersion(organizeCode, mesPartProdGroupDetail.getProductPartNo());
if (prodVersion == null) { if (prodVersion == null) {
log.info("请配置工厂:{},partNo:{}的生产版本", mesPartProdGroupDetail.organizeCode, partSap.getPartNo()); log.info("请配置工厂:{},partNo:{}的生产版本", mesPartProdGroupDetail.organizeCode, mesPartProdGroupDetail.getProductPartNo());
} else { } else {
String productVersion = prodVersion.getProductVersion(); String productVersion = prodVersion.getProductVersion();
mesWorkOrder.setProductVersion(productVersion); mesWorkOrder.setProductVersion(productVersion);
} }
// bom prodVersion.alternativePartList bom版本 // bom prodVersion.alternativePartList bom版本
MesBom bom = mesBomService.findBom(organizeCode, prodVersion == null ? null : prodVersion.getAlternativePartList(), partSap.getPartNo()); /**
* bom也需要根据生产零件号拆分
*/
MesBom bom = mesBomService.findBom(organizeCode, prodVersion == null ? null : prodVersion.getAlternativePartList(), mesPartProdGroupDetail.getProductPartNo());
if (bom != null){ if (bom != null){
mesWorkOrder.setBomCode(bom.getBomCode()); mesWorkOrder.setBomCode(bom.getBomCode());
}else {
log.info("工厂:{},生产零件号:{}没有维护bom", organizeCode, mesPartProdGroupDetail.getProductPartNo());
return;
} }
mesWorkOrder.setQty(sortInfo.getQty()); mesWorkOrder.setQty(sortInfo.getQty());
@ -289,7 +298,8 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
// 打散bom // 打散bom
List<MesWorkOrderPart> workOrderPartList = new ArrayList<>(); List<MesWorkOrderPart> workOrderPartList = new ArrayList<>();
if (partProdGroup.getIsDisassembleBom() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) { if (partProdGroup.getIsDisassembleBom() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
workOrderPartList = dismantleBom(partSap.getPartNo(), mesWorkOrder.getQty(), sortInfo.getMatchTime(), bom.getBomCode(), sortInfo.getOrganizeCode(), mesPartProdGroupDetail.getWorkCellCode(), mesWorkOrder.getWorkOrderNo()); //打散bom使用生产零件号
workOrderPartList = dismantleBom(mesPartProdGroupDetail.getProductPartNo(), mesWorkOrder.getQty(), sortInfo.getMatchTime(), bom.getBomCode(), sortInfo.getOrganizeCode(), mesPartProdGroupDetail.getWorkCellCode(), mesWorkOrder.getWorkOrderNo());
} }
/** /**
* 总成拆bom,变成子零件 * 总成拆bom,变成子零件

10
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesOfflineServiceImpl.java
Unescape Escape View File

@ -50,8 +50,9 @@ public class MesOfflineServiceImpl implements IMesOfflineService {
List<MesPartProdGroupDetail> detailList = partProdGroupDetailService.findAll(detailPartProdDetailPackBean); List<MesPartProdGroupDetail> detailList = partProdGroupDetailService.findAll(detailPartProdDetailPackBean);
//3.根据客户零件表中的erp零件，是总成零件号;遍历每个客户零件号生成sortRuleCfgOff表 //3.根据客户零件表中的erp零件，是总成零件号;遍历每个客户零件号生成sortRuleCfgOff表
for (MesPartProdGroupDetail detail : detailList) { for (MesPartProdGroupDetail detail : detailList) {
String erpPartNo = StringUtils.isBlank(detail.getProductPartNo()) ? detail.getPartNo() : detail.getProductPartNo(); String erpPartNo = detail.getPartNo();
cfgOfflineService.doCreateSortRuleOffline(detail.getCustPartNo(), erpPartNo,organizeCode,mesPartProdGroup,detail); String productPartNo = StringUtils.isBlank(detail.getProductPartNo()) ? erpPartNo : detail.getProductPartNo();
cfgOfflineService.doCreateSortRuleOffline(detail.getCustPartNo(), erpPartNo,productPartNo,organizeCode,mesPartProdGroup,detail);
} }
} }
@ -91,13 +92,14 @@ public class MesOfflineServiceImpl implements IMesOfflineService {
List<MesPartProdGroupDetail> detailList = partProdGroupDetailService.findAll(detailPartProdDetailPackBean); List<MesPartProdGroupDetail> detailList = partProdGroupDetailService.findAll(detailPartProdDetailPackBean);
//3.根据客户零件表中的erp零件，是总成零件号;遍历每个客户零件号生成sortRuleCfgOff表 //3.根据客户零件表中的erp零件，是总成零件号;遍历每个客户零件号生成sortRuleCfgOff表
for (MesPartProdGroupDetail detail : detailList) { for (MesPartProdGroupDetail detail : detailList) {
String erpPartNo = StringUtils.isBlank(detail.getProductPartNo()) ? detail.getPartNo() : detail.getProductPartNo(); String erpPartNo = detail.getPartNo();
String productPartNo = StringUtils.isBlank(detail.getProductPartNo()) ? erpPartNo : detail.getProductPartNo();
MesPartPull mesPartPull = partPullMap.get(mesPartProdGroup.getWorkCenterCode()); MesPartPull mesPartPull = partPullMap.get(mesPartProdGroup.getWorkCenterCode());
List<MesPartPullDetail> mesPartPullDetails = detailMapList.get(mesPartPull.getPullCode()); List<MesPartPullDetail> mesPartPullDetails = detailMapList.get(mesPartPull.getPullCode());
if (mesPartPullDetails == null) { if (mesPartPullDetails == null) {
continue; continue;
} }
cfgOfflineService.doCreatePullOffline(detail.getCustPartNo(), erpPartNo,organizeCode,mesPartProdGroup,detail,partPullMap.get(mesPartProdGroup.getWorkCenterCode()), mesPartPullDetails); cfgOfflineService.doCreatePullOffline(detail.getCustPartNo(), erpPartNo,productPartNo,organizeCode,mesPartProdGroup,detail,partPullMap.get(mesPartProdGroup.getWorkCenterCode()), mesPartPullDetails);
} }

20
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java
Unescape Escape View File

@ -78,12 +78,12 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
@Transactional(propagation = Propagation.REQUIRES_NEW) @Transactional(propagation = Propagation.REQUIRES_NEW)
@Override @Override
public void doCreateSortRuleOffline(String custPartNo, String erpPartNo, String organizeCode, MesPartProdGroup mesPartProdGroup, MesPartProdGroupDetail detail) { public void doCreateSortRuleOffline(String custPartNo, String erpPartNo, String productPartNo, String organizeCode, MesPartProdGroup mesPartProdGroup, MesPartProdGroupDetail detail) {
MesProductVersion mesProductVersion = getMesProductVersion(erpPartNo, organizeCode); MesProductVersion mesProductVersion = getMesProductVersion(erpPartNo, organizeCode);
//4.总成零件号打散bom //4.总成零件号打散bom
String bomVersion = mesProductVersion.getAlternativePartList(); String bomVersion = mesProductVersion.getAlternativePartList();
MesBom bom = mesBomService.findBom(organizeCode, bomVersion, erpPartNo); MesBom bom = mesBomService.findBom(organizeCode, bomVersion, productPartNo);
if (bom == null) { if (bom == null) {
return; return;
} }
@ -93,7 +93,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
return; return;
} }
//5.打散的bom 获取排序加工规则 //5.打散的bom 获取排序加工规则
List<MesWorkOrderPart> workOrderPartList = dismantleBom(erpPartNo, 1, TimeTool.getNowTime(true), bom.getBomCode(), organizeCode, detail.getWorkCellCode()); List<MesWorkOrderPart> workOrderPartList = dismantleBom(productPartNo, 1, TimeTool.getNowTime(true), bom.getBomCode(), organizeCode, detail.getWorkCellCode());
//6.装配件获取的三种条件 //6.装配件获取的三种条件
String custCode = mesCustomerPart.getCustCode(); String custCode = mesCustomerPart.getCustCode();
MesCustomerCarModel mesCustomerCarModel = getMesCustomerCarModel(custPartNo, organizeCode, custCode); MesCustomerCarModel mesCustomerCarModel = getMesCustomerCarModel(custPartNo, organizeCode, custCode);
@ -146,7 +146,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
} }
@Override @Override
public void doCreatePullOffline(String custPartNo, String erpPartNo, String organizeCode, MesPartProdGroup mesPartProdGroup, MesPartProdGroupDetail detail, MesPartPull partPull, List<MesPartPullDetail> pullDetailList) { public void doCreatePullOffline(String custPartNo, String erpPartNo,String productPartNo, String organizeCode, MesPartProdGroup mesPartProdGroup, MesPartProdGroupDetail detail, MesPartPull partPull, List<MesPartPullDetail> pullDetailList) {
MesProductVersion mesProductVersion = getMesProductVersion(erpPartNo, organizeCode); MesProductVersion mesProductVersion = getMesProductVersion(erpPartNo, organizeCode);
//4.总成零件号打散bom //4.总成零件号打散bom
String bomVersion = mesProductVersion.getAlternativePartList(); String bomVersion = mesProductVersion.getAlternativePartList();
@ -165,7 +165,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
List<MesPartSap> partSapList = partSapRao.findByHqlWhere(partPackBean); List<MesPartSap> partSapList = partSapRao.findByHqlWhere(partPackBean);
//5.打散的bom 获取排序加工规则 //5.打散的bom 获取排序加工规则
List<MesWorkOrderPart> workOrderPartList = dismantleBom(erpPartNo, 1, TimeTool.getNowTime(true), bom.getBomCode(), organizeCode, detail.getWorkCellCode()); List<MesWorkOrderPart> workOrderPartList = dismantleBom(productPartNo, 1, TimeTool.getNowTime(true), bom.getBomCode(), organizeCode, detail.getWorkCellCode());
//6.过滤出需要拉动的零件号 //6.过滤出需要拉动的零件号
List<String> partPullDetailPartNoList = workOrderPartList.stream().map(MesWorkOrderPart::getPartNo).collect(Collectors.toList()); List<String> partPullDetailPartNoList = workOrderPartList.stream().map(MesWorkOrderPart::getPartNo).collect(Collectors.toList());
@ -178,7 +178,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
} }
mesPartPullOffline.setPullCode(partPull.getPullCode()); mesPartPullOffline.setPullCode(partPull.getPullCode());
mesPartPullOffline.setCustPartNo(custPartNo); mesPartPullOffline.setCustPartNo(custPartNo);
mesPartPullOffline.setPartNo(erpPartNo); mesPartPullOffline.setPartNo(productPartNo);
mesPartPullOffline.setWorkCenterCode(partPull.getWorkCenterCode()); mesPartPullOffline.setWorkCenterCode(partPull.getWorkCenterCode());
mesPartPullOffline.setOrganizeCode(organizeCode); mesPartPullOffline.setOrganizeCode(organizeCode);
ConvertBean.saveOrUpdate(mesPartPullOffline,"SPS-OFFLINE"); ConvertBean.saveOrUpdate(mesPartPullOffline,"SPS-OFFLINE");
@ -189,7 +189,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
detailOffline.setPid(mesPartPullOffline.getId()); detailOffline.setPid(mesPartPullOffline.getId());
detailOffline.setPullCode(partPull.getPullCode()); detailOffline.setPullCode(partPull.getPullCode());
detailOffline.setCustPartNo(custPartNo); detailOffline.setCustPartNo(custPartNo);
detailOffline.setAssPartNo(erpPartNo); detailOffline.setAssPartNo(productPartNo);
detailOffline.setOrganizeCode(organizeCode); detailOffline.setOrganizeCode(organizeCode);
detailOffline.setPartNo(pullDetail.getPartNo()); detailOffline.setPartNo(pullDetail.getPartNo());
detailOffline.setPartName(pullDetail.getPartName()); detailOffline.setPartName(pullDetail.getPartName());
@ -240,11 +240,11 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean); DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean);
ddlPackBean.setOrderByStr(" order by createDatetime desc "); ddlPackBean.setOrderByStr(" order by createDatetime desc ");
MesProductVersion mesProductVersion = mesProductVersionRDao.getByProperty(ddlPackBean); List<MesProductVersion> mesProductVersionList = mesProductVersionRDao.findByHqlTopWhere(ddlPackBean, 1);
if (Objects.isNull(mesProductVersion)) { if (Objects.isNull(mesProductVersionList) || mesProductVersionList.isEmpty()) {
MesException.throwMesBusiException("物料【%s】对应的生产版本信息不存在", partNo); MesException.throwMesBusiException("物料【%s】对应的生产版本信息不存在", partNo);
} }
return mesProductVersion; return mesProductVersionList.get(0);
} }
private List<MesWorkOrderPart> dismantleBom(String partNo, double qty, String productTime, String bomCode, String organizeCode, String workCellCode) { private List<MesWorkOrderPart> dismantleBom(String partNo, double qty, String productTime, String bomCode, String organizeCode, String workCellCode) {

Write Preview
Loading…
Cancel
Save