From 1ac9e4d4f7325dcaf3d859d75a61f58e8d2ee262 Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 11 Nov 2025 18:49:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(mes):=20=E6=96=B0=E5=A2=9E=E7=AE=B1?= =?UTF-8?q?=E5=8F=98=E7=89=A9=E6=96=99=E5=AE=9A=E6=97=B6=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=90=AF=E6=BA=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/mes/qy/MaterialToQmsPlugin.java | 224 ++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java diff --git a/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java new file mode 100644 index 00000000..6f440332 --- /dev/null +++ b/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java @@ -0,0 +1,224 @@ +package nc.bs.uapbd.task.mes.qy; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; +import nc.bs.arap.util.SqlUtils; +import nc.bs.dao.BaseDAO; +import nc.bs.dao.DAOException; +import nc.bs.logging.Log; +import nc.bs.pub.pa.PreAlertObject; +import nc.bs.pub.taskcenter.BgWorkingContext; +import nc.bs.pub.taskcenter.IBackgroundWorkPlugin; +import nc.bs.trade.business.HYPubBO; +import nc.bs.uapbd.util.MyHelper; +import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; +import nc.jdbc.framework.processor.ColumnProcessor; +import nc.jdbc.framework.processor.MapListProcessor; +import nc.jdbc.framework.processor.MapProcessor; +import nc.util.mmf.framework.base.MMValueCheck; +import nc.vo.bd.material.MaterialVO; +import nc.vo.bd.material.marbasclass.MarBasClassVO; +import nc.vo.pub.BusinessException; +import nc.vo.pubapp.pattern.data.ValueUtils; + +import java.sql.SQLException; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * 箱变-物料-定时推送启源 + * + * @author mzr + * @date 2025-11-10 + */ +public class MaterialToQmsPlugin implements IBackgroundWorkPlugin { + private static final String LOG_INFO_NAME = "qyMesLog"; + private static final Log logger = Log.getInstance(LOG_INFO_NAME); + private static final String reqUrl = "/IF_QyErpApi.ashx?action=addwlxx"; + private Map configParams; + private int timeRange = 0; + private BaseDAO dao; + + public BaseDAO getDao() { + if (dao == null) { + dao = new BaseDAO(); + } + return dao; + } + + @Override + public PreAlertObject executeTask(BgWorkingContext bgWorkingContext) throws BusinessException { + this.initParams(bgWorkingContext); + configParams = MyHelper.getConfigParams("xb-config", null); + if (configParams.isEmpty()) { + throw new BusinessException("箱变的QMS接口缺少配置"); + } + try { + List> pkList = getPkList(); + if (pkList == null || pkList.isEmpty()) { + return null; + } + HYPubBO hyPub = new HYPubBO(); + List voList = new ArrayList<>(); + for (Map map : pkList) { + String pkMaterial = map.get("pk_material"); + MaterialVO materialVO = (MaterialVO) hyPub.queryByPrimaryKey(MaterialVO.class, pkMaterial); + voList.add(materialVO); + } + if (!voList.isEmpty()) { + buildSyncData(voList); + } + } catch (Exception e) { + logger.error("MaterialToQmsPlugin-exp:" + e.getMessage(), e); + } + return null; + } + + private List> getPkList() throws BusinessException, SQLException { + String targetCode = configParams.get("xbOrg"); + if (targetCode == null || MMValueCheck.isEmpty(targetCode)) { + throw new BusinessException("未配置组织参数"); + } + String[] orgItem = targetCode.split(","); + String inStr = SqlUtils.getInStr("code", orgItem, true); + String orgSql = " SELECT pk_stockorg,code,name FROM org_stockorg WHERE DR = 0 AND " + inStr; + List> orgList = (List>) getDao().executeQuery(orgSql, new MapListProcessor()); + if (orgList.isEmpty()) { + return null; + } + String[] stockorgs = orgList.stream().map(map -> map.get("pk_stockorg")).distinct().toArray(String[]::new); + String inStrPkOrg = SqlUtils.getInStr("b.pk_org", stockorgs, true); + // 计算 timeRange 小时前的时间 + LocalDateTime rangeTime = LocalDateTime.now().minusHours(timeRange); + String rangeTimeString = rangeTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String sql = " SELECT DISTINCT b.pk_material" + + " FROM bd_materialstock b" + + " LEFT JOIN bd_material a ON a.pk_material = b.pk_material" + + " WHERE b.dr = 0 AND a.dr = 0" + + " AND " + inStrPkOrg + + " AND (b.ts > '" + rangeTimeString + "' OR a.ts > '" + rangeTimeString + "')"; + List> pkList = (List>) getDao().executeQuery(sql, new MapListProcessor()); + return pkList; + } + + /** + * 构建同步数据 + */ + private void buildSyncData(List useVOs) throws BusinessException { + for (MaterialVO vo : useVOs) { + String pkMaterial = vo.getPk_material(); + // 字段值翻译 + String pk_marbasclass = vo.getPk_marbasclass(); + String mrlTypeName = MyHelper.getStrValByCondition(MarBasClassVO.getDefaultTableName(), MarBasClassVO.CODE, + "pk_marbasclass = '" + pk_marbasclass + "'"); + // 计量单位 + + Map unitMap = getGoodsInfo(pkMaterial); + + // 1=未启用;2=已启用;3=已停用; + Integer enablestate = vo.getEnablestate(); + String statusCode = (3 == enablestate) ? "1" : "0"; + // 组装数据 + JSONObject singleObj = new JSONObject(); + // 批次编号，用于唯一标识当前传输的物料数据批次，便于追溯和批量处理 + long cts = System.currentTimeMillis(); + singleObj.put("batchid", cts); + JSONObject contentObj = new JSONObject(); + contentObj.put("meswlbh", vo.getCode()); // 启源物料编码 + contentObj.put("bipwlbh", vo.getCode()); // BIP物料编码 + contentObj.put("wlmc", vo.getName()); // 物料名称 + String wlxhgg = MyHelper.skipNull(vo.getMaterialtype()) + MyHelper.skipNull(vo.getMaterialspec()); + contentObj.put("wlxhgg", wlxhgg); // 物料型号规格 + contentObj.put("wlfl", mrlTypeName); // 物料分类 + contentObj.put("wlbz", getMrlType(pkMaterial, configParams.get("mrlOrg"))); // 物料标志 + contentObj.put("sjjldw", unitMap.get("unitname")); // 设计计量单位 + contentObj.put("cgjldw", unitMap.get("deputy_unitname")); // 采购计量单位 + contentObj.put("zhxs", unitMap.getOrDefault("convertRate", "1.00")); // 转换系数 + contentObj.put("flag_fq", statusCode); // 1/0 传递1代表物料废弃 + contentObj.put("bz", vo.getMemo()); // 备注信息 + JSONArray contentArr = new JSONArray(); + contentArr.add(contentObj); + singleObj.put("Content", contentArr); + /* + { + "batchid": "10001", + "Content": [ + { + "meswlbh": "ACC26711", 启源物料编码 + "bipwlbh": "ACC26711", BIP物料编码 + "wlmc": "铜排",物料名称 + "wlxhgg": "15558190831", 物料型号规格 + "wlfl": "铜排", 物料分类 + "cpfl": "", 如果物料是产品需要填写产品分类 + "sjjldw": "根", 设计计量单位 + "cgjldw": "KG", 采购计量单位 + "zhxs": "6", 转换系数，用于实物单位与采购单位的换算（即 1 根铜排的长度为 6.00 米），精确到两位小数，提升换算准确性 + "bz": "备注" 备注信息 + } + ] + } + */ + pushData(singleObj); + updateBs(pkMaterial); + } + } + + private void updateBs(String pkMaterial) throws DAOException { + String sql = "update BD_MATERIAL set def36='Y' where pk_material='" + + pkMaterial + "'"; + getDao().executeUpdate(sql); + } + + private Object getMrlType(String pkMaterial, String xbOrg) throws DAOException { + String sql = " select martype from bd_materialstock left join org_stockorg on org_stockorg.pk_stockorg = bd_materialstock.pk_org " + + " where pk_material = '" + pkMaterial + "' AND bd_materialstock.dr=0 " + " and org_stockorg.code = '" + xbOrg + "' "; + Object map = (Object) new BaseDAO().executeQuery(sql, new ColumnProcessor()); + return map; + } + + /** + * 推送同步数据 + */ + private void pushData(JSONObject param) throws BusinessException { + // 转json字符串的时候保留null值 + String jsonStr = JSON.toJSONString(param, + SerializerFeature.WriteMapNullValue, + SerializerFeature.WriteNullStringAsEmpty + ); + logger.error("QMS-Material-param = " + jsonStr); + // NCCForUAPLogger.debug("QMS-Material-param = " + jsonStr); + String baseUrl = configParams.get("qmsBaseUrl"); + String requestUrl = baseUrl + reqUrl; + logger.error("QMS-Material-url = " + requestUrl); + String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr); + JSONObject resultObj = JSONObject.parseObject(result); + logger.error("QMS-Material-res = " + result); + + if (!"true".equals(resultObj.getString("success"))) { + logger.error("QMS-Material-error,result[" + resultObj.toJSONString() + "]"); + throw new BusinessException("QMS-Material-error:" + resultObj.getString("message")); + } + } + + private Map getGoodsInfo(String pkMaterial) throws BusinessException { + String sql = " select a.pk_measdoc, c.name unitname, b.pk_measdoc deputyUnit, d.name deputy_unitname, nvl(b.measrate, '1/1') measrate " + + "from bd_material a " + + "left join bd_materialconvert b on a.pk_material = b.pk_material " + + "left join bd_measdoc c on a.pk_measdoc = c.pk_measdoc " + + "left join bd_measdoc d on b.pk_measdoc = d.pk_measdoc " + + "where a.pk_material = '" + pkMaterial + "' "; + Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor()); + map.put("convertRate", MyHelper.transferSpecialField(map.get("measrate") + "")); + return map; + } + + private void initParams(BgWorkingContext bgwc) { + this.timeRange = ValueUtils.getInt(bgwc.getKeyMap().get("timeRange")); + } + +} From 258d1b5f153e433b4bb00a7660fbf981472e36f5 Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 11 Nov 2025 21:03:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(mes):=20=E6=96=B0=E5=A2=9E=E7=94=B5?= =?UTF-8?q?=E5=8A=9B=E7=94=B5=E5=AD=90=E7=89=A9=E6=96=99=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=89=BE=E6=99=AEMES=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/epic/MaterialToEpicMesCronPlugin.java | 251 ++++++++++++++++++ 1 file changed, 251 insertions(+) create mode 100644 uapbd/src/private/nc/bs/uapbd/task/mes/epic/MaterialToEpicMesCronPlugin.java diff --git a/uapbd/src/private/nc/bs/uapbd/task/mes/epic/MaterialToEpicMesCronPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/mes/epic/MaterialToEpicMesCronPlugin.java new file mode 100644 index 00000000..1d13ba8a --- /dev/null +++ b/uapbd/src/private/nc/bs/uapbd/task/mes/epic/MaterialToEpicMesCronPlugin.java @@ -0,0 +1,251 @@ +package nc.bs.uapbd.task.mes.epic; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; +import nc.bs.dao.BaseDAO; +import nc.bs.logging.Log; +import nc.bs.pub.pa.PreAlertObject; +import nc.bs.pub.taskcenter.BgWorkingContext; +import nc.bs.pub.taskcenter.IBackgroundWorkPlugin; +import nc.bs.trade.business.HYPubBO; +import nc.bs.uapbd.util.MyHelper; +import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; +import nc.jdbc.framework.processor.ColumnProcessor; +import nc.jdbc.framework.processor.MapListProcessor; +import nc.jdbc.framework.processor.MapProcessor; +import nc.util.mmf.framework.base.MMValueCheck; +import nc.vo.bd.material.MaterialVO; +import nc.vo.fi.pub.SqlUtils; +import nc.vo.org.OrgVO; +import nc.vo.pub.BusinessException; +import nc.vo.pubapp.pattern.data.ValueUtils; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 电力电子-物料-定时推送艾普MES + * + * @author mzr + * @date 2025-11-11 + */ +public class MaterialToEpicMesCronPlugin implements IBackgroundWorkPlugin { + private static final String LOG_INFO_NAME = "dldzlog"; + private static final Log logDl = Log.getInstance(LOG_INFO_NAME); + private static final String reqUrl = "/prj-v5-web/ext/api/mrl"; + private Map configParams; + private int timeRange = 0; + private BaseDAO dao; + + public BaseDAO getDao() { + if (dao == null) { + dao = new BaseDAO(); + } + return dao; + } + + @Override + public PreAlertObject executeTask(BgWorkingContext bgWorkingContext) throws BusinessException { + this.initParams(bgWorkingContext); + configParams = MyHelper.getConfigParams("Dldz-config", null); + if (configParams.isEmpty()) { + throw new BusinessException("电力电子的艾普MES接口缺少配置"); + } + try { + List> pkList = this.getPkList(); + if (pkList == null || pkList.isEmpty()) { + return null; + } + HYPubBO hyPub = new HYPubBO(); + List voList = new ArrayList<>(); + for (Map map : pkList) { + String pkMaterial = map.get("pk_material"); + MaterialVO materialVO = (MaterialVO) hyPub.queryByPrimaryKey(MaterialVO.class, pkMaterial); + if (materialVO != null) { + voList.add(materialVO); + } + } + if (!voList.isEmpty()) { + buildSyncData(voList); + } + } catch (Exception e) { + logDl.error("MaterialToEpicMesPlugin-exp:" + e.getMessage(), e); + } + return null; + } + + private List> getPkList() throws BusinessException { + String targetCode = configParams.get("dldzOrg"); + if (targetCode == null || MMValueCheck.isEmpty(targetCode)) { + throw new BusinessException("未配置组织参数"); + } + String[] orgItem = targetCode.split(","); + String inStr = SqlUtils.getInStr("code", orgItem, true); + String orgSql = " SELECT pk_stockorg,code,name FROM org_stockorg WHERE DR = 0 AND " + inStr; + List> orgList = (List>) getDao().executeQuery(orgSql, new MapListProcessor()); + if (orgList.isEmpty()) { + return null; + } + String[] stockorgs = orgList.stream().map(map -> map.get("pk_stockorg")).distinct().toArray(String[]::new); + String inStrPkOrg = SqlUtils.getInStr("b.pk_org", stockorgs, true); + // 计算 timeRange 小时前的时间 + LocalDateTime rangeTime = LocalDateTime.now().minusHours(timeRange); + String rangeTimeString = rangeTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + // 查询最近改过基本信息和库存信息的物料 + String sql = " SELECT DISTINCT b.pk_material" + + " FROM bd_materialstock b" + + " LEFT JOIN bd_material a ON a.pk_material = b.pk_material" + + " WHERE b.dr = 0 AND a.dr = 0" + + " AND " + inStrPkOrg + + " AND (b.ts > '" + rangeTimeString + "' OR a.ts > '" + rangeTimeString + "')"; + List> pkList = (List>) getDao().executeQuery(sql, new MapListProcessor()); + return pkList; + } + + /** + * 构建同步数据 + */ + private void buildSyncData(List useVOs) throws BusinessException { + for (MaterialVO vo : useVOs) { + String pkMaterial = vo.getPk_material(); + String pkOrg = vo.getPk_org(); + String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); + // 计量单位 + Map unitMap = getGoodsInfo(pkMaterial); + + // 1=未启用;2=已启用;3=已停用; + Integer enablestate = vo.getEnablestate(); + String statusCode = (3 == enablestate) ? "N" : "Y"; + // 组装数据 + JSONObject singleObj = new JSONObject(); + singleObj.put("id", null);// 唯一标识（主键） + singleObj.put("siteCode", orgCode);// 工厂编码 + singleObj.put("mrlCode", vo.getCode());// 物料编码 + singleObj.put("mrlName", vo.getName());// 物料名称 + singleObj.put("unit", unitMap.get("unitname"));// 单位 + singleObj.put("model", vo.getMaterialtype());// 型号 + singleObj.put("specification", vo.getMaterialspec());// 规格 + singleObj.put("type", "");// 类型（I:新增 U:修改 D:删除） + singleObj.put("deputyUnit", unitMap.get("deputy_unitname"));// 副单位 + singleObj.put("auditCode", "1");// 审核码 + singleObj.put("statusCode", statusCode);// 状态码（Y表示启用，N表示停用） + // singleObj.put("mrlTypeErp", getGoodsProject(pkMaterial));// 物料类型ERP（1:专用件，3:通用件） + singleObj.put("mrlType", getGoodsType(pkMaterial));// 物料分类 制造1 其它0 + singleObj.put("convertRate", unitMap.getOrDefault("convertRate", "1"));// 单位换算率 + // singleObj.put("isCheck", "1");// 是否选中（1:是，0:否） + pushData(singleObj, pkMaterial); + } + } + + /** + * 推送同步数据 + */ + private void pushData(JSONObject param, String pkMaterial) throws BusinessException { + // String jsonString = param.toJSONString(); + // 转json字符串的时候保留null值 + String jsonStr = JSON.toJSONString(param, + SerializerFeature.WriteMapNullValue, + SerializerFeature.WriteNullStringAsEmpty + ); + logDl.error("EpicMes-Material-param = " + jsonStr); + // NCCForUAPLogger.debug("EpicMes-Material-param = " + jsonStr); + String baseUrl = configParams.get("epicMesUrl"); + String requestUrl = baseUrl + reqUrl; + logDl.error("EpicMes-Material-url = " + requestUrl); + String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr); + JSONObject resultObj = JSONObject.parseObject(result); + logDl.error("EpicMes-Material-res = " + result); + + if (!"1".equals(resultObj.getString("flag"))) { + // throw new BusinessException("EpicMes-Material-error:" + resultObj.getString("msg")); + logDl.error("EpicMes-Material-error,result[" + resultObj.toJSONString() + "]"); + } else { + handleSyncMaterialExp(pkMaterial, "Y"); + } + } + + private String getType(String eventType) { + // 类型（I:新增 U:修改 D:删除） + Map map = new HashMap<>(); + map.put("1002", "I"); + map.put("1009", "I"); + map.put("1004", "U"); + map.put("1069", "U"); + map.put("1071", "U"); + return map.getOrDefault(eventType, "I"); + } + + private Map getGoodsInfo(String pkMaterial) throws BusinessException { + String sql = " select a.pk_measdoc, c.name unitname, b.pk_measdoc deputyUnit, d.name deputy_unitname, nvl(b.measrate, '1/1') measrate " + + "from bd_material a " + + "left join bd_materialconvert b on a.pk_material = b.pk_material " + + "left join bd_measdoc c on a.pk_measdoc = c.pk_measdoc " + + "left join bd_measdoc d on b.pk_measdoc = d.pk_measdoc " + + "where a.pk_material = '" + pkMaterial + "' "; + // logDl.error("EpicMes-Material-getUnitInfo-sql = " + sql); + Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor()); + map.put("convertRate", MyHelper.transferSpecialField(map.get("measrate") + "")); + return map; + } + + private String getGoodsType(String pkMaterial) throws BusinessException { + String targetCode = configParams.get("dldzOrg"); + String[] orgItem = targetCode.split(","); + String inStr = SqlUtils.getInStr("b.code", orgItem, Boolean.TRUE); + // 物料-库存信息-物料类型 DR=分销补货;FR=工厂补货;MR=制造件;PR=采购件;OT=委外件;ET=其他 + // mes物料类型 制造1 其它0(ERP多个组织中如果有一个是制造件或虚拟件(其他)就传1) + String mesType = "0"; + // String martype = MyHelper.transferField(MaterialStockVO.getDefaultTableName(), MaterialStockVO.MARTYPE, MaterialStockVO.PK_MATERIAL, pkMaterial); + String countSql = "SELECT count(1)" + + " FROM bd_materialstock a" + + " LEFT JOIN org_stockorg b ON a.pk_org = b.pk_stockorg" + + " WHERE a.dr = 0 AND a.martype IN ('MR','ET') " + + " AND a.pk_material = '[pkMaterial]'" + + " AND " + inStr; + countSql = countSql.replace("[pkMaterial]", pkMaterial); + Integer num = (Integer) new BaseDAO().executeQuery(countSql, new ColumnProcessor()); + if (num > 0) { + mesType = "1"; + } + // 判断物料是否是虚拟件，只要有一个组织是就赋值0 + String countSql1 = "SELECT count(1)" + + " FROM bd_materialplan a" + + " LEFT JOIN org_orgs b ON a.pk_org = b.pk_org" + + " WHERE a.dr = 0 AND a.isvirtual = 'Y' " + + " AND a.pk_material = '[pkMaterial]'" + + " AND b.isbusinessunit = 'Y'" + + " AND " + inStr; + countSql1 = countSql1.replace("[pkMaterial]", pkMaterial); + Integer num1 = (Integer) new BaseDAO().executeQuery(countSql1, new ColumnProcessor()); + if (num1 > 0) { + mesType = "0"; + } + return mesType; + } + + /** + * 更新物料推送标志 + */ + private void handleSyncMaterialExp(String pk_material, String errorCode) { + if (MMValueCheck.isEmpty(pk_material)) { + return; + } + try { + String updateSql = "update bd_material set def30 = '[errorCode]' where pk_material = '[pk_material]'"; + updateSql = updateSql.replace("[pk_material]", pk_material); + updateSql = updateSql.replace("[errorCode]", errorCode); + int updatedRows = getDao().executeUpdate(updateSql); + } catch (BusinessException e) { + logDl.error("EpicMes-Material-handleSyncMaterialExp = " + e.getMessage(), e); + } + } + + private void initParams(BgWorkingContext bgwc) { + this.timeRange = ValueUtils.getInt(bgwc.getKeyMap().get("timeRange")); + } +} From 677b785f967430234372ffb682fef4857d865bee Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 11 Nov 2025 21:04:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat(mes):=E4=BC=98=E5=8C=96=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=8E=A8=E9=80=81=E7=89=A9=E6=96=99=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=9A=84=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1-=E7=94=B5?= =?UTF-8?q?=E5=8A=9B=E7=94=B5=E5=AD=90-=E8=89=BE=E6=99=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/epic/MaterialToEpicMesPlugin.java | 107 +++++++++++------- 1 file changed, 66 insertions(+), 41 deletions(-) diff --git a/uapbd/src/private/nc/bs/uapbd/task/mes/epic/MaterialToEpicMesPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/mes/epic/MaterialToEpicMesPlugin.java index eafa81f3..7df471bb 100644 --- a/uapbd/src/private/nc/bs/uapbd/task/mes/epic/MaterialToEpicMesPlugin.java +++ b/uapbd/src/private/nc/bs/uapbd/task/mes/epic/MaterialToEpicMesPlugin.java @@ -19,19 +19,26 @@ import nc.vo.bd.material.MaterialVO; import nc.vo.fi.pub.SqlUtils; import nc.vo.org.OrgVO; import nc.vo.pub.BusinessException; +import nc.vo.pubapp.pattern.data.ValueUtils; -import java.util.*; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 物料-艾普MES-定时重推失败的数据 * * @author mzr - * @date 20251006 + * @date 2025-10-06 */ public class MaterialToEpicMesPlugin implements IBackgroundWorkPlugin { private static final String LOG_INFO_NAME = "syscron"; private static final Log logDl = Log.getInstance(LOG_INFO_NAME); private static final String reqUrl = "/prj-v5-web/ext/api/mrl"; + private String startDate = ""; private Map configParams; private BaseDAO dao; @@ -45,45 +52,75 @@ public class MaterialToEpicMesPlugin implements IBackgroundWorkPlugin { @Override public PreAlertObject executeTask(BgWorkingContext bgWorkingContext) throws BusinessException { try { - String sql = " select * from v_mes_material_cron"; - List> pkList = (List>) getDao().executeQuery(sql.toString(), new MapListProcessor()); - if (pkList.isEmpty()) { - return null; - } + this.initParams(bgWorkingContext); configParams = MyHelper.getConfigParams("Dldz-config", null); if (configParams.isEmpty()) { return null; } + List> pkList = this.getPkList(); + if (pkList == null || pkList.isEmpty()) { + return null; + } HYPubBO hyPub = new HYPubBO(); List voList = new ArrayList<>(); for (Map map : pkList) { String pkMaterial = map.get("pk_material"); MaterialVO materialVO = (MaterialVO) hyPub.queryByPrimaryKey(MaterialVO.class, pkMaterial); - voList.add(materialVO); + if (materialVO != null) { + voList.add(materialVO); + } } if (!voList.isEmpty()) { - MaterialVO[] useVOs = voList.toArray(new MaterialVO[0]); - buildSyncData(useVOs); + buildSyncData(voList); } } catch (Exception e) { - logDl.error("BomToEpicMesPlugin-exp:" + e.getMessage(), e); + logDl.error("MaterialToEpicMesPlugin-exp:" + e.getMessage(), e); } return null; } + private List> getPkList() throws BusinessException { + String targetCode = configParams.get("dldzOrg"); + if (targetCode == null || MMValueCheck.isEmpty(targetCode)) { + throw new BusinessException("未配置组织参数"); + } + String[] orgItem = targetCode.split(","); + String inStr = SqlUtils.getInStr("code", orgItem, true); + String orgSql = " SELECT pk_stockorg,code,name FROM org_stockorg WHERE DR = 0 AND " + inStr; + List> orgList = (List>) getDao().executeQuery(orgSql, new MapListProcessor()); + if (orgList.isEmpty()) { + return null; + } + String[] stockorgs = orgList.stream().map(map -> map.get("pk_stockorg")).distinct().toArray(String[]::new); + String inStrPkOrg = SqlUtils.getInStr("b.pk_org", stockorgs, true); + // 查询最近改过基本信息和库存信息的物料 + LocalDateTime nowTime = LocalDateTime.now(); + String timeString = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + String rangeTimeString = timeString + " 00:00:00"; + if (MMValueCheck.isNotEmpty(startDate)) { + // 如果有指定的开始时间，使用指定的时间限制查询条件 + rangeTimeString = startDate; + } + String sql = " SELECT DISTINCT b.pk_material" + + " FROM bd_materialstock b" + + " LEFT JOIN bd_material a ON a.pk_material = b.pk_material" + + " WHERE b.dr = 0 AND a.dr = 0 AND def30 != 'Y'" + + " AND " + inStrPkOrg + + " AND (b.ts > '" + rangeTimeString + "' OR a.ts > '" + rangeTimeString + "')"; + List> pkList = (List>) getDao().executeQuery(sql, new MapListProcessor()); + return pkList; + } + /** * 构建同步数据 */ - private void buildSyncData(MaterialVO[] useVOs) throws BusinessException { + private void buildSyncData(List useVOs) throws BusinessException { for (MaterialVO vo : useVOs) { String pkMaterial = vo.getPk_material(); - // 判断物料的业务单元是否是电力电子公司，不是则跳过 String pkOrg = vo.getPk_org(); String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); // 字段值翻译 - // String pk_marbasclass = vo.getPk_marbasclass(); - // String mrlTypeCOde = MyHelper.transferField(MarBasClassVO.getDefaultTableName(), MarBasClassVO.CODE, MarBasClassVO.PK_MARBASCLASS, pk_marbasclass); // 计量单位 Map unitMap = getGoodsInfo(pkMaterial); @@ -107,14 +144,14 @@ public class MaterialToEpicMesPlugin implements IBackgroundWorkPlugin { singleObj.put("mrlType", getGoodsType(pkMaterial));// 物料分类 制造1 其它0 singleObj.put("convertRate", unitMap.getOrDefault("convertRate", "1"));// 单位换算率 // singleObj.put("isCheck", "1");// 是否选中（1:是，0:否） - pushData(singleObj, useVOs); + pushData(singleObj, pkMaterial); } } /** * 推送同步数据 */ - private void pushData(JSONObject param, MaterialVO[] useVOs) throws BusinessException { + private void pushData(JSONObject param, String pkMaterial) throws BusinessException { // String jsonString = param.toJSONString(); // 转json字符串的时候保留null值 String jsonStr = JSON.toJSONString(param, @@ -133,9 +170,8 @@ public class MaterialToEpicMesPlugin implements IBackgroundWorkPlugin { if (!"1".equals(resultObj.getString("flag"))) { // throw new BusinessException("EpicMes-Material-error:" + resultObj.getString("msg")); logDl.error("EpicMes-Material-error,result[" + resultObj.toJSONString() + "]"); - handleSyncMaterialExp(useVOs, "N", resultObj.getString("msg")); } else { - handleSyncMaterialExp(useVOs, "Y", ""); + handleSyncMaterialExp(pkMaterial, "Y"); } } @@ -202,33 +238,22 @@ public class MaterialToEpicMesPlugin implements IBackgroundWorkPlugin { /** * 更新错误信息 */ - private void handleSyncMaterialExp(MaterialVO[] vos, String errorCode, String errorMsg) { - if (MMValueCheck.isEmpty(vos)) { + private void handleSyncMaterialExp(String pk_material, String errorCode) { + if (MMValueCheck.isEmpty(pk_material)) { return; } - Set ids = new HashSet<>(); - for (MaterialVO vo : vos) { - String pkMaterial = vo.getPk_material(); - ids.add(pkMaterial); - } - // 定义每批次处理的最大数量 - int batchSize = 500; try { - List idList = new ArrayList<>(ids); - for (int i = 0; i < idList.size(); i += batchSize) { - // 取出当前批次的ID - List batchIds = idList.subList(i, Math.min(i + batchSize, idList.size())); - - // 构造并执行SQL - String inSql = SqlUtils.getInStr("pk_material", batchIds.toArray(new String[0]), Boolean.TRUE); - String updateSql = "update bd_material set def30 = '[errorCode]' where " + inSql; - updateSql = updateSql.replace("[errorCode]", errorCode); - // NCCForUAPLogger.debug("EpicMes-handleSyncMaterialExp-updateSql = " + updateSql); - int updatedRows = getDao().executeUpdate(updateSql); - // NCCForUAPLogger.debug("EpicMes-Material-handleSyncMaterialExp-updateRows = " + updatedRows); - } + String updateSql = "update bd_material set def30 = '[errorCode]' where pk_material = '[pk_material]'"; + updateSql = updateSql.replace("[pk_material]", pk_material); + updateSql = updateSql.replace("[errorCode]", errorCode); + int updatedRows = getDao().executeUpdate(updateSql); } catch (BusinessException e) { logDl.error("EpicMes-Material-handleSyncMaterialExp = " + e.getMessage(), e); } } + + private void initParams(BgWorkingContext bgwc) { + this.startDate = ValueUtils.getString(bgwc.getKeyMap().get("startDate")); + } + } From 509fdd30984bb60b2842c865039d0bc7e18afcc2 Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 11 Nov 2025 21:05:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor(qy):=E4=BC=98=E5=8C=96=E7=AE=B1?= =?UTF-8?q?=E5=8F=98=E7=89=A9=E6=96=99=E5=90=8C=E6=AD=A5=E5=88=B0QMS?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java index 6f440332..0e6ab142 100644 --- a/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java +++ b/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; -import nc.bs.arap.util.SqlUtils; import nc.bs.dao.BaseDAO; import nc.bs.dao.DAOException; import nc.bs.logging.Log; @@ -20,10 +19,10 @@ import nc.jdbc.framework.processor.MapProcessor; import nc.util.mmf.framework.base.MMValueCheck; import nc.vo.bd.material.MaterialVO; import nc.vo.bd.material.marbasclass.MarBasClassVO; +import nc.vo.fi.pub.SqlUtils; import nc.vo.pub.BusinessException; import nc.vo.pubapp.pattern.data.ValueUtils; -import java.sql.SQLException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -68,7 +67,9 @@ public class MaterialToQmsPlugin implements IBackgroundWorkPlugin { for (Map map : pkList) { String pkMaterial = map.get("pk_material"); MaterialVO materialVO = (MaterialVO) hyPub.queryByPrimaryKey(MaterialVO.class, pkMaterial); - voList.add(materialVO); + if (materialVO != null) { + voList.add(materialVO); + } } if (!voList.isEmpty()) { buildSyncData(voList); @@ -79,7 +80,7 @@ public class MaterialToQmsPlugin implements IBackgroundWorkPlugin { return null; } - private List> getPkList() throws BusinessException, SQLException { + private List> getPkList() throws BusinessException { String targetCode = configParams.get("xbOrg"); if (targetCode == null || MMValueCheck.isEmpty(targetCode)) { throw new BusinessException("未配置组织参数"); From 3a54f42340f82ca3dfd4722951356e0c785d6979 Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 11 Nov 2025 21:05:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat(material):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=AB=98=E5=8E=8BIMS-=E7=89=A9=E6=96=99=E6=8E=A8=E9=80=81-?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/uapbd/material/listener/MaterialToGyImsListener.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyImsListener.java b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyImsListener.java index e8f78e3f..d215d804 100644 --- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyImsListener.java +++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyImsListener.java @@ -99,6 +99,10 @@ public class MaterialToGyImsListener implements IBusinessListener { } } }else if ("1004".equals(eventType) ) { + configParams = MyHelper.getConfigParams("gy-config", null); + if (configParams.isEmpty()) { + throw new BusinessException("高压的gymes接口缺少配置"); + } MaterialVO[] useVOs = ArrayClassConvertUtil.convert(objs, MaterialVO.class); // 更新启用状态