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

refactor(mmpac): 重构同步 Epic MES 工单接口的组织相关代码 

- 将 FactoryVO 替换为 OrgVO，以支持更广泛的组织类型
- 优化了组织代码和名称的获取逻辑
- 删除了未使用的取消审核流程相关代码
This commit is contained in:
mzr 2025-08-06 08:41:57 +08:00
parent 91e2b52dc3
commit d42e0f33eb
1 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
import nc.vo.mmpac.pmo.pac0002.entity.PMOHeadVO;
import nc.vo.mmpac.pmo.pac0002.entity.PMOItemVO;
import nc.vo.org.DeptVO;
import nc.vo.org.FactoryVO;
import nc.vo.org.OrgVO;
import nc.vo.pub.BusinessException;
import nc.vo.pubapp.pattern.pub.SqlBuilder;
import nccloud.commons.lang.StringUtils;
@ -136,7 +136,7 @@ public class SyncEpicMesUtil {
List<PMOAggVO> aggvoList = new ArrayList<>();
for (PMOAggVO aggVo : pmoAggVOS) {
String pkOrg = aggVo.getParentVO().getPk_org();
String orgCode = MyHelper.transferField(FactoryVO.getDefaultTableName(), FactoryVO.CODE, FactoryVO.PK_FACTORY, pkOrg);
String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg);
// 检查当前组织是否为电力电子
if (MyHelper.checkIfDldzOrg(orgCode, configParams)) {
continue;
@ -166,8 +166,8 @@ public class SyncEpicMesUtil {
// 翻译字段值
// 组织
String pkOrg = headVo.getPk_org();
String selectFields = FactoryVO.CODE + "," + FactoryVO.NAME;
Map<String, Object> orgMap = MyHelper.transferFields(FactoryVO.getDefaultTableName(), selectFields, FactoryVO.PK_FACTORY, pkOrg);
String selectFields = OrgVO.CODE + "," + OrgVO.NAME;
Map<String, Object> orgMap = MyHelper.transferFields(OrgVO.getDefaultTableName(), selectFields, OrgVO.PK_ORG, pkOrg);
// 物料
String cmaterialid = pmoItem.getCmaterialid();
selectFields = MaterialVO.CODE + "," + MaterialVO.NAME;
@ -175,7 +175,7 @@ public class SyncEpicMesUtil {
// 项目
String cprojectid = pmoItem.getCprojectid();
selectFields = ProjectHeadVO.PROJECT_CODE + "," + ProjectHeadVO.PROJECT_NAME;
Map<String, Object> projectMap = MyHelper.transferFields(MaterialVO.getDefaultTableName(), selectFields, ProjectHeadVO.PK_PROJECT, cprojectid);
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);
@ -209,8 +209,8 @@ public class SyncEpicMesUtil {
// orderParam.put("transferPlanTime", null); // 生产转检计划时间（格式为YYYY-MM-DD）
// orderParam.put("receiptScheduledTime", null); // 完工入库时间（格式为YYYY-MM-DD）
if (orgMap != null) {
orderParam.put("companyCode", orgMap.get(FactoryVO.CODE)); // 公司编码
orderParam.put("companyName", orgMap.get(FactoryVO.NAME)); // 公司名称
orderParam.put("companyCode", orgMap.get(OrgVO.CODE)); // ¹«Ë¾±àÂë
orderParam.put("companyName", orgMap.get(OrgVO.NAME)); // ¹«Ë¾Ãû³Æ
}
JSONArray orderArr = new JSONArray();
orderArr.add(orderParam);
@ -332,35 +332,4 @@ public class SyncEpicMesUtil {
return obj;
}
/**
* 组装数据-取消审核流程生产订单
*/
private JSONObject buildUnAuditSyncData(PMOAggVO aggVO) throws BusinessException {
PMOHeadVO headVo = aggVO.getParentVO();
PMOItemVO pmoItem = aggVO.getChildrenVO()[0];
// 翻译字段值
// 组织
String pkOrg = headVo.getPk_org();
String selectFields = FactoryVO.CODE + "," + FactoryVO.NAME;
Map<String, Object> orgMap = MyHelper.transferFields(FactoryVO.getDefaultTableName(), selectFields, FactoryVO.PK_FACTORY, pkOrg);
// 生产部门 cdeptid
String cdeptid = pmoItem.getCdeptid();
String deptCode = MyHelper.transferField(DeptVO.getDefaultTableName(), DeptVO.CODE, DeptVO.PK_DEPT, cdeptid);
// 组装数据
JSONObject data = new JSONObject();
JSONObject orderParam = new JSONObject();
orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));
orderParam.put("workOrderCode", headVo.getVbillcode());// 工单号
orderParam.put("auditCode", "N"); // 审核状态（Y:已审核 N:未审核）
if (orgMap != null) {
orderParam.put("companyCode", orgMap.get(FactoryVO.CODE)); // 公司编码
orderParam.put("companyName", orgMap.get(FactoryVO.NAME)); // 公司名称
}
JSONArray orderArr = new JSONArray();
orderArr.add(orderParam);
// 流程生产订单
data.put("workOrders", orderArr);
return data;
}
}