研发项目同步、成本中心同步、核算主体同步

src/com/kingdee/eas/custom/integration/mdm/dto/MdmRecord.java

@@ -11,11 +11,13 @@ public class MdmRecord {
     /** ???? (name) */
     private String name;
 
-    /** ???? (description) */
-    private String description;
+    /**
+     * 状态 (state)，对应 BaseItemStateEnum：1=启用，2=禁用。
+     * <p>
+     * MDM 未传该字段时默认启用。
+     */
 
-    /** ??? (simpleName) */
-    private String simpleName;
+    private int state = 1;
 
     public String getNumber() {
         return number;
@@ -33,19 +35,11 @@ public class MdmRecord {
         this.name = name;
     }
 
-    public String getDescription() {
-        return description;
+    public int getState() {
+        return state;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getSimpleName() {
-        return simpleName;
-    }
-
-    public void setSimpleName(String simpleName) {
-        this.simpleName = simpleName;
+    public void setState(int state) {
+        this.state = state;
     }
 }

src/com/kingdee/eas/custom/integration/mdm/enums/MdmEntityEnum.java

@@ -10,7 +10,7 @@ public enum MdmEntityEnum {
 
     COST_CENTER("CostCenter", "579A1746"),
     DEV_PROJECT("DevProject", "99390A08"),
-    ACCOUNT_ENTITY("AccountEntity", "91A1612C");
+    ACCOUNT_ENTITY("AccountEntity", "8F1D98AA");
 
     /** ʵÌå±êʶ£¨ÓÃÓÚÈÕÖ¾£© */
     public final String entityType;

src/com/kingdee/eas/custom/integration/mdm/service/MdmMasterDataService.java

@@ -1,10 +1,13 @@
 package com.kingdee.eas.custom.integration.mdm.service;
 
+import com.grapecity.documents.excel.D;
 import com.kingdee.bos.BOSException;
 import com.kingdee.bos.BOSObjectFactory;
 import com.kingdee.bos.Context;
 import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
 import com.kingdee.bos.util.BOSObjectType;
+import com.kingdee.bos.util.BOSUuid;
+import com.kingdee.eas.basedata.org.CtrlUnitInfo;
 import com.kingdee.eas.common.EASBizException;
 import com.kingdee.eas.custom.integration.base.util.SHRApiUtils;
 import com.kingdee.eas.custom.integration.mdm.dto.MdmFailDetail;
@@ -13,10 +16,12 @@ import com.kingdee.eas.custom.integration.mdm.dto.MdmSyncResponse;
 import com.kingdee.eas.custom.integration.mdm.enums.MdmEntityEnum;
 import com.kingdee.eas.custom.integration.mdm.exception.MdmErrorCodes;
 import com.kingdee.eas.custom.integration.mdm.exception.MdmIntegrationException;
-import com.kingdee.shr.base.syssetting.BaseItemCustomCollection;
+import com.kingdee.eas.framework.DataBaseCollection;
+import com.kingdee.eas.framework.DataBaseInfo;
+import com.kingdee.eas.framework.IDataBase;
+import com.kingdee.eas.framework.ObjectBaseInfo;
 import com.kingdee.shr.base.syssetting.BaseItemCustomInfo;
-import com.kingdee.shr.base.syssetting.IBaseItemCustom;
-import com.kingdee.shr.base.syssetting.SHRBaseItemInfo;
+import com.kingdee.shr.compensation.app.tax.TaxUnitInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,13 +32,14 @@ import java.util.Map;
 
 /**
  * MDM 基础资料写入服务，以编码（number）为唯一键。
- * 通过 IBaseItemCustom 通用 API 操作任意 SHRBaseItem 实体，新增实体无需修改本类。
+ * 通过 IDataBase 通用 API 操作任意 SHRBaseItem 实体，新增实体无需修改本类。
  * 写入策略：编码不存在则新增，存在且名称不一致则更新，名称一致则跳过。
  * 并发安全依赖数据库层 FNumber 唯一约束。
  */
 public class MdmMasterDataService {
 
     private static final Logger logger = LoggerFactory.getLogger(MdmMasterDataService.class);
+    private final String HRORGUNIT_ID = "00000000-0000-0000-0000-000000000000CCE7AED4";
 
     public MdmSyncResponse save(MdmEntityEnum entity, List<MdmRecord> records) {
         MdmSyncResponse response = new MdmSyncResponse();
@@ -45,13 +51,14 @@ public class MdmMasterDataService {
             throw new MdmIntegrationException(MdmErrorCodes.SAVE_ERROR, "无法获取 BOS Context: " + e.getMessage());
         }
         try {
-            IBaseItemCustom iBaseItem = getBaseItem(ctx, entity.bosType);
-            Map<String, SHRBaseItemInfo> existingMap = loadExistingMap(iBaseItem, entity);
+            IDataBase iBaseItem = getBaseItem(ctx, entity.bosType);
+            Map<String, DataBaseInfo> existingMap = loadExistingMap(iBaseItem, entity);
             for (MdmRecord record : records) {
                 try {
                     saveSingle(ctx, iBaseItem, entity, record, existingMap);
                     response.setSuccessCount(response.getSuccessCount() + 1);
                 } catch (Exception e) {
+                    logger.error("MDM写入接口报错： ",e);
                     response.setFailCount(response.getFailCount() + 1);
                     response.addFailDetail(new MdmFailDetail(record.getNumber(), e.getMessage()));
                 }
@@ -62,29 +69,25 @@ public class MdmMasterDataService {
         return response;
     }
 
-    private IBaseItemCustom getBaseItem(Context ctx, String bosType) throws BOSException {
-        return (IBaseItemCustom) BOSObjectFactory.createBOSObject(ctx, new BOSObjectType(bosType));
+    private IDataBase getBaseItem(Context ctx, String bosType) throws BOSException {
+        return (IDataBase) BOSObjectFactory.createBOSObject(ctx, new BOSObjectType(bosType));
     }
 
-    private Map<String, SHRBaseItemInfo> loadExistingMap(IBaseItemCustom iBaseItem, MdmEntityEnum entity) throws BOSException {
-        Map<String, SHRBaseItemInfo> map = new HashMap<>();
-        BaseItemCustomInfo filter = new BaseItemCustomInfo();
-        filter.setBOSType(new BOSObjectType(entity.bosType));
-        BaseItemCustomCollection col = iBaseItem.getBaseItemCustomCollection();
+    private Map<String, DataBaseInfo> loadExistingMap(IDataBase iBaseItem, MdmEntityEnum entity) throws BOSException {
+        Map<String, DataBaseInfo> map = new HashMap<>();
+        DataBaseCollection col = iBaseItem.getDataBaseCollection();
         if (col != null) for (int i = 0; i < col.size(); i++) {
-            SHRBaseItemInfo info = col.get(i);
+            DataBaseInfo info = col.get(i);
             map.put(info.getNumber(), info);
         }
         return map;
     }
 
-    private void saveSingle(Context ctx, IBaseItemCustom iBaseItem,
-                            MdmEntityEnum entity, MdmRecord record,
-                            Map<String, SHRBaseItemInfo> existingMap) throws BOSException {
+    private void saveSingle(Context ctx, IDataBase iBaseItem, MdmEntityEnum entity, MdmRecord record, Map<String, DataBaseInfo> existingMap) throws BOSException {
         validateRecord(record);
         try {
             String number = record.getNumber().trim();
-            SHRBaseItemInfo existing = existingMap.get(number);
+            DataBaseInfo existing = existingMap.get(number);
             if (existing != null) {
                 if (applyUpdate(existing, record)) {
                     iBaseItem.update(new ObjectUuidPK(existing.getId()), existing);
@@ -97,18 +100,31 @@ public class MdmMasterDataService {
         }
     }
 
-    private void addNew(Context ctx, MdmEntityEnum entity, String number,
-                        MdmRecord record, Map<String, SHRBaseItemInfo> existingMap) throws BOSException {
-        BaseItemCustomInfo info = new BaseItemCustomInfo();
-        info.setBOSType(new BOSObjectType(entity.bosType));
-        info.setNumber(number);
+    private void addNew(Context ctx, MdmEntityEnum entity, String number, MdmRecord record, Map<String, DataBaseInfo> existingMap) throws BOSException {
+        DataBaseInfo info = null;
+        if (MdmEntityEnum.ACCOUNT_ENTITY.equals(entity)) {
+            TaxUnitInfo taxUnitInfo = new TaxUnitInfo();
+            taxUnitInfo.setNumber(number);
+            info = taxUnitInfo;
+        } else {
+            BaseItemCustomInfo baseInfo = new BaseItemCustomInfo();
+            baseInfo.setBOSType(new BOSObjectType(entity.bosType));
+            baseInfo.setNumber(number);
+            info = baseInfo;
+        }
+        //创建业务组织
+        CtrlUnitInfo ctrlUnitInfo = new CtrlUnitInfo();
+        ctrlUnitInfo.setId(BOSUuid.read("00000000-0000-0000-0000-000000000000CCE7AED4"));
+        info.setCU(ctrlUnitInfo);
+        //创建业务组织
+        info.put("hrOrgUnit", HRORGUNIT_ID);
         applyUpdate(info, record);
-        IBaseItemCustom iBaseItem = getBaseItem(ctx, entity.bosType);
+        IDataBase iBaseItem = getBaseItem(ctx, entity.bosType);
         try {
             iBaseItem.addnew(info);
             existingMap.put(number, info);
         } catch (BOSException e) {
-            SHRBaseItemInfo existing = findByNumber(ctx, entity, number);
+            DataBaseInfo existing = findByNumber(ctx, entity, number);
             if (existing != null) {
                 //创建失败，数据已经存在，执行更新操作
                 applyUpdate(existing, record);
@@ -126,33 +142,44 @@ public class MdmMasterDataService {
         }
     }
 
-    private SHRBaseItemInfo findByNumber(Context ctx, MdmEntityEnum entity, String number) throws BOSException {
-        IBaseItemCustom iBaseItem = getBaseItem(ctx, entity.bosType);
-        BaseItemCustomCollection col = iBaseItem.getBaseItemCustomCollection();
+    private DataBaseInfo findByNumber(Context ctx, MdmEntityEnum entity, String number) throws BOSException {
+        IDataBase iBaseItem = getBaseItem(ctx, entity.bosType);
+        DataBaseCollection col = iBaseItem.getDataBaseCollection();
         if (col != null) for (int i = 0; i < col.size(); i++) {
-            SHRBaseItemInfo info = col.get(i);
+            DataBaseInfo info = col.get(i);
             if (number.equals(info.getNumber())) return info;
         }
         return null;
     }
 
-    private boolean applyUpdate(SHRBaseItemInfo info, MdmRecord record) {
+
+    /**
+     * 将 MDM 记录字段合并到基础资料对象；任一字段变化则返回 true 以触发 update。
+     */
+    private boolean applyUpdate(ObjectBaseInfo info, MdmRecord record) {
         boolean changed = false;
-        if (info.getName() == null || !info.getName().equals(record.getName())) {
-            info.setName(record.getName());
-            changed = true;
-        }
-        if (record.getDescription() != null && (info.getDescription() == null || !info.getDescription().equals(record.getDescription()))) {
-            info.setDescription(record.getDescription());
+        if (info.getString("name") == null || !info.getString("name").equals(record.getName())) {
+            //info.put("name", record.getName());
+            info.put("name", record.getName(), null);
             changed = true;
         }
-        if (record.getSimpleName() != null && (info.getSimpleName() == null || !info.getSimpleName().equals(record.getSimpleName()))) {
-            info.setSimpleName(record.getSimpleName());
+        resolveState(record.getState());
+        if (info.get("state") == null || info.getInt("state") != record.getState()) {
+            info.put("state", record.getState());
             changed = true;
         }
         return changed;
     }
 
+    /**
+     * 校验 MDM status 取值。约定：1=启用，2=禁用；未传时 MdmRecord 默认 1。
+     */
+    private void resolveState(int status) {
+        if (status != 1 && status != 2) {
+            throw new MdmIntegrationException(MdmErrorCodes.VALIDATION_ERROR, "状态(status)无效，仅支持 1(启用) 或 2(禁用)，当前: " + status);
+        }
+    }
+
     private void validateRecord(MdmRecord record) {
         if (StringUtils.isBlank(record.getNumber()))
             throw new MdmIntegrationException(MdmErrorCodes.VALIDATION_ERROR, "编码(number)不能为空");