From 6c4e1852942a045099f10b0250623738106e28d8 Mon Sep 17 00:00:00 2001 From: houyi <1398559711@qq.com> Date: Thu, 25 Sep 2025 09:52:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=AB=98=E5=8E=8B-=E5=A4=87=E6=96=99?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=A1=E6=89=B9=E5=90=8E=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=AB=98=E5=8E=8BMES=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java | 1 - .../pickm/bp/rule/AfterApproveRuleHighpressureMes.java | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java index c1d2b94e..ec3605b5 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java @@ -27,7 +27,6 @@ public class PickmApproveBP { IRule pickmstatusFilterRule = new AfterApproveRuleSyncRZWMS(); processer.addAfterRule(pickmstatusFilterRule); //备料计划审批后推送高压MES - IRule pickmHighpressureMesRules = new AfterApproveRuleHighpressureMes(); processer.addAfterRule(new AfterApproveRuleHighpressureMes()); } diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java index 68172c85..9c2ae9b5 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java @@ -141,16 +141,16 @@ public class AfterApproveRuleHighpressureMes implements IRule { SerializerFeature.WriteMapNullValue, SerializerFeature.WriteNullStringAsEmpty ); - logger.error("gyMes-Agg-param = " + jsonStr); + logger.error("gyMes-Pickm-param = " + jsonStr); String baseUrl = configParams.get("mesBaseUrl"); - String requestUrl = baseUrl + configParams.get("productionOrderAdd"); - logger.error("gyMes-Agg-url = " + requestUrl); + String requestUrl = baseUrl + configParams.get("materialRequirementsAdd"); + logger.error("gyMes-Pickm-url = " + requestUrl); String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr); JSONObject resultObj = JSONObject.parseObject(result); - logger.error("gyMes-Agg-res = " + result); + logger.error("gyMes-Pickm-res = " + result); if (!"200".equals(resultObj.getString("code"))) { - logger.error("gyMes-Agg-error,result[" + resultObj.toJSONString() + "]"); + logger.error("gyMes-Pickm-error,result[" + resultObj.toJSONString() + "]"); throw new BusinessException("备料计划推送高压MES错误:" + resultObj.getString("msg")); } } From 9a9822963b36e7425ed40b4a904041785e52edde Mon Sep 17 00:00:00 2001 From: houyi <1398559711@qq.com> Date: Thu, 25 Sep 2025 16:14:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=AB=98=E5=8E=8B-=E5=A4=87=E6=96=99?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=A1=E6=89=B9=E5=90=8E=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=AB=98=E5=8E=8BMES=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule/AfterApproveRuleHighpressureMes.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java index 9c2ae9b5..a5e90a3a 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java @@ -61,7 +61,7 @@ public class AfterApproveRuleHighpressureMes implements IRule { for (AggPickmVO vo : useVOs) { PickmHeadVO pickmHeadVO = vo.getParentVO(); PickmItemVO[] itemVOS = (PickmItemVO[]) vo.getChildrenVO(); - // 判断物料的业务单元是否是箱变公司，不是则跳过 + // 判断物料的业务单元是否是高压公司，不是则跳过 String pkOrg = pickmHeadVO.getPk_org(); String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); if (checkIfOrg(orgCode, configParams)) { @@ -82,7 +82,7 @@ public class AfterApproveRuleHighpressureMes implements IRule { singleObj.put("bipParentProcessProductionOrderRowNum", pickmHeadVO.getVsourcebillrowno()); // 上级来源单据行号 singleObj.put("bipOriginProcessProductionOrderId", pickmHeadVO.getVfirstbillcode()); // 顶级来源单据号 singleObj.put("bipOriginProcessProductionOrderRowNum", pickmHeadVO.getVfirstbillrowno()); // 顶级来源单据行号 - singleObj.put("orderQuantity", pickmHeadVO.getNastnum()); // 订单数量（计划数量） + singleObj.put("orderQuantity", pickmHeadVO.getNastnum() != null ? pickmHeadVO.getNastnum().doubleValue() : null); // 订单数量（计划数量） singleObj.put("bomVersion", pickmHeadVO.getVbomversionnumber()); // bom版本 // 物料信息 String cpsql = "select code,name,graphid,pk_measdoc,materialspec from bd_material where pk_material = '" + pickmHeadVO.getCmaterialvid() + "' "; @@ -90,8 +90,9 @@ public class AfterApproveRuleHighpressureMes implements IRule { singleObj.put("productCode", mrl.get("code")); // 产品编码 singleObj.put("productName", mrl.get("name")); // 产品名称 - singleObj.put("intervalModel", mrl.get("materialspec")); // (物料的自定义字段) - singleObj.put("requiredDate", pickmHeadVO.getDmakedate()); // 需用日期 +// singleObj.put("intervalModel", mrl.get("materialspec")); // (物料的自定义字段) + singleObj.put("intervalModel", "（物料的自定义字段）"); // (物料的自定义字段) + singleObj.put("requiredDate", pickmHeadVO.getDmakedate().toString()); // 需用日期 String sql1 = " select user_name from sm_user where cuserid = '" + pickmHeadVO.getCreator() + "' "; String bipCreateBy = (String) baseDAO.executeQuery(sql1, new ColumnProcessor()); @@ -103,12 +104,13 @@ public class AfterApproveRuleHighpressureMes implements IRule { JSONObject itemObj = new JSONObject(); itemObj.put("bipChildId", item.getCpickm_bid()); // 子项主键ID - itemObj.put("bchkitemforwr", item.getBchkitemforwr()); // 完工齐套检查 - itemObj.put("lineNumber", item.getVrowno()); // 行号 - itemObj.put("quantityPerSet", item.getNunituseastnum()); // 单套数量（单位用量） - itemObj.put("reservedQuantity", item.getNatpastnum()); // 预留数量 - itemObj.put("cumulativePendingQuantity", item.getNshouldastnum()); // 累计待发数量 - itemObj.put("cumulativeIssuedQuantity", item.getNaccoutastnum()); // 累计出库数量 +// itemObj.put("bchkitemforwr", item.getBchkitemforwr()); // 完工齐套检查 + itemObj.put("bchkitemforwr", "Y"); // 完工齐套检查 + itemObj.put("quantityPerSet", item.getNunituseastnum() != null ? item.getNunituseastnum().doubleValue() : null); // 单套数量（单位用量） + itemObj.put("reservedQuantity", item.getNatpastnum() != null ? item.getNatpastnum().doubleValue() : null); // 预留数量 + itemObj.put("cumulativePendingQuantity", item.getNshouldastnum() != null ? item.getNshouldastnum().doubleValue() : null); // 累计待发数量 + itemObj.put("cumulativeIssuedQuantity", item.getNaccoutastnum() != null ? item.getNaccoutastnum().doubleValue() : null); // 累计出库数量 + itemObj.put("totalQuantity", item.getNplanoutnum() != null ? item.getNplanoutnum().doubleValue() : null); // 总数量（计划出库主数量） // 物料信息 String mrlsql = "select code,name,graphid,pk_measdoc,materialspec from bd_material where pk_material = '" + item.getCbmaterialid() + "' ";