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

Compare commits

base: yonyou:51fbed7ed5dc39bfe0cd017b2dc17e195f6b338d
Branches Tags
yonyou:main
yonyou:dev
..
compare: yonyou:149d810332e9d13a5184fa033b6760fc4a6c32d4
Branches Tags
yonyou:main
yonyou:dev

No commits in common. "51fbed7ed5dc39bfe0cd017b2dc17e195f6b338d" and "149d810332e9d13a5184fa033b6760fc4a6c32d4" have entirely different histories.
51fbed7ed5 ... 149d810332

2 changed files with 0 additions and 13 deletions
Show Stats Expand all files Collapse all files

12
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterDelSyncEpicMesRule.java
View File

@ -10,7 +10,6 @@ import nc.bs.uapbd.util.MyHelper;
import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; import nc.bs.uapbd.util.ThirdPartyPostRequestUtil;
import nc.impl.pubapp.pattern.rule.IRule; import nc.impl.pubapp.pattern.rule.IRule;
import nc.util.mmf.framework.base.MMArrayUtil; import nc.util.mmf.framework.base.MMArrayUtil;
import nc.vo.bd.material.MaterialVO;
import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
import nc.vo.mmpac.pmo.pac0002.entity.PMOHeadVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOHeadVO;
import nc.vo.mmpac.pmo.pac0002.entity.PMOItemVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOItemVO;
@ -86,25 +85,14 @@ public class AfterDelSyncEpicMesRule implements IRule<PMOAggVO> {
*/ */
private void buildSyncData(PMOAggVO aggVO, JSONArray orderArr) throws BusinessException { private void buildSyncData(PMOAggVO aggVO, JSONArray orderArr) throws BusinessException {
PMOHeadVO headVo = aggVO.getParentVO(); PMOHeadVO headVo = aggVO.getParentVO();
PMOItemVO pmoItem = aggVO.getChildrenVO()[0];
String cdeptid = pmoItem.getCdeptid();
// 物料
String cmaterialid = pmoItem.getCmaterialid();
String goodsCode = MyHelper.getStrValByCondition(MaterialVO.getDefaultTableName(), MaterialVO.CODE,
MaterialVO.PK_MATERIAL + " = '" + cmaterialid + "'");
// 组织 // 组织
String pkOrg = headVo.getPk_org(); String pkOrg = headVo.getPk_org();
String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg);
String deptCode = MyHelper.transferField(DeptVO.getDefaultTableName(), DeptVO.CODE, DeptVO.PK_DEPT, cdeptid);
// 组装数据 // 组装数据
JSONObject orderParam = new JSONObject(); JSONObject orderParam = new JSONObject();
orderParam.put("type", "D"); // 删除标识 orderParam.put("type", "D"); // 删除标识
orderParam.put("companyCode", orgCode);// 公司编码 orderParam.put("companyCode", orgCode);// 公司编码
orderParam.put("workOrderCode", headVo.getVbillcode());// 工单号 orderParam.put("workOrderCode", headVo.getVbillcode());// 工单号
// 根据自定义档案中的映射关系，部门编码转换为MES中的编码
orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码
orderParam.put("produCode", goodsCode); // 产品编码
orderParam.put("qty", String.valueOf(pmoItem.getNastnum())); // 计划数量
orderArr.add(orderParam); orderArr.add(orderParam);
} }

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

@ -184,7 +184,6 @@ public class SyncEpicMesUtil {
JSONObject data = new JSONObject(); JSONObject data = new JSONObject();
JSONObject orderParam = new JSONObject(); JSONObject orderParam = new JSONObject();
orderParam.put("id", null); // 唯一标识（主键） orderParam.put("id", null); // 唯一标识（主键）
// 根据自定义档案中的映射关系，部门编码转换为MES中的编码
orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码 orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码
orderParam.put("contractNo", pmoItem.getVfirstcode());// 合同号-取ERP的源头单据号-销售订单号 orderParam.put("contractNo", pmoItem.getVfirstcode());// 合同号-取ERP的源头单据号-销售订单号
/*if (projectMap != null) { /*if (projectMap != null) {