箱变qms推送优化

uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPushToQmsAction.java

@@ -19,6 +19,7 @@ import nc.pubitf.uapbd.IMaterialPubService;
 import nc.util.mmf.framework.base.MMValueCheck;
 import nc.vo.bd.defdoc.DefdocVO;
 import nc.vo.bd.material.MaterialVO;
+import nc.vo.bd.material.marbasclass.MarBasClassVO;
 import nc.vo.bd.material.plan.MaterialPlanVO;
 import nc.vo.bd.material.stock.MaterialStockVO;
 import nc.vo.cmp.util.StringUtils;
@@ -88,75 +89,40 @@ public class MaterialPushToQmsAction implements ICommonAction {
         return "success";
     }
 
-    /**
-     * 构建同步数据
-     */
     private void buildSyncData(MaterialVO[] useVOs, String eventType) throws BusinessException {
         for (MaterialVO vo : useVOs) {
-            // 判断物料的业务单元是否是精密公司，不是则跳过
-            String pkOrg = vo.getPk_org();
             String pkMaterial = vo.getPk_material();
+            // 判断物料的业务单元是否是箱变公司，不是则跳过
+            String pkOrg = vo.getPk_org();
             String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg);
-            String pkOrg1 = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.PK_ORG, OrgVO.CODE, "C038");
+            Integer num = MyHelper.checkIfOrg(configParams, pkMaterial, "xbOrg");
-            Integer num = MyHelper.checkIfOrg(configParams, pkMaterial, "jmOrg");
+            if (!"1009".equals(eventType) && (num <= 0)) {
-            if (!"1009".equals(eventType) && ((num <= 0))) {
                 continue;
             }
             // 字段值翻译
-            // String pk_marbasclass = vo.getPk_marbasclass();
+            String pk_marbasclass = vo.getPk_marbasclass();
-            // String mrlTypeName = MyHelper.getStrValByCondition(MarBasClassVO.getDefaultTableName(), MarBasClassVO.NAME,
+            String mrlTypeName = MyHelper.getStrValByCondition(MarBasClassVO.getDefaultTableName(), MarBasClassVO.CODE,
-            //         "pk_marbasclass = '" + pk_marbasclass + "'");
+                    "pk_marbasclass = '" + pk_marbasclass + "'");
             // 计量单位
+
             Map unitMap = getGoodsInfo(pkMaterial);
-            Map<String, MaterialPlanVO> planMap = queryMaterialPlanInfoByPks(new String[]{pkMaterial}, pkOrg1,
+
-                    new String[]{MaterialPlanVO.DEF2});
-            String qyCode = "";
-            if (MMValueCheck.isNotEmpty(planMap) &&
-                    MMValueCheck.isNotEmpty(planMap.get(pkMaterial))) {
-                qyCode = planMap.get(pkMaterial).getDef2();
-            } else {
-                qyCode = vo.getCode();
-            }
             // 1=未启用;2=已启用;3=已停用;
             Integer enablestate = vo.getEnablestate();
             String statusCode = (3 == enablestate) ? "1" : "0";
-            Map<String, Object> stockMap = MyHelper.getMapValByCondition(MaterialStockVO.getDefaultTableName(), "def3,def4,martype",
-                    MaterialStockVO.PK_MATERIAL + " = '" + pkMaterial + "' and pk_org = '" + pkOrg1 + "'");
-            // 制造件传启源
-            if (!"MR".equals(stockMap.get("martype"))) {
-                continue;
-            }
-            // 物料标志和产品分类字段在库存信息页签中，分配物料的时候没有默认值，需要在此处设置
-            // 物料标志
-            String wlbz = "产品";
-            String wlbzId = stockMap.get("def3") + "";
-            String defName = getDefName("zdy-jmzz001", wlbzId);
-            if (MMValueCheck.isNotEmpty(defName)) {
-                wlbz = defName;
-            }
-            // 产品分类
-            String cpfl;
-            String cpflId = stockMap.get("def4") + "";
-            String defName1 = getDefName("zdy-jmzz002", cpflId);
-            if (MMValueCheck.isEmpty(defName1)) {
-                continue;// 缺少产品分类则跳过同步启源
-            }
-            cpfl = defName1;
             // 组装数据
             JSONObject singleObj = new JSONObject();
             // 批次编号，用于唯一标识当前传输的物料数据批次，便于追溯和批量处理
             long cts = System.currentTimeMillis();
             singleObj.put("batchid", cts);
             JSONObject contentObj = new JSONObject();
-            // 计划信息自定义项2（原系统编码）BIP传启源物料档案的物料编码，BIP中物料编码传启源自定义字段“BIP物料编码”
+            contentObj.put("meswlbh", vo.getCode()); // 启源物料编码
-            contentObj.put("meswlbh", qyCode); // 启源物料编码
             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", ""); // 物料分类
+            contentObj.put("wlfl", mrlTypeName); // 物料分类
-            contentObj.put("cpfl", cpfl); // 产品分类
+            contentObj.put("wlbz", "产品"); // 物料标志
-            contentObj.put("wlbz", wlbz); // 物料标志
             contentObj.put("sjjldw", unitMap.get("unitname")); // 设计计量单位
             contentObj.put("cgjldw", unitMap.get("deputy_unitname")); // 采购计量单位
             contentObj.put("zhxs", unitMap.getOrDefault("convertRate", "1.00")); // 转换系数

uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToQmsListener.java

@@ -94,7 +94,7 @@ public class MaterialToQmsListener implements IBusinessListener {
             }
             // 俚뙈令럇陋
             String pk_marbasclass = vo.getPk_marbasclass();
-            String mrlTypeName = MyHelper.getStrValByCondition(MarBasClassVO.getDefaultTableName(), MarBasClassVO.NAME,
+            String mrlTypeName = MyHelper.getStrValByCondition(MarBasClassVO.getDefaultTableName(), MarBasClassVO.CODE,
                     "pk_marbasclass = '" + pk_marbasclass + "'");
             // 셕좆데貫
 
@@ -166,9 +166,9 @@ public class MaterialToQmsListener implements IBusinessListener {
         JSONObject resultObj = JSONObject.parseObject(result);
         logger.error("QMS-Material-res = " + result);
 
-        if (!"success".equals(resultObj.getString("success"))) {
+        if (!"true".equals(resultObj.getString("success"))) {
-            // throw new BusinessException("QMS-Material-error:" + resultObj.getString("msg"));
             logger.error("QMS-Material-error,result[" + resultObj.toJSONString() + "]");
+            throw new BusinessException("QMS-Material-error:" + resultObj.getString("message"));
         }
     }