From 306a703fe00de97206de516cf796e9d694afb330 Mon Sep 17 00:00:00 2001 From: mzr Date: Wed, 17 Sep 2025 09:03:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=A0=E9=99=A4-=E6=8E=A8=E8=89=BE=E6=99=AEMES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bs/mmpac/pmo/pac0002/bp/PMODeleteBP.java | 2 + .../bp/rule/AfterDelSyncEpicMesRule.java | 85 +++++-------------- 2 files changed, 21 insertions(+), 66 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMODeleteBP.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMODeleteBP.java index 6dfe476..44a5472 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMODeleteBP.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMODeleteBP.java @@ -5,6 +5,7 @@ package nc.bs.mmpac.pmo.pac0002.bp; +import nc.bs.mmpac.pmo.pac0002.bp.rule.AfterDelSyncEpicMesRule; import nc.bs.mmpac.pmo.pac0002.bp.rule.WithUpdatePickmRule; import nc.bs.mmpac.pmo.pac0002.pluginpoint.PMOPluginPoint; import nc.bs.mmpac.pmo.pac0002.rule.PMOATPUpdateWithParaRule; @@ -98,5 +99,6 @@ public class PMODeleteBP { IRule billcoderule = new ReturnBillCodeRule("55A2", "vbillcode", "pk_group", "pk_org"); processer.addAfterRule(billcoderule); processer.addAfterRule(new WithUpdatePickmRule()); + processer.addAfterRule(new AfterDelSyncEpicMesRule()); } } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterDelSyncEpicMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterDelSyncEpicMesRule.java index ca370aa..105459e 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterDelSyncEpicMesRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterDelSyncEpicMesRule.java @@ -5,14 +5,11 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; -import nc.bs.dao.BaseDAO; import nc.bs.logging.Log; import nc.bs.uapbd.util.MyHelper; import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; -import nc.impl.pubapp.pattern.rule.ICompareRule; +import nc.impl.pubapp.pattern.rule.IRule; import nc.util.mmf.framework.base.MMArrayUtil; -import nc.vo.bd.bom.bom0202.entity.BomVO; -import nc.vo.bd.material.MaterialVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOHeadVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOItemVO; @@ -21,21 +18,17 @@ import nc.vo.org.OrgVO; import nc.vo.pub.BusinessException; import nc.vo.pubapp.pattern.exception.ExceptionUtils; - - import java.util.ArrayList; import java.util.List; import java.util.Map; - - /** * 流程生产订单删除后同步艾普MES * * @author mzr * @date 2025/9/16 */ -public class AfterDelSyncEpicMesRule implements ICompareRule { +public class AfterDelSyncEpicMesRule implements IRule { private static final String LOG_INFO_NAME = "dldzlog"; @@ -44,12 +37,8 @@ public class AfterDelSyncEpicMesRule implements ICompareRule { private Map configParams; private Map deptParams; - private static String auditCode = "Y"; - - private static final BaseDAO dao = new BaseDAO(); - @Override - public void process(PMOAggVO[] pmoAggVOS, PMOAggVO[] originVOs) { + public void process(PMOAggVO[] pmoAggVOS) { if (MMArrayUtil.isEmpty(pmoAggVOS)) { return; } @@ -70,23 +59,19 @@ public class AfterDelSyncEpicMesRule implements ICompareRule { configParams.put("deptRange", deptRange); List filteredOrders = checkAndFilterBillSrcOrg(pmoAggVOS); if (filteredOrders.isEmpty()) { - logDl.error("没有符合条件的生产订单需要同步到艾普MES系统。"); + // logDl.error("没有符合条件的生产订单需要同步到艾普MES系统。"); return; } - logDl.info("开始同步生产订单到艾普MES系统，符合条件的订单数量: " + filteredOrders.size()); + // logDl.info("开始同步生产订单到艾普MES系统，符合条件的订单数量: " + filteredOrders.size()); JSONArray jsonArray = new JSONArray(); // 推送到艾普MES系统 for (PMOAggVO aggVO : filteredOrders) { - PMOHeadVO head = aggVO.getParentVO(); - PMOItemVO[] bodys = aggVO.getChildrenVO(); - if(bodys == null || bodys.length == 0){ - logDl.error("生产订单"+head.getVbillcode()+"没有行信息,跳过同步"); - continue; - } - - JSONObject data = buildSyncData(aggVO); - pushData(pmoUrl, data); - + buildSyncData(aggVO, jsonArray); + } + if (!jsonArray.isEmpty()) { + JSONObject data = new JSONObject(); + data.put("workOrders", jsonArray); + pushData(pmoUrl, data); } } catch (Exception e) { logDl.error("删除同步生产订单到艾普MES系统失败: " + e.getMessage(), e); @@ -95,50 +80,20 @@ public class AfterDelSyncEpicMesRule implements ICompareRule { } - /** * 组装数据-流程生产订单+备料计划 */ - private JSONObject buildSyncData(PMOAggVO aggVO) throws BusinessException { + private void buildSyncData(PMOAggVO aggVO, JSONArray orderArr) throws BusinessException { PMOHeadVO headVo = aggVO.getParentVO(); - // 目前电力电子只做一个表体的订单，故只处理的流程生产订单第一个子表行 - PMOItemVO pmoItem = aggVO.getChildrenVO()[0]; - // 翻译字段值 // 组织 String pkOrg = headVo.getPk_org(); - String selectFields = OrgVO.CODE + "," + OrgVO.NAME; - Map orgMap = MyHelper.transferFields(OrgVO.getDefaultTableName(), selectFields, OrgVO.PK_ORG, pkOrg); - // 物料 - String cmaterialid = pmoItem.getCmaterialid(); - selectFields = MaterialVO.CODE + "," + MaterialVO.NAME; - Map goodsMap = MyHelper.transferFields(MaterialVO.getDefaultTableName(), selectFields, MaterialVO.PK_MATERIAL, cmaterialid); - // 项目 - // String cprojectid = pmoItem.getCprojectid(); - // selectFields = ProjectHeadVO.PROJECT_CODE + "," + ProjectHeadVO.PROJECT_NAME; - // Map 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); - // 生产BOM版本 - String cbomversionid = pmoItem.getCbomversionid(); - String bomCode = MyHelper.transferField(BomVO.TABLE_NAME, BomVO.HVERSION, BomVO.CBOMID, cbomversionid); + String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); // 组装数据 - JSONObject data = new JSONObject(); JSONObject orderParam = new JSONObject(); - orderParam.put("type", "D"); // 唯一标识（主键） - // orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码 - orderParam.put("companyCode",deptCode);//公司编码 - - + orderParam.put("type", "D"); // 删除标识 + orderParam.put("companyCode", orgCode);// 公司编码 orderParam.put("workOrderCode", headVo.getVbillcode());// 工单号 - orderParam.put("qty", String.valueOf(pmoItem.getNastnum())); // 计划数量，字符串类型 - - JSONArray orderArr = new JSONArray(); orderArr.add(orderParam); - // 流程生产订单 - data.put("workOrders", orderArr); - - return data; } @@ -153,16 +108,16 @@ public class AfterDelSyncEpicMesRule implements ICompareRule { try { // 转json字符串的时候保留null值 String jsonStr = JSON.toJSONString(param, SerializerFeature.WriteMapNullValue, SerializerFeature.WriteNullStringAsEmpty); - logDl.error("EpicMes-PMO-param = " + jsonStr); + logDl.error("EpicMes-PMO-del-param = " + jsonStr); String baseUrl = configParams.get("epicMesUrl"); String requestUrl = baseUrl + reqUrl; - logDl.error(" EpicMes-PMO-url = " + requestUrl); + logDl.error(" EpicMes-PMO-del-url = " + requestUrl); responseString = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr); - logDl.error(" EpicMes-PMO-res = " + responseString); + logDl.error(" EpicMes-PMO-del-res = " + responseString); JSONObject resultObj = JSONObject.parseObject(responseString); if (!"1".equals(resultObj.getString("flag"))) { - logDl.error("EpicMes-PMO-error,result[" + resultObj.toJSONString() + "]"); + logDl.error("EpicMes-PMO-del-error,result[" + resultObj.toJSONString() + "]"); throw new BusinessException("艾普MES返回错误信息:" + resultObj.getString("msg")); } } catch (Exception e) { @@ -172,8 +127,6 @@ public class AfterDelSyncEpicMesRule implements ICompareRule { } - - /** * 检查并筛选需要同步的单据 */