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 a5e90a3a..6492c0e1 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 @@ -6,17 +6,21 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import nc.bs.dao.BaseDAO; +import nc.bs.dao.DAOException; import nc.bs.logging.Log; import nc.bs.trade.business.HYPubBO; +import nc.bs.trade.business.HYSuperDMO; import nc.bs.uapbd.util.MyHelper; import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; import nc.impl.pubapp.pattern.rule.IRule; import nc.jdbc.framework.processor.ColumnProcessor; import nc.jdbc.framework.processor.MapProcessor; +import nc.vo.bd.defdoc.DefdocVO; import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.mmpac.pickm.entity.PickmHeadVO; import nc.vo.mmpac.pickm.entity.PickmItemVO; import nc.vo.org.OrgVO; +import nc.vo.pmpub.project.ProjectHeadVO; import nc.vo.pub.BusinessException; import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.scmpub.util.ArrayUtil; @@ -78,9 +82,9 @@ public class AfterApproveRuleHighpressureMes implements IRule { singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号 singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号 - singleObj.put("bipParentProcessProductionOrderId", pickmHeadVO.getVsourcebillcode()); // 上级来源单据号 - singleObj.put("bipParentProcessProductionOrderRowNum", pickmHeadVO.getVsourcebillrowno()); // 上级来源单据行号 - singleObj.put("bipOriginProcessProductionOrderId", pickmHeadVO.getVfirstbillcode()); // 顶级来源单据号 + singleObj.put("bipParentProcessProductionOrderId", pickmHeadVO.getVfirstbillcode()); // 上级来源单据号 + singleObj.put("bipParentProcessProductionOrderRowNum", pickmHeadVO.getVfirstbillrowno()); // 上级来源单据行号 + singleObj.put("bipOriginProcessProductionOrderId", pickmHeadVO.getVsalebillcode()); // 顶级来源单据号 singleObj.put("bipOriginProcessProductionOrderRowNum", pickmHeadVO.getVfirstbillrowno()); // 顶级来源单据行号 singleObj.put("orderQuantity", pickmHeadVO.getNastnum() != null ? pickmHeadVO.getNastnum().doubleValue() : null); // 订单数量（计划数量） singleObj.put("bomVersion", pickmHeadVO.getVbomversionnumber()); // bom版本 @@ -123,6 +127,15 @@ public class AfterApproveRuleHighpressureMes implements IRule { // 生产信息 itemObj.put("intervalModel", material.get("materialspec")); // 产品类型 itemObj.put("lineNumber", String.valueOf(item.getVrowno())); // 行号 + // 项目编码 + String cprojectid = pickmHeadVO.getCprojectid();// 项目id + String projectCode = MyHelper.getStrValByCondition(ProjectHeadVO.getDefaultTableName(), ProjectHeadVO.PROJECT_CODE, + ProjectHeadVO.PK_PROJECT + " = '" + cprojectid + "'"); + singleObj.put("cbprojectid", projectCode); + // 生产厂商 + String productor = item.getCbproductorid();// 生产厂商id + String productorCode = getDefCode("Defdoc-BD006_0xx", item.getCbproductorid()); + singleObj.put("cbproductorid", productorCode); contentArray.add(itemObj); // 将子项添加到数组 } @@ -134,6 +147,24 @@ public class AfterApproveRuleHighpressureMes implements IRule { pushData(list); } + /** + * 获取自定义项信息 + */ + 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; + + } + /** * 推送同步数据 */ diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncUpdateHighpressureMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncUpdateHighpressureMesRule.java new file mode 100644 index 00000000..7e11e082 --- /dev/null +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncUpdateHighpressureMesRule.java @@ -0,0 +1,188 @@ +package nc.bs.mmpac.pmo.pac0002.bp.rule; + + +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.trade.business.HYPubBO; +import nc.bs.uapbd.util.MyHelper; +import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; +import nc.impl.pubapp.pattern.rule.IRule; +import nc.jdbc.framework.processor.ColumnProcessor; +import nc.jdbc.framework.processor.MapProcessor; +import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO; +import nc.vo.mmpac.pmo.pac0002.entity.PMOHeadVO; +import nc.vo.mmpac.pmo.pac0002.entity.PMOItemVO; +import nc.vo.org.OrgVO; +import nc.vo.pub.BusinessException; +import nc.vo.pubapp.pattern.exception.ExceptionUtils; +import nc.vo.scmpub.util.ArrayUtil; + +import java.util.Map; + +/** + * 流程生产订单审批后推送高压MES修改 + * + * @author lihao + * @date 2025/9/1 + */ +public class AfterApproveSyncUpdateHighpressureMesRule implements IRule { + + private static final String LOG_INFO_NAME = "gymeslog"; + private static final Log logger = Log.getInstance(LOG_INFO_NAME); + private Map configParams; + + @Override + public void process(PMOAggVO[] pmoAggVOS) { + if (ArrayUtil.isEmpty(pmoAggVOS)) { + return; + } + configParams = MyHelper.getConfigParams("gy-config", null); + try { + buildSyncData(pmoAggVOS); + } catch (Exception e) { + logger.error("同步生产订单到高压MES系统失败: " + e.getMessage(), e); + ExceptionUtils.wrappException(e); + } + } + + /** + * 构建同步数据 + */ + private void buildSyncData(PMOAggVO[] useVOs) throws BusinessException { + BaseDAO baseDAO = new BaseDAO(); + + HYPubBO hybo = new HYPubBO(); + JSONObject list = new JSONObject(); + JSONArray jsonArray = new JSONArray(); + for (PMOAggVO vo : useVOs) { + PMOHeadVO pmoHeadVO = vo.getParentVO(); + PMOItemVO[] itemVOS = vo.getChildrenVO(); + // 判断物料的业务单元是否是箱变公司，不是则跳过 + String pkOrg = pmoHeadVO.getPk_org(); + String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); + if (checkIfOrg(orgCode, configParams)) { + continue; + } + JSONObject singleObj = new JSONObject(); + singleObj.put("bipProcessProductionOrderId", pmoHeadVO.getVbillcode()); + singleObj.put("bipId", pmoHeadVO.getCpmohid());// 主键ID +// singleObj.put("orderQuantity", pmoHeadVO.getPlanQuantity()); // 订单数量（计划数量） + singleObj.put("billDate", pmoHeadVO.getDbilldate().toString()); // 单据日期 + singleObj.put("orderVersion", pmoHeadVO.getVersion()); // 版本号 + singleObj.put("orderTranType", pmoHeadVO.getVtrantypecode()); // 订单交易类型 + String sql1 = " select user_name from sm_user where cuserid = '" + pmoHeadVO.getModifier() + "' "; + String bipCreateBy = (String) baseDAO.executeQuery(sql1, new ColumnProcessor()); + + singleObj.put("bipUpdateBy", bipCreateBy); // 修改人ID + + // 创建子项数组 + JSONArray contentArray = new JSONArray(); + for (PMOItemVO item : itemVOS) { + JSONObject itemObj = new JSONObject(); + + // 填充子项基础信息 + + String sql = " select pk_defdoclist from bd_defdoclist where code='zdy-001' and dr=0 "; + String o = (String) baseDAO.executeQuery(sql, new ColumnProcessor()); + + Object contractNum = hybo.findColValue("bd_defdoc", "code", " (pk_defdoclist = '" + o + "' and pk_defdoc='" + item.getVdef1() + "') "); + + itemObj.put("contractNum", contractNum); // 合同编号 +// itemObj.put("cwarehouseid", item.getAttributeValue("vbdef35")); // 仓库编号 + Object pk_project = hybo.findColValue("bd_project", "project_name", " pk_project = '" + item.getCprojectid() + "' "); + + itemObj.put("entryName", pk_project); // 项目名称 + + // 部门信息 + String deptsql = " select code,name from org_dept where pk_dept='" + item.getCdeptid() + "' and dr=0 "; + Map tr = (Map) baseDAO.executeQuery(deptsql, new MapProcessor()); + itemObj.put("bipDeptName", tr.get("name")); // 生产部门名称 + itemObj.put("bipDeptId", tr.get("code")); // 生产部门编码 + + // 日期信息 + itemObj.put("requiredDate", item.getTrequiredate().toString()); // 需用日期 + + itemObj.put("bipParentProcessProductionOrderId", item.getVparentbillcode()); + itemObj.put("bipParentProcessProductionOrderRowNum", item.getVparentmorowno()); + itemObj.put("bipOriginProcessProductionOrderId", item.getVsrccode()); + itemObj.put("bipOriginProcessProductionOrderRowNum", item.getVsrcrowno()); + + // 物料信息 + String mrlsql = "select code,name,graphid,pk_measdoc,materialspec from bd_material where pk_material = '" + item.getCmaterialvid() + "' "; + Map mrl = (Map) 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",mrl.get("graphid")); + 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("processCode", item.getProcedures()); // 工序编码 + itemObj.put("lineNumber", String.valueOf(item.getVrowno())); // 行号 + + // 库存信息 + itemObj.put("demandInventoryOrganization", item.getCrequireorg()); // 需求库存组织 + itemObj.put("plannedInputQuantity",(int) item.getNplanputastnum().doubleValue()); // 计划投入量 + itemObj.put("plannedOutputQuantity",(int)item.getNmmastnum().doubleValue()); // 计划产出量 + itemObj.put("plannedStartTime", item.getTplanstarttime().toString()); // 计划开工时间 + itemObj.put("plannedCompletionTime", item.getTplanendtime().toString()); // 计划完工时间 + itemObj.put("customerMaterialCode", item.getCcustmaterialid()); // 客户物料编码 + itemObj.put("productionBatch", item.getCbatchid()); // 生产批次(按BIP格式) + itemObj.put("productionBatchNumber", item.getVbatchcode()); // 生产批次号(按BIP格式) + + contentArray.add(itemObj); // 将子项添加到数组 + } + + singleObj.put("itemList", contentArray); // 将子项数组添加到主对象 + jsonArray.add(singleObj); + list.put("list", jsonArray); + } + pushData(list); + } + + /** + * 推送同步数据 + */ + private void pushData(JSONObject param) throws BusinessException { + // 转json字符串的时候保留null值 + String jsonStr = JSON.toJSONString(param, + SerializerFeature.WriteMapNullValue, + SerializerFeature.WriteNullStringAsEmpty + ); + logger.error("gyMes-PMO-param = " + jsonStr); + String baseUrl = configParams.get("mesBaseUrl"); + String requestUrl = baseUrl + configParams.get("productionOrderUpdate"); + logger.error("gyMes-PMO-url = " + requestUrl); + String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr); + JSONObject resultObj = JSONObject.parseObject(result); + logger.error("gyMes-PMO-res = " + result); + + if (!"200".equals(resultObj.getString("code"))) { + logger.error("gyMes-PMO-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; + } + + +} diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/pluginpoint/PmoSerialNoImportProcess.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/pluginpoint/PmoSerialNoImportProcess.java index 6501c5b0..6c3b2199 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/pluginpoint/PmoSerialNoImportProcess.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/pluginpoint/PmoSerialNoImportProcess.java @@ -13,6 +13,7 @@ import nc.bs.trade.business.HYPubBO; import nc.impl.pubapp.pattern.data.bill.BillQuery; import nc.jdbc.framework.processor.MapProcessor; import nc.pubitf.sn.doc.ISnService; +import nc.pubitf.sn.doc.param.ISnDocParam; import nc.pubitf.sn.doc.param.SnDocParam; import nc.vo.ml.NCLangRes4VoTransl; import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO; @@ -121,16 +122,29 @@ public class PmoSerialNoImportProcess extends AbstractImportProceeWithContext { // 之前序列号全部设置为删除状态 // int num = dao.executeUpdate("update mm_pmo_serialno set dr = 1 where cmoid = '" + itemvo.getCmoid() + "'"); // NCCForUAPLogger.debug("PmoSerialNoImportProcess-num = " + num); - String insert = hy.insert(vo); - NCCForUAPLogger.debug("PmoSerialNoImportProcess-insert = " + insert); - if (insert != null && !insert.isEmpty()) { - PMOSerialNoVO pmoSerialNoVO = (PMOSerialNoVO) hy.queryByPrimaryKey(PMOSerialNoVO.class, insert); - // 新增序列号档案 - List saveParams = new ArrayList<>(); - this.construcParams(saveParams, headvo, itemvo, pmoSerialNoVO, null); - ISnService service = NCLocator.getInstance().lookup(ISnService.class); - service.saveSerialnos(saveParams.toArray(new SnDocParam[0])); + // 新增序列号档案 + List saveParams = new ArrayList<>(); + this.construcParams(saveParams, headvo, itemvo, vo, null); + ISnService service = NCLocator.getInstance().lookup(ISnService.class); + ISnDocParam[] iSnDocParams = service.saveSerialnos(saveParams.toArray(new SnDocParam[0])); + if (iSnDocParams != null && iSnDocParams.length > 0) { + ISnDocParam iSnDocParam = iSnDocParams[0]; + vo.setCserialnoid(iSnDocParam.getPk_serialno());// 序列号档案id + String insert = hy.insert(vo); + NCCForUAPLogger.debug("PmoSerialNoImportProcess-insert = " + insert); + /*if (insert != null && !insert.isEmpty()) { + String cmoid = itemvo.getCmoid();// 生产订单明细id + String sql = "cmoid = '" + cmoid + "'"; + PMOSerialNoVO[] objects = (PMOSerialNoVO[]) hy.queryByCondition(PMOSerialNoVO.class, sql); + for (PMOSerialNoVO serialNoVO : objects) { + String vsndef3 = serialNoVO.getVsndef3(); + if (!"Y".equals(vsndef3)) { + + } + } + }*/ } + // NCLocator.getInstance().lookup(IPMOMaintainService.class).insert(resvo); } catch (BusinessException e) { ExceptionUtils.wrappException(e); diff --git a/so/src/private/nc/bs/so/m30/rule/approve/AfterSoSyncRuleUpdateGyMes.java b/so/src/private/nc/bs/so/m30/rule/approve/AfterSoSyncRuleUpdateGyMes.java new file mode 100644 index 00000000..1cff53d0 --- /dev/null +++ b/so/src/private/nc/bs/so/m30/rule/approve/AfterSoSyncRuleUpdateGyMes.java @@ -0,0 +1,188 @@ +package nc.bs.so.m30.rule.approve; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; +import nc.bs.dao.BaseDAO; +import nc.bs.dao.DAOException; +import nc.bs.logging.Log; +import nc.bs.trade.business.HYPubBO; +import nc.bs.trade.business.HYSuperDMO; +import nc.bs.uapbd.util.MyHelper; +import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; +import nc.impl.pubapp.pattern.rule.IRule; +import nc.jdbc.framework.processor.ColumnProcessor; +import nc.jdbc.framework.processor.MapProcessor; +import nc.vo.bd.defdoc.DefdocVO; +import nc.vo.org.OrgVO; +import nc.vo.pub.BusinessException; +import nc.vo.pubapp.pattern.exception.ExceptionUtils; +import nc.vo.so.m30.entity.SaleOrderBVO; +import nc.vo.so.m30.entity.SaleOrderHVO; +import nc.vo.so.m30.entity.SaleOrderVO; +import nccloud.baseapp.core.log.NCCForUAPLogger; + +import java.util.Map; + +/** + * 销售订单推送高压mes修改 + * + * @author houyi + */ +public class AfterSoSyncRuleUpdateGyMes 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/saleOrderUpdate"; + 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(); + 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 customerSql = " select name from bd_customer where dr = 0 and pk_customer = '" + hvo.getCcustomerid() + "' "; + String customerName = (String) baseDAO.executeQuery(customerSql, new ColumnProcessor()); + // 创建人 + String userSql = " select user_name from sm_user where dr = 0 and cuserid = '" + hvo.getCreviserid() + "' "; + String createName = (String) baseDAO.executeQuery(userSql, new ColumnProcessor()); + // 合同编号 + String vdef6 = hvo.getVdef6(); + String contractNum = getDefCode("zdy-001", vdef6); + for (SaleOrderBVO item : itemVOS) { + Object projectName =getDefName("zdy-001", vdef6); +// Object projectName = hybo.findColValue(ProjectHeadVO.getDefaultTableName(), ProjectHeadVO.PROJECT_NAME, ProjectHeadVO.PK_PROJECT + " = '" + item.getCprojectid() + "' "); + String wlsql = " select code,name,graphid from bd_material where dr = 0 and pk_material = '" + item.getCmaterialvid() + "' "; + Map mrlMap = (Map) baseDAO.executeQuery(wlsql, new MapProcessor()); + + JSONObject itemObj = new JSONObject(); + itemObj.put("contractNum", contractNum);// 合同编码 + itemObj.put("bipOrderId", hvo.getVbillcode());// 销售订单号 + itemObj.put("entryName", projectName);// 项目名称 + itemObj.put("productQuantity", item.getNastnum().doubleValue());// 数量 + itemObj.put("materialCode", mrlMap.get("code"));// 物料编码 + itemObj.put("materialName", mrlMap.get("name"));// 物料名称 + itemObj.put("drawingNumber", mrlMap.get("graphid"));// 图号 + itemObj.put("supplyDate", item.getDreceivedate().toString());// 供货日期-要求收货日期 + itemObj.put("remark", item.getVrownote());// 备注 + itemObj.put("bipUpdateBy", createName);// 修改人 + itemObj.put("customers", customerName);// 客户 + pushData(itemObj); + } + /*{ + "contractNum": "TZF2520201225 合同编码", + "bipOrderId": "TZF2520201225 销售的订单号", + "entryName": "大唐河北故城50MW风电项目", + "productQuantity": "数量个数 例如 1", + "materialCode": "物料编码", + "materialName": "物料名称", + "drawingNumber": "图号编码 计划信息组织是高压的图号", //计划信息组织是高压的图号 + "supplyDate": "2025-01-03 11:09:22", + "remark": "备注", + "bipUpdateBy": "修改人ID", + "customers": "客户 例如贵州电网xxx" + }*/ + } + } + + /** + * 推送同步数据 + */ + 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/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java index 229a6057..e51ebbde 100644 --- a/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java +++ b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPlmDownloadAction.java @@ -44,6 +44,7 @@ public class MaterialPlmDownloadAction implements ICommonAction { private String plmBaseUrl = ""; private String plmUser = ""; private String token = ""; + private String passwd = ""; private static final String tokenUrl = "/sipmweb/api/oauth"; // 根据物料编码获取零部件ID private String materialIdUrl = "/sipmweb/api/{rid}/search/{t}"; @@ -94,6 +95,7 @@ public class MaterialPlmDownloadAction implements ICommonAction { } plmBaseUrl = configParams.get("plmBaseUrl"); plmUser = configParams.get("plmUser"); + passwd = configParams.getOrDefault("passwd", ""); token = getToken(); // 无论单个还是多个物料，均打包为ZIP（原单个物料返回单文件，无法同时返回两类文件） @@ -198,6 +200,9 @@ public class MaterialPlmDownloadAction implements ICommonAction { private String getToken() throws IOException, BusinessException { Map tokenMap = new HashMap<>(); tokenMap.put("uname", plmUser); + if (!"passwd".equals(passwd) && !"null".equals(passwd) && !"~".equals(passwd)) { + tokenMap.put("passwd", passwd); + } tokenMap.put("f", "true"); String tokenStr = doGet(plmBaseUrl + tokenUrl, tokenMap); JSONObject jsonObject = JSONObject.parseObject(tokenStr); diff --git a/uapbd/src/private/nc/impl/bd/material/stock/MaterialStockAssignToOrgService.java b/uapbd/src/private/nc/impl/bd/material/stock/MaterialStockAssignToOrgService.java new file mode 100644 index 00000000..24e82b86 --- /dev/null +++ b/uapbd/src/private/nc/impl/bd/material/stock/MaterialStockAssignToOrgService.java @@ -0,0 +1,400 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package nc.impl.bd.material.stock; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import nc.bs.bd.assignservice.BDAssignToOrgService; +import nc.bs.bd.pub.util.BaseDocVoConvertUtil; +import nc.bs.bd.util.ExBeanNameTabVOMapUtil; +import nc.bs.bd.util.TabVOInfoUtil; +import nc.bs.dao.DAOException; +import nc.bs.framework.common.NCLocator; +import nc.itf.bd.material.pf.IMaterialPfQueryService; +import nc.jdbc.framework.SQLParameter; +import nc.jdbc.framework.processor.ColumnListProcessor; +import nc.vo.bd.errorlog.ErrorLogUtil; +import nc.vo.bd.material.MarasstIndexCalculdateUtil; +import nc.vo.bd.material.MaterialPFBaseVO; +import nc.vo.bd.material.MaterialVO; +import nc.vo.bd.material.marassistant.MarAssistantVO; +import nc.vo.bd.material.pf.MaterialPfVO; +import nc.vo.bd.material.stock.MaterialStockPFVO; +import nc.vo.bd.material.stock.MaterialStockVO; +import nc.vo.bd.material.stock.MaterialWarhPFVO; +import nc.vo.bd.material.stock.MaterialWarhVO; +import nc.vo.bd.pub.sqlutil.BDSqlInUtil; +import nc.vo.pub.BusinessException; +import nc.vo.pub.SuperVO; +import nc.vo.pub.lang.UFBoolean; +import nc.vo.util.BDVOEntityUtil; +import nccloud.commons.collections.CollectionUtils; +import nccloud.commons.collections.MapUtils; +import nccloud.commons.lang.ArrayUtils; +import nccloud.commons.lang.StringUtils; +import org.apache.commons.collections4.Predicate; + +public class MaterialStockAssignToOrgService extends BDAssignToOrgService { + private List codeList = new ArrayList(); + + public MaterialStockAssignToOrgService() { + } + + public void init() { + super.init(); + this.addQueryBaseField(new String[]{"materialmgt"}); + this.addQueryBaseField(new String[]{"fee"}); + this.addQueryBaseField(new String[]{"discountflag"}); + this.addQueryBaseField(new String[]{"pk_measdoc"}); + } + + public void copyAssignData(SuperVO copyBaseVO, String pk_source, ErrorLogUtil util) throws BusinessException { + this.queryMarasstCodesByFrameID(copyBaseVO); + super.copyAssignData(copyBaseVO, pk_source, util); + } + + public void createVersionAssignData(SuperVO copyBaseVO, String pk_source, ErrorLogUtil util) throws BusinessException { + this.queryMarasstCodesByFrameID(copyBaseVO); + super.createVersionAssignData(copyBaseVO, pk_source, util); + } + + private void queryMarasstCodesByFrameID(SuperVO baseVO) throws DAOException { + String var10000 = MarAssistantVO.getDefaultTableName(); + String sql = "select code from " + var10000 + " where pk_marasstframe in (select pk_marasstframe from " + MaterialVO.getDefaultTableName() + " where pk_material=?)"; + SQLParameter param = new SQLParameter(); + param.addParam(baseVO.getPrimaryKey()); + List codes = (List)this.getBaseDAO().executeQuery(sql, param, new ColumnListProcessor()); + this.codeList.addAll(codes); + } + + public void setDefaultValue(SuperVO assignedVO, SuperVO baseVO) throws BusinessException { + MaterialStockVO stockVO = (MaterialStockVO)assignedVO; + if (StringUtils.isBlank(stockVO.getMartype())) { + stockVO.setMartype("MR"); + } + + if (stockVO.getSerialmanaflag() == null) { + stockVO.setSerialmanaflag(UFBoolean.FALSE); + } + + if (stockVO.getWholemanaflag() == null) { + stockVO.setWholemanaflag(UFBoolean.FALSE); + } + + if (stockVO.getQualityunit() == null) { + stockVO.setQualityunit(2); + } + + MaterialVO vo = (MaterialVO)baseVO; + if (this.isEquipment(vo)) { + stockVO.setSerialmanaflag(UFBoolean.TRUE); + stockVO.setSernumunit(vo.getPk_measdoc()); + } + + if (stockVO.getSerialmanaflag() != null && UFBoolean.TRUE.equals(stockVO.getSerialmanaflag())) { + stockVO.setSernumunit(vo.getPk_measdoc()); + } + + if (stockVO.getRemain() == null || !stockVO.getRemain().booleanValue()) { + stockVO.setRemain(UFBoolean.TRUE); + } + + if (this.isFeeOrDiscount((MaterialVO)baseVO)) { + stockVO.setIscancelremain(UFBoolean.FALSE); + stockVO.setRemainday((Integer)null); + stockVO.setRemain(UFBoolean.FALSE); + } + + if (stockVO.getWholemanaflag() == null) { + stockVO.setWholemanaflag(UFBoolean.FALSE); + } + + if (stockVO.getQualitymanflag() == null) { + stockVO.setQualitymanflag(UFBoolean.FALSE); + } + + if (stockVO.getSerialmanaflag() == null) { + stockVO.setSerialmanaflag(UFBoolean.FALSE); + } + + if (stockVO.getIsprimarybarcode() == null) { + stockVO.setIsprimarybarcode(UFBoolean.FALSE); + } + + if (stockVO.getIsmngstockbygrswt() == null) { + stockVO.setIsmngstockbygrswt(UFBoolean.FALSE); + } + + if (stockVO.getAutobalancemeas() == null) { + stockVO.setAutobalancemeas(UFBoolean.FALSE); + } + + if (stockVO.getIsstorebyconvert() == null) { + stockVO.setIsstorebyconvert(UFBoolean.FALSE); + } + + if (stockVO.getOuttrackin() == null) { + stockVO.setOuttrackin(UFBoolean.FALSE); + } + + if (stockVO.getNegallowed() == null) { + stockVO.setNegallowed(UFBoolean.FALSE); + } + + if (stockVO.getIsautoatpcheck() == null) { + stockVO.setIsautoatpcheck(UFBoolean.TRUE); + } + + if (stockVO.getPeriodiccheck() == null) { + stockVO.setPeriodiccheck(UFBoolean.FALSE); + } + + if (stockVO.getIsretfreeofchk() == null) { + stockVO.setIsretfreeofchk(UFBoolean.TRUE); + } + + if (stockVO.getIsretinstobychk() == null) { + stockVO.setIsretinstobychk(UFBoolean.FALSE); + } + + if (stockVO.getStockbycheck() == null) { + stockVO.setStockbycheck(UFBoolean.FALSE); + } + + if (stockVO.getIselementcheck() == null) { + stockVO.setIselementcheck(UFBoolean.FALSE); + } + + if (stockVO.getIscancelremain() == null) { + stockVO.setIscancelremain(UFBoolean.TRUE); + } + + if (stockVO.getAtpinpray() == null) { + stockVO.setAtpinpray(UFBoolean.TRUE); + } + + if (stockVO.getAtpinpotransit() == null) { + stockVO.setAtpinpotransit(UFBoolean.TRUE); + } + + if (stockVO.getAtpinonreceive() == null) { + stockVO.setAtpinonreceive(UFBoolean.TRUE); + } + + if (stockVO.getAtpintotransit() == null) { + stockVO.setAtpintotransit(UFBoolean.TRUE); + } + + if (stockVO.getAtpinprod() == null) { + stockVO.setAtpinprod(UFBoolean.TRUE); + } + + if (stockVO.getAtpinsepprod() == null) { + stockVO.setAtpinsepprod(UFBoolean.TRUE); + } + + if (stockVO.getAtpinscoutorder() == null) { + stockVO.setAtpinscoutorder(UFBoolean.TRUE); + } + + if (stockVO.getAtpintransfer() == null) { + stockVO.setAtpintransfer(UFBoolean.TRUE); + } + + if (stockVO.getAtpinsalepromise() == null) { + stockVO.setAtpinsalepromise(UFBoolean.TRUE); + } + + if (stockVO.getAtadorderprod() == null) { + stockVO.setAtadorderprod(UFBoolean.TRUE); + } + + if (stockVO.getAtpoutwaitissue() == null) { + stockVO.setAtpoutwaitissue(UFBoolean.TRUE); + } + + if (stockVO.getAtpouttoorder() == null) { + stockVO.setAtpouttoorder(UFBoolean.TRUE); + } + + if (stockVO.getAtpoutpick() == null) { + stockVO.setAtpoutpick(UFBoolean.TRUE); + } + + if (stockVO.getAtpoutrepair() == null) { + stockVO.setAtpoutrepair(UFBoolean.TRUE); + } + + if (stockVO.getAtpoutapply() == null) { + stockVO.setAtpoutapply(UFBoolean.TRUE); + } + + if (stockVO.getAtpsublendin() == null) { + stockVO.setAtpsublendin(UFBoolean.TRUE); + } + + if (stockVO.getAtpsubfreeze() == null) { + stockVO.setAtpsubfreeze(UFBoolean.TRUE); + } + + if (stockVO.getAtpbybatch() == null) { + stockVO.setAtpbybatch(UFBoolean.FALSE); + } + + if (stockVO.getAtpbyinventory() == null) { + stockVO.setAtpbyinventory(UFBoolean.FALSE); + } + + if (stockVO.getAtpinimptbgn() == null) { + stockVO.setAtpinimptbgn(UFBoolean.FALSE); + } + + if (stockVO.getAtpinimpdetail() == null) { + stockVO.setAtpinimpdetail(UFBoolean.FALSE); + } + + if (stockVO.getAtpoutexpbgn() == null) { + stockVO.setAtpoutexpbgn(UFBoolean.FALSE); + } + + if (stockVO.getAtpoutexpdetail() == null) { + stockVO.setAtpoutexpdetail(UFBoolean.FALSE); + } + + if (stockVO.getAtpouttrancontract() == null) { + stockVO.setAtpouttrancontract(UFBoolean.FALSE); + } + + if (stockVO.getAtpouttrandetail() == null) { + stockVO.setAtpouttrandetail(UFBoolean.FALSE); + } + + if (stockVO.getRemainday() == null) { + stockVO.setRemainday(30); + } + + this.fixChildVOFields(stockVO); + + for(int i = 2; i <= 16; ++i) { + String newIndex = MarasstIndexCalculdateUtil.getCalculateNewIndex(Integer.toString(i)); + String key = "freeasst" + newIndex; + if (!this.codeList.contains(newIndex) || stockVO.getAttributeValue(key) == null) { + stockVO.setAttributeValue(key, UFBoolean.FALSE); + } + } + + } + + private boolean isEquipment(MaterialVO vo) { + Integer materialmgt = vo.getMaterialmgt(); + return materialmgt != null && materialmgt == 2; + } + + private boolean isFeeOrDiscount(MaterialVO vo) { + boolean free = vo.getFee().booleanValue(); + boolean discount = vo.getDiscountflag().booleanValue(); + return free || discount; + } + + private void fixChildVOFields(MaterialStockVO vo) { + MaterialWarhVO[] warhs = vo.getMaterialwarh(); + if (warhs != null && warhs.length > 0) { + for(int i = 0; i < warhs.length; ++i) { + warhs[i].setPk_material(vo.getPk_material()); + } + } + + } + + protected void loadPfTabInfo(List pfpkList, Map needToAssignBaseInfoMap) throws BusinessException { + if (!CollectionUtils.isEmpty(pfpkList) && !needToAssignBaseInfoMap.isEmpty()) { + String where = BDSqlInUtil.formInSQLWithoutAnd("pk_material_pf", (String[])pfpkList.toArray(new String[0]), false); + IMaterialPfQueryService materialPfQueryService = (IMaterialPfQueryService)NCLocator.getInstance().lookup(IMaterialPfQueryService.class); + MaterialPfVO[] pfvos = materialPfQueryService.queryMaterialPfVOs((String[])pfpkList.toArray(new String[0])); + if (pfvos != null && pfvos.length > 0) { + for(MaterialPfVO pfVO : pfvos) { + MaterialPFBaseVO marterialpfbaseVO = pfVO.getMaterialpfBase(); + MaterialVO marterialVO = (MaterialVO)BaseDocVoConvertUtil.convertVO(marterialpfbaseVO, new MaterialVO()); + Map> exbeanname_tabvo_map = marterialpfbaseVO.getExbeanname_tabvo_map(); + if (needToAssignBaseInfoMap.containsKey(marterialVO.getPk_material()) && !MapUtils.isEmpty(exbeanname_tabvo_map)) { + MaterialVO basevo = (MaterialVO)needToAssignBaseInfoMap.get(marterialVO.getPk_material()); + ExBeanNameTabVOMapUtil.setExbeanname_tabvo_map(basevo, exbeanname_tabvo_map); + } + } + + } + } + } + + protected void setTabInfo(SuperVO assignedVO, SuperVO basevo) throws BusinessException { + MaterialVO mvo = (MaterialVO)basevo; + MaterialStockVO mfivo = (MaterialStockVO)assignedVO; + String assginorg = mfivo.getPk_org(); + List tabvos = this.extractedTabVOFromBaseVO(mvo); + if (!CollectionUtils.isEmpty(tabvos)) { + final String[] toRemoveFields = new String[]{"pk_material", "pk_materialstock", "modifiedtime", "modifier"}; + List fieldlist = (List)CollectionUtils.select(Arrays.asList(assignedVO.getAttributeNames()), new Predicate() { + public boolean evaluate(Object object) { + String attrName = (String)object; + return !ArrayUtils.contains(toRemoveFields, attrName); + } + }); + String[] fields = (String[])fieldlist.toArray(new String[0]); + + for(SuperVO tabvo : tabvos) { + String pk_org = (String)tabvo.getAttributeValue("pk_org"); + if (StringUtils.equals(pk_org, assginorg)) { + BDVOEntityUtil.copyVOByVO(mfivo, fields, tabvo, fields); + if (tabvo.getClass().getName().equals(MaterialStockVO.class.getName())) { + MaterialStockVO stockVO = (MaterialStockVO)tabvo; + this.dealMaterialWarhVOPks(stockVO.getMaterialwarh(), mvo); + mfivo.setMaterialwarh(stockVO.getMaterialwarh()); + } else if (tabvo.getClass().getName().equals(MaterialStockPFVO.class.getName())) { + MaterialStockPFVO stockVO = (MaterialStockPFVO)tabvo; + MaterialWarhPFVO[] warhs = stockVO.getMaterialwarh(); + if (warhs != null && warhs.length > 0) { + List list = new ArrayList(); + + for(MaterialWarhPFVO bindvo : warhs) { + list.add((MaterialWarhVO)BaseDocVoConvertUtil.convertVO(bindvo, new MaterialWarhVO())); + } + + this.dealMaterialWarhVOPks((MaterialWarhVO[])list.toArray(new MaterialWarhVO[0]), mvo); + mfivo.setMaterialwarh((MaterialWarhVO[])list.toArray(new MaterialWarhVO[0])); + } + } + break; + } + } + + } + } + + private void dealMaterialWarhVOPks(MaterialWarhVO[] vos, MaterialVO mvo) { + if (!ArrayUtils.isEmpty(vos)) { + for(MaterialWarhVO vo : vos) { + vo.setPk_material(mvo.getPk_material()); + vo.setPrimaryKey((String)null); + vo.setStatus(2); + } + } + + } + + private String getExbeanname() { + return TabVOInfoUtil.getExbeanNameByClazz(MaterialStockVO.class); + } + + private Map> getExbeanname_tabvo_map(MaterialVO marvo) { + return ExBeanNameTabVOMapUtil.getExbeanname_tabvo_map(marvo); + } + + private List extractedTabVOFromBaseVO(MaterialVO marvo) { + return (List)this.getExbeanname_tabvo_map(marvo).get(this.getExbeanname()); + } +}