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 873cb078..e8b55946 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 @@ -102,7 +102,7 @@ public class MaterialToQmsPlugin implements IBackgroundWorkPlugin { " 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 + "')"; + " AND (b.ts > '" + rangeTimeString + "' OR a.ts > '" + rangeTimeString + "')"; List> pkList = (List>) getDao().executeQuery(sql, new MapListProcessor()); return pkList; } @@ -119,7 +119,7 @@ public class MaterialToQmsPlugin implements IBackgroundWorkPlugin { "pk_marbasclass = '" + pk_marbasclass + "'"); // 计量单位 // 过滤物料分类 - if(checkMrlType(mrlTypeName,configParams)){ + if (checkMrlType(mrlTypeName, configParams)) { continue; } Map unitMap = getGoodsInfo(pkMaterial); @@ -184,6 +184,7 @@ public class MaterialToQmsPlugin implements IBackgroundWorkPlugin { Object map = (Object) new BaseDAO().executeQuery(sql, new ColumnProcessor()); return map; } + private boolean checkMrlType(String mrlTypeName, Map configParams) throws BusinessException { // 从配置中获取目标类型字符串 String targetCode = configParams.get("mrlType"); @@ -219,12 +220,12 @@ public class MaterialToQmsPlugin implements IBackgroundWorkPlugin { 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); + JSONObject resultObj = JSONObject.parseObject(result); if (!"true".equals(resultObj.getString("success"))) { logger.error("QMS-Material-error,result[" + resultObj.toJSONString() + "]"); - throw new BusinessException("QMS-Material-error:" + resultObj.getString("message")); + // throw new BusinessException("QMS-Material-error:" + resultObj.getString("message")); } }