yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
jiashuai 2025-09-30 18:49:53 +08:00
parent 556849701b 4d6cce825d
commit c2ef8abfee
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mmpac/src/client/nccloud/web/mmpac/pmo/action/PmoToPlmAction.java
View File

@ -135,7 +135,7 @@ public class PmoToPlmAction implements ICommonAction {
request.put("asuser34", projectMap.get("project_name"));
}
request.put("asuser28", itemVO.getVfirstcode());
request.put("asuser28", itemVO.getVsalebillcode());
request.put("ab012", itemVO.getNastnum());
request.put("gsdm", GSDM);

2
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncPLMRule.java
View File

@ -129,7 +129,7 @@ public class AfterApproveSyncPLMRule implements IRule<PMOAggVO> {
request.put("asuser34", projectMap.get("project_name"));
}
request.put("asuser28", itemVO.getVfirstcode());
request.put("asuser28", itemVO.getVsalebillcode());
request.put("ab012", itemVO.getNastnum());
request.put("gsdm", GSDM);

13
mmpac/src/public/nc/vo/mmpac/pmo/pac0002/util/HttpPmoEpicMesUtil.java
View File

@ -10,6 +10,7 @@ import nc.bs.uapbd.util.MyHelper;
import nc.bs.uapbd.util.ThirdPartyPostRequestUtil;
import nc.jdbc.framework.processor.MapListProcessor;
import nc.jdbc.framework.processor.MapProcessor;
import nc.vo.bc.pmpub.project.ProjectHeadVO;
import nc.vo.bd.bom.bom0202.entity.BomVO;
import nc.vo.bd.material.MaterialVO;
import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
@ -186,9 +187,9 @@ public class HttpPmoEpicMesUtil {
selectFields = MaterialVO.CODE + "," + MaterialVO.NAME;
Map<String, Object> goodsMap = MyHelper.transferFields(MaterialVO.getDefaultTableName(), selectFields, MaterialVO.PK_MATERIAL, cmaterialid);
// 项目
// String cprojectid = pmoItem.getCprojectid();
// selectFields = ProjectHeadVO.PROJECT_CODE + "," + ProjectHeadVO.PROJECT_NAME;
// Map<String, Object> projectMap = MyHelper.transferFields(ProjectHeadVO.getDefaultTableName(), selectFields, ProjectHeadVO.PK_PROJECT, cprojectid);
String cprojectid = pmoItem.getCprojectid();
selectFields = ProjectHeadVO.PROJECT_CODE + "," + ProjectHeadVO.PROJECT_NAME;
Map<String, Object> projectMap = MyHelper.transferFields(ProjectHeadVO.getDefaultTableName(), selectFields, ProjectHeadVO.PK_PROJECT, cprojectid);
// 生产部门 cdeptid
String cdeptid = pmoItem.getCdeptid();
String deptCode = MyHelper.transferField(DeptVO.getDefaultTableName(), DeptVO.CODE, DeptVO.PK_DEPT, cdeptid);
@ -202,10 +203,10 @@ public class HttpPmoEpicMesUtil {
// 根据自定义档案中的映射关系，部门编码转换为MES中的编码
orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码
orderParam.put("contractNo", pmoItem.getVfirstcode());// 合同号-取ERP的源头单据号-销售订单号
/*if (projectMap != null) {
orderParam.put("contractNo", projectMap.get(ProjectHeadVO.PROJECT_CODE));// şĎÍŹşĹ
if (projectMap != null) {
// orderParam.put("contractNo", projectMap.get(ProjectHeadVO.PROJECT_CODE));// şĎÍŹşĹ
orderParam.put("contractName", projectMap.get(ProjectHeadVO.PROJECT_NAME)); // 合同名称
}*/
}
orderParam.put("workOrderCode", headVo.getVbillcode());// 工单号
orderParam.put("qty", String.valueOf(pmoItem.getNastnum())); // 计划数量，字符串类型
if (goodsMap != null) {