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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
lihao 2025-09-03 15:57:21 +08:00
parent 06e7bd7acb c7fa2723d3
commit 6eba148319
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java
View File

@ -173,9 +173,9 @@ public class SyncEpicMesUtil {
selectFields = MaterialVO.CODE + "," + MaterialVO.NAME; selectFields = MaterialVO.CODE + "," + MaterialVO.NAME;
Map<String, Object> goodsMap = MyHelper.transferFields(MaterialVO.getDefaultTableName(), selectFields, MaterialVO.PK_MATERIAL, cmaterialid); Map<String, Object> goodsMap = MyHelper.transferFields(MaterialVO.getDefaultTableName(), selectFields, MaterialVO.PK_MATERIAL, cmaterialid);
// 项目 // 项目
String cprojectid = pmoItem.getCprojectid(); // String cprojectid = pmoItem.getCprojectid();
selectFields = ProjectHeadVO.PROJECT_CODE + "," + ProjectHeadVO.PROJECT_NAME; // selectFields = ProjectHeadVO.PROJECT_CODE + "," + ProjectHeadVO.PROJECT_NAME;
Map<String, Object> projectMap = MyHelper.transferFields(ProjectHeadVO.getDefaultTableName(), selectFields, ProjectHeadVO.PK_PROJECT, cprojectid); // Map<String, Object> projectMap = MyHelper.transferFields(ProjectHeadVO.getDefaultTableName(), selectFields, ProjectHeadVO.PK_PROJECT, cprojectid);
// 生产部门 cdeptid // 生产部门 cdeptid
String cdeptid = pmoItem.getCdeptid(); String cdeptid = pmoItem.getCdeptid();
String deptCode = MyHelper.transferField(DeptVO.getDefaultTableName(), DeptVO.CODE, DeptVO.PK_DEPT, cdeptid); String deptCode = MyHelper.transferField(DeptVO.getDefaultTableName(), DeptVO.CODE, DeptVO.PK_DEPT, cdeptid);
@ -187,10 +187,11 @@ public class SyncEpicMesUtil {
JSONObject orderParam = new JSONObject(); JSONObject orderParam = new JSONObject();
orderParam.put("id", null); // 唯一标识（主键） orderParam.put("id", null); // 唯一标识（主键）
orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码 orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码
if (projectMap != null) { orderParam.put("contractNo", pmoItem.getVsalebillcode());// 合同号-取ERP的销售订单号
/*if (projectMap != null) {
orderParam.put("contractNo", projectMap.get(ProjectHeadVO.PROJECT_CODE));// 合同号 orderParam.put("contractNo", projectMap.get(ProjectHeadVO.PROJECT_CODE));// 合同号
orderParam.put("contractName", projectMap.get(ProjectHeadVO.PROJECT_NAME)); // 合同名称 orderParam.put("contractName", projectMap.get(ProjectHeadVO.PROJECT_NAME)); // 合同名称
} }*/
orderParam.put("workOrderCode", headVo.getVbillcode());// 工单号 orderParam.put("workOrderCode", headVo.getVbillcode());// 工单号
orderParam.put("qty", String.valueOf(pmoItem.getNastnum())); // 计划数量，字符串类型 orderParam.put("qty", String.valueOf(pmoItem.getNastnum())); // 计划数量，字符串类型
if (goodsMap != null) { if (goodsMap != null) {