流程生产订单审批后推送艾普MES-优化代码
This commit is contained in:
parent
59c0dc4fc8
commit
1a8b16b11e
|
@ -1,7 +1,6 @@
|
||||||
package nc.bs.mmpac.pmo.pac0002.bp.rule;
|
package nc.bs.mmpac.pmo.pac0002.bp.rule;
|
||||||
|
|
||||||
|
|
||||||
import nc.bs.dao.BaseDAO;
|
|
||||||
import nc.bs.logging.Log;
|
import nc.bs.logging.Log;
|
||||||
import nc.bs.mmpac.pmo.pac0002.bp.rule.util.SyncEpicMesUtil;
|
import nc.bs.mmpac.pmo.pac0002.bp.rule.util.SyncEpicMesUtil;
|
||||||
import nc.impl.pubapp.pattern.rule.IRule;
|
import nc.impl.pubapp.pattern.rule.IRule;
|
||||||
|
@ -9,8 +8,6 @@ import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
|
||||||
import nc.vo.pubapp.pattern.exception.ExceptionUtils;
|
import nc.vo.pubapp.pattern.exception.ExceptionUtils;
|
||||||
import nc.vo.scmpub.util.ArrayUtil;
|
import nc.vo.scmpub.util.ArrayUtil;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 流程生产订单审批后推送艾普MES
|
* 流程生产订单审批后推送艾普MES
|
||||||
*
|
*
|
||||||
|
@ -23,13 +20,6 @@ public class AfterApproveSyncEpicMesRule implements IRule<PMOAggVO> {
|
||||||
|
|
||||||
private static final Log logDl = Log.getInstance(LOG_INFO_NAME);
|
private static final Log logDl = Log.getInstance(LOG_INFO_NAME);
|
||||||
|
|
||||||
private static final String pmoUrl = "/prj-v5-web/ext/api/workOrder";
|
|
||||||
private static final String codeUrl = "/prj-v5-web/ext/api/releaseNo";
|
|
||||||
private Map<String, String> configParams;
|
|
||||||
private Map<String, String> deptParams;
|
|
||||||
|
|
||||||
private static final BaseDAO dao = new BaseDAO();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void process(PMOAggVO[] pmoAggVOS) {
|
public void process(PMOAggVO[] pmoAggVOS) {
|
||||||
if (ArrayUtil.isEmpty(pmoAggVOS)) {
|
if (ArrayUtil.isEmpty(pmoAggVOS)) {
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package nc.bs.mmpac.pmo.pac0002.bp.rule;
|
package nc.bs.mmpac.pmo.pac0002.bp.rule;
|
||||||
|
|
||||||
|
|
||||||
import nc.bs.dao.BaseDAO;
|
|
||||||
import nc.bs.logging.Log;
|
import nc.bs.logging.Log;
|
||||||
import nc.bs.mmpac.pmo.pac0002.bp.rule.util.SyncEpicMesUtil;
|
import nc.bs.mmpac.pmo.pac0002.bp.rule.util.SyncEpicMesUtil;
|
||||||
import nc.impl.pubapp.pattern.rule.ICompareRule;
|
import nc.impl.pubapp.pattern.rule.ICompareRule;
|
||||||
|
@ -9,8 +8,6 @@ import nc.util.mmf.framework.base.MMArrayUtil;
|
||||||
import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
|
import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO;
|
||||||
import nc.vo.pubapp.pattern.exception.ExceptionUtils;
|
import nc.vo.pubapp.pattern.exception.ExceptionUtils;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 流程生产订单取消审批后同步艾普MES
|
* 流程生产订单取消审批后同步艾普MES
|
||||||
*
|
*
|
||||||
|
@ -23,12 +20,6 @@ public class AfterUnApproveSyncEpicMesRule implements ICompareRule<PMOAggVO> {
|
||||||
|
|
||||||
private static final Log logDl = Log.getInstance(LOG_INFO_NAME);
|
private static final Log logDl = Log.getInstance(LOG_INFO_NAME);
|
||||||
|
|
||||||
private static final String pmoUrl = "/prj-v5-web/ext/api/workOrder";
|
|
||||||
private Map<String, String> configParams;
|
|
||||||
private Map<String, String> deptParams;
|
|
||||||
|
|
||||||
private static final BaseDAO dao = new BaseDAO();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void process(PMOAggVO[] pmoAggVOS, PMOAggVO[] originVOs) {
|
public void process(PMOAggVO[] pmoAggVOS, PMOAggVO[] originVOs) {
|
||||||
if (MMArrayUtil.isEmpty(pmoAggVOS)) {
|
if (MMArrayUtil.isEmpty(pmoAggVOS)) {
|
||||||
|
|
|
@ -78,22 +78,20 @@ public class SyncEpicMesUtil {
|
||||||
}
|
}
|
||||||
if ("N".equals(auditCode)) {
|
if ("N".equals(auditCode)) {
|
||||||
JSONObject data = buildSyncData(aggVO);
|
JSONObject data = buildSyncData(aggVO);
|
||||||
// pushData(pmoUrl, data);
|
pushData(pmoUrl, data);
|
||||||
} else {
|
} else {
|
||||||
JSONObject data = buildSyncData(aggVO);
|
JSONObject data = buildSyncData(aggVO);
|
||||||
// pushData(pmoUrl, data);
|
pushData(pmoUrl, data);
|
||||||
|
|
||||||
JSONObject buildSyncData = buildSyncCodeData(aggVO);
|
JSONObject buildSyncData = buildSyncCodeData(aggVO);
|
||||||
jsonArray.add(buildSyncData);
|
jsonArray.add(buildSyncData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!jsonArray.isEmpty()) {
|
if (!jsonArray.isEmpty()) {
|
||||||
// pushData(codeUrl, jsonArray);
|
pushData(codeUrl, jsonArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
logDl.info("生产订单同步到艾普MES系统处理完成。");
|
logDl.info("生产订单同步到艾普MES系统处理完成。");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -320,8 +318,8 @@ public class SyncEpicMesUtil {
|
||||||
for (PMOItemVO item : vo.getChildrenVO()) {
|
for (PMOItemVO item : vo.getChildrenVO()) {
|
||||||
HYPubBO hybo = new HYPubBO();
|
HYPubBO hybo = new HYPubBO();
|
||||||
Object materialtype = hybo.findColValue("bd_material_v", "materialtype", "pk_source = '" + item.getCmaterialid() + "' ");
|
Object materialtype = hybo.findColValue("bd_material_v", "materialtype", "pk_source = '" + item.getCmaterialid() + "' ");
|
||||||
IBillcodeManage billcodeManage=new BillCodeManageImpl();
|
IBillcodeManage billcodeManage = new BillCodeManageImpl();
|
||||||
String code= billcodeManage.getPreBillCode_RequiresNew("xxxxx-code-rule",hvo.getPk_group(),hvo.getPk_org());
|
String code = billcodeManage.getPreBillCode_RequiresNew("xxxxx-code-rule", hvo.getPk_group(), hvo.getPk_org());
|
||||||
String detailItem = materialtype + hvo.getDbilldate().toStdString().substring(0, 3) + hvo.getDbilldate().toStdString().substring(5, 6) + code;
|
String detailItem = materialtype + hvo.getDbilldate().toStdString().substring(0, 3) + hvo.getDbilldate().toStdString().substring(5, 6) + code;
|
||||||
jsonArray.add(detailItem);
|
jsonArray.add(detailItem);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue