From 128e1f541f28ea4bc19e5762a03396031d0ca163 Mon Sep 17 00:00:00 2001 From: houyi <1398559711@qq.com> Date: Mon, 29 Sep 2025 16:11:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=AE=A1=E6=89=B9=E5=90=8E=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=AB=98=E5=8E=8BMES-=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rApproveCancelSyncHighpressureMesRule.java | 10 +- .../approve/AfterSoCancelSyncRuleGyMes.java | 182 ++++++++++++++++++ .../action/main/UnApproveSaleOrderAction.java | 3 + 3 files changed, 191 insertions(+), 4 deletions(-) create mode 100644 so/src/private/nc/bs/so/m30/rule/approve/AfterSoCancelSyncRuleGyMes.java diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveCancelSyncHighpressureMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveCancelSyncHighpressureMesRule.java index 5f200813..ff74066a 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveCancelSyncHighpressureMesRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveCancelSyncHighpressureMesRule.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import nc.bs.dao.BaseDAO; +import nc.bs.framework.common.InvocationInfoProxy; import nc.bs.logging.Log; import nc.bs.trade.business.HYPubBO; import nc.bs.uapbd.util.MyHelper; @@ -68,10 +69,11 @@ public class AfterApproveCancelSyncHighpressureMesRule implements IRule { + private static final String LOG_INFO_NAME = "gymeslog"; + private static final Log logger = Log.getInstance(LOG_INFO_NAME); + private static final String reqUrl = "/bip/order/saleOrderCancel"; + private Map configParams; + + @Override + public void process(SaleOrderVO[] saleOrderVOs) { + try { + if (saleOrderVOs == null || saleOrderVOs.length == 0) { + return; + } + configParams = MyHelper.getConfigParams("gy-config", null); + if (configParams.isEmpty()) { + throw new BusinessException("高压的接口缺少配置"); + } + buildSyncData(saleOrderVOs); + } catch (Exception e) { + ExceptionUtils.wrappException(e); + } + } + + /** + * 构建同步数据 + */ + private void buildSyncData(SaleOrderVO[] useVOs) throws BusinessException { + BaseDAO baseDAO = new BaseDAO(); + HYPubBO hybo = new HYPubBO(); + JSONArray cmoidArray = new JSONArray(); + JSONObject list = new JSONObject(); + for (SaleOrderVO vo : useVOs) { + // 判断物料的业务单元是否是高压公司，不是则跳过 + String pkOrg = vo.getParentVO().getPk_org(); + String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); + if (checkIfOrg(orgCode, configParams)) { + continue; + } + SaleOrderHVO hvo = vo.getParentVO(); +// SaleOrderBVO[] itemVOS = vo.getChildrenVO(); + String cmoid = hvo.getVbillcode();// 销售订单号 + cmoidArray.add(cmoid); + } + if (cmoidArray.size() > 0) { + ArrayList cmoidObj = new ArrayList<>(Arrays.asList(cmoidArray.toArray())); + // 使用 String.join 进行字符串拼接 + String result = ""; + StringBuilder sb = new StringBuilder(); + if (cmoidObj.size() > 1) { + for (int i = 0; i < cmoidObj.size(); i++) { + sb.append("'").append(cmoidObj.get(i)).append("'"); + if (i < cmoidObj.size() - 1) { + sb.append(","); + } + } + result = sb.toString(); + } else { + result = "'" + (String) cmoidObj.get(0) + "'"; + } + + // 取消审批人 + String bipUpdateId = InvocationInfoProxy.getInstance().getUserId();//当前登录人 + String userSql = " select user_name from sm_user where dr = 0 and cuserid = '" + bipUpdateId + "' "; + String bipUpdateBy = (String) baseDAO.executeQuery(userSql, new ColumnProcessor()); + + list.put("bipOrderId", result); // 主键ID + list.put("bipUpdateBy", bipUpdateBy);// 取消审批人 + pushData(list); + } + + } + + /** + * 推送同步数据 + */ + private void pushData(JSONObject param) throws BusinessException { + // String jsonString = param.toJSONString(); + // 转json字符串的时候保留null值 + String jsonStr = JSON.toJSONString(param, SerializerFeature.WriteMapNullValue, SerializerFeature.WriteNullStringAsEmpty); + logger.error("gyMes-SaleOrder-param = " + jsonStr); + NCCForUAPLogger.debug("gyMes-SaleOrder-param = " + jsonStr); + String baseUrl = configParams.get("mesBaseUrl"); + String requestUrl = baseUrl + reqUrl; + logger.error("gyMes-SaleOrder-url = " + requestUrl); + String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr); + JSONObject resultObj = JSONObject.parseObject(result); + logger.error("gyMes-SaleOrder-res = " + result); + + if (!"200".equals(resultObj.getString("code"))) { + logger.error("gyMes-SaleOrder-error,result[" + resultObj.toJSONString() + "]"); + throw new BusinessException("销售订单推送高压MES错误:" + resultObj.getString("msg")); + } + } + + private boolean checkIfOrg(String code, Map configParams) throws BusinessException { + String targetCode = configParams.get("gyOrg"); + if (targetCode == null || nc.vo.am.common.util.StringUtils.isEmpty(targetCode)) { + throw new BusinessException("未配置组织参数"); + } + String[] orgItem = targetCode.split(","); + for (String orgCode : orgItem) { + if (!orgCode.isEmpty() && orgCode.equals(code)) { + return false; + } + } + return true; + } + + /** + * 获取自定义项信息 + */ + private String getDefCode(String code, String pk_defdoc) { + String res = ""; + String strWhere = " pk_defdoclist in (select pk_defdoclist from bd_defdoclist where code='" + code + "' and dr=0 ) and dr = 0 and pk_defdoc = '" + pk_defdoc + "'"; + try { + DefdocVO[] defdocVOs = (DefdocVO[]) new HYSuperDMO().queryByWhereClause(DefdocVO.class, strWhere); + if (defdocVOs != null && defdocVOs.length > 0) { + res = defdocVOs[0].getCode().trim(); + } + } catch (DAOException e) { + logger.error("gyMes-SaleOrder-error,getDefCode[" + e.getMessage() + "]"); + } + return res; + + } + + /** + * 获取自定义项信息 + */ + private String getDefName(String code, String pk_defdoc) { + String res = ""; + String strWhere = " pk_defdoclist in (select pk_defdoclist from bd_defdoclist where code='" + code + "' and dr=0 ) and dr = 0 and pk_defdoc = '" + pk_defdoc + "'"; + try { + DefdocVO[] defdocVOs = (DefdocVO[]) new HYSuperDMO().queryByWhereClause(DefdocVO.class, strWhere); + if (defdocVOs != null && defdocVOs.length > 0) { + res = defdocVOs[0].getName().trim(); + } + } catch (DAOException e) { + logger.error("gyMes-SaleOrder-error,getDefCode[" + e.getMessage() + "]"); + } + return res; + + } + + +} + diff --git a/so/src/private/nc/impl/so/m30/action/main/UnApproveSaleOrderAction.java b/so/src/private/nc/impl/so/m30/action/main/UnApproveSaleOrderAction.java index cc53f899..37a5b41e 100644 --- a/so/src/private/nc/impl/so/m30/action/main/UnApproveSaleOrderAction.java +++ b/so/src/private/nc/impl/so/m30/action/main/UnApproveSaleOrderAction.java @@ -13,6 +13,7 @@ import nc.bs.pub.action.N_30_UNAPPROVE; import nc.bs.scmpub.rule.VOSagaFrozenValidateRule; import nc.bs.so.m30.maintain.rule.insert.RewritePromotePriceInsertRule; import nc.bs.so.m30.plugin.Action30PlugInPoint; +import nc.bs.so.m30.rule.approve.AfterSoCancelSyncRuleGyMes; import nc.bs.so.m30.rule.approve.CheckPush5Aor20Rule; import nc.bs.so.m30.rule.approve.SaleOrderDeleteRmBeforeRule; import nc.bs.so.m30.rule.atp.SaleOrderVOATPAfterRule; @@ -154,6 +155,8 @@ public class UnApproveSaleOrderAction { IRule var11 = new MobAfterUnApproveMessageRule(); processer.addAfterRule(var11); processer.addAfterRule(new SaleOrderDeleteRmBeforeRule()); + // 销售订单取消审批后推送高压MES + processer.addAfterRule(new AfterSoCancelSyncRuleGyMes()); } private void addBeforeRule(AroundProcesser processer, Integer oldbillstatus) { From 744905acca8d26522d068d0acdd5755d0ede37bd Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 29 Sep 2025 20:53:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(material):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=A4=9A=E4=B8=AAPLM=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=B9=B6=E6=89=93=E5=8C=85=E6=88=90ZIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/MaterialPlmDownloadAction.java | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java index e51ebbde..b6b0ba09 100644 --- a/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java +++ b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java @@ -170,27 +170,28 @@ public class MaterialPlmDownloadAction implements ICommonAction { logger.error("物料编码 " + materialCode + " 未查询到" + fileType + "类型文件"); return false; } + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject plmFileJson = (JSONObject) jsonArray.get(i); + String objId = plmFileJson.getString("objId"); + if (objId == null || objId.isEmpty()) { + logger.error("物料编码 " + materialCode + " 的" + fileType + "文件ID为空"); + continue; + } - JSONObject plmFileJson = jsonArray.getJSONObject(0); - String objId = plmFileJson.getString("objId"); - if (objId == null || objId.isEmpty()) { - logger.error("物料编码 " + materialCode + " 的" + fileType + "文件ID为空"); - return false; + String name = plmFileJson.getString("name"); + String suffix = plmFileJson.getString("suffix"); + byte[] fileBytes = downloadPlmFileByType(objId, fileType); + if (fileBytes.length == 0) { + logger.error("物料编码 " + materialCode + " 的" + fileType + "文件字节流为空"); + continue; + } + + // 生成带类型标识的文件名，避免重复 + String fname = name + "_" + materialCode + "_" + getTypeName(fileType) + "_" + (index + i) + "." + suffix; + zipStream.putNextEntry(new ZipEntry(fname)); + zipStream.write(fileBytes); + zipStream.closeEntry(); } - - String name = plmFileJson.getString("name"); - String suffix = plmFileJson.getString("suffix"); - byte[] fileBytes = downloadPlmFileByType(objId, fileType); - if (fileBytes.length == 0) { - logger.error("物料编码 " + materialCode + " 的" + fileType + "文件字节流为空"); - return false; - } - - // 生成带类型标识的文件名，避免重复 - String fname = name + "_" + materialCode + "_" + getTypeName(fileType) + "_" + index + "." + suffix; - zipStream.putNextEntry(new ZipEntry(fname)); - zipStream.write(fileBytes); - zipStream.closeEntry(); return true; }