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

生产订单审批后推送高压MES修改 优化

This commit is contained in:
houyi 2025-10-10 10:44:21 +08:00
parent 65760a591f
commit 5f12a542a5
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java
View File

@ -99,13 +99,13 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
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() + "' ";
String cpsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + pickmHeadVO.getCmaterialvid() + "' ";
Map<String, Object> mrl = (Map<String, Object>) baseDAO.executeQuery(cpsql, new MapProcessor());
singleObj.put("productCode", mrl.get("code")); // 产品编码
singleObj.put("productName", mrl.get("name")); // 产品名称
// singleObj.put("intervalModel", mrl.get("materialspec")); // (物料的自定义字段)
singleObj.put("intervalModel", "（物料的自定义字段）"); // (物料的自定义字段)
singleObj.put("intervalModel", mrl.get("materialtype")); // (物料的自定义字段)
// 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());
@ -126,15 +126,15 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
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() + "' ";
String mrlsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + item.getCbmaterialid() + "' ";
Map<String, Object> material = (Map<String, Object>) baseDAO.executeQuery(mrlsql, new MapProcessor());
itemObj.put("materialCode", material.get("code")); // 物料编码
itemObj.put("materialName", material.get("name")); // 物料名称
itemObj.put("drawingNumber", material.get("graphid")); // 图号
itemObj.put("drawingNumber", "计划信息组织"); // 图号
Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + material.get("pk_measdoc") + "' ");
itemObj.put("unit", unit); // 规格单位
// 生产信息
itemObj.put("intervalModel", material.get("materialspec")); // 产品类型
itemObj.put("intervalModel", material.get("materialtype")); // 产品类型
itemObj.put("lineNumber", String.valueOf(item.getVrowno())); // 行号
// 项目编码
String cprojectid = pickmHeadVO.getCprojectid();// 项目id
@ -168,12 +168,12 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
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() + "' ";
String cpsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + pickmHeadVO.getCmaterialvid() + "' ";
Map<String, Object> mrl = (Map<String, Object>) baseDAO.executeQuery(cpsql, new MapProcessor());
singleObj.put("productCode", mrl.get("code")); // 产品编码
singleObj.put("productName", mrl.get("name")); // 产品名称
// singleObj.put("intervalModel", mrl.get("materialspec")); // (物料的自定义字段)
// singleObj.put("intervalModel", mrl.get("materialtype")); // (物料的自定义字段)
singleObj.put("processCode", "（物料的自定义字段）"); // 产品编码的工序(物料的自定义字段)
singleObj.put("requiredDate", pickmHeadVO.getDmakedate().toString()); // 需用日期
String sql1 = " select user_name from sm_user where cuserid = '" + pickmHeadVO.getModifier() + "' ";
@ -194,15 +194,15 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
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() + "' ";
String mrlsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + item.getCbmaterialid() + "' ";
Map<String, Object> material = (Map<String, Object>) baseDAO.executeQuery(mrlsql, new MapProcessor());
itemObj.put("materialCode", material.get("code")); // 物料编码
itemObj.put("materialName", material.get("name")); // 物料名称
itemObj.put("drawingNumber", material.get("graphid")); // 图号
itemObj.put("drawingNumber", "计划信息组织"); // 图号
Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + material.get("pk_measdoc") + "' ");
itemObj.put("unit", unit); // 规格单位
// 生产信息
// itemObj.put("intervalModel", material.get("materialspec")); // 产品类型
itemObj.put("intervalModel", material.get("materialtype")); // 产品类型
itemObj.put("lineNumber", String.valueOf(item.getVrowno())); // 行号
// 项目编码
String cprojectid = pickmHeadVO.getCprojectid();// 项目id

8
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java
View File

@ -120,18 +120,18 @@ public class AfterApproveSyncHighpressureMesRule implements IRule<PMOAggVO> {
itemObj.put("bipOriginProcessProductionOrderRowNum", item.getVsrcrowno());
// 物料信息
String mrlsql = "select code,name,graphid,pk_measdoc,materialspec from bd_material where pk_material = '" + item.getCmaterialvid() + "' ";
String mrlsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + item.getCmaterialvid() + "' ";
Map<String, Object> mrl = (Map<String, Object>) baseDAO.executeQuery(mrlsql, new MapProcessor());
itemObj.put("materialCode", mrl.get("code")); // 物料编码
itemObj.put("materialName", mrl.get("name")); // 物料名称
itemObj.put("drawingNumber", mrl.get("graphid")); // ͼºÅ±àÂë graphid
itemObj.put("drawingNumber", "计划信息组织"); // 图号编码 graphid
// itemObj.put("drawingNumber", "1234");
Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + mrl.get("pk_measdoc") + "' ");
itemObj.put("unit", unit); // 单位 pk_measdoc
// 生产信息
itemObj.put("intervalModel", mrl.get("materialspec")); // ²úÆ·ÀàÐÍ
itemObj.put("intervalModel", mrl.get("materialtype")); // 产品类型
// itemObj.put("processCode", item.getProcedures()); // 工序编码
itemObj.put("lineNumber", String.valueOf(item.getVrowno())); // 行号
@ -185,7 +185,7 @@ public class AfterApproveSyncHighpressureMesRule implements IRule<PMOAggVO> {
itemObj.put("materialCode", mrl.get("code")); // 物料编码
itemObj.put("materialName", mrl.get("name")); // 物料名称
// itemObj.put("drawingNumber", mrl.get("graphid")); // 图号编码 graphid
itemObj.put("drawingNumber", mrl.get("graphid"));
itemObj.put("drawingNumber", "计划信息组织");
Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + mrl.get("pk_measdoc") + "' ");
itemObj.put("unit", unit); // 单位 pk_measdoc

3
uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java
View File

@ -109,7 +109,8 @@ public class MaterialToGyMesListener implements IBusinessListener {
singleObj.put("primaryUnit", unitMap.get("measrate").toString().split("/")[0]);
// 主单位
singleObj.put("materialUnit", unitMap.get("measrate").toString().split("/")[1]); // 单位
singleObj.put("drawingNumber", vo.getGraphid()); // ͼºÅ±àÂë
// singleObj.put("drawingNumber", vo.getGraphid()); // 图号编码
singleObj.put("drawingNumber", "计划信息组织"); // 图号编码("计划信息组织"是高压的图号)
singleObj.put("enableStatus", enablestate - 1); // 启用状态 0 未启动 1 已启动 2 已停用
singleObj.put("materialType", stockMap.get("martype")); // 物料类型编码
singleObj.put("batchManagement", stockMap.get("wholemanaflag")); // 批次管理

3
uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
View File

@ -141,7 +141,8 @@ public class MaterialToGyMesListener implements IBusinessListener {
singleObj.put("primaryUnit", unitMap.get("measrate").toString().split("/")[0]);
// 主单位
singleObj.put("materialUnit", unitMap.get("measrate").toString().split("/")[1]); // 单位
singleObj.put("drawingNumber", vo.getGraphid()); // ͼºÅ±àÂë
// singleObj.put("drawingNumber", vo.getGraphid()); // 图号编码
singleObj.put("drawingNumber", "计划信息组织"); // 图号编码("计划信息组织"是高压的图号)
singleObj.put("enableStatus", enablestate - 1); // 启用状态 0 未启动 1 已启动 2 已停用
singleObj.put("materialType", stockMap.get("martype")); // 物料类型编码
singleObj.put("batchManagement", stockMap.get("wholemanaflag")); // 批次管理