Merge branch 'master' into ywq-dev

src/com/yonde/common/DxSearchUtil.java

@@ -42,6 +42,7 @@ import wt.vc.wip.WorkInProgressState;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -204,17 +205,21 @@ public class DxSearchUtil implements RemoteAccess, Serializable {
             if (CollectionUtils.isEmpty(items)) {
                 continue;
             }
-            addQuerySpecOp(querySpec, searchItems.getOperator());
+            if (CollectionUtils.isEmpty(items1)) {
+                items1 = new ArrayList<SearchItem>();
+            }
+            items1.addAll(items);
+            /*addQuerySpecOp(querySpec, searchItems.getOperator());
             querySpec.appendOpenParen();
             buildItemsSearch(items, querySpec, child.getOperator(), typeSearchMap, clazz);
-            querySpec.appendCloseParen();
+            querySpec.appendCloseParen();*/
 
         }
         if (CollectionUtils.isNotEmpty(items1)) {
             addQuerySpecOp(querySpec, searchItems.getOperator());
-            querySpec.appendOpenParen();
+            //querySpec.appendOpenParen();
             buildItemsSearch(items1, querySpec, SearchItems.BooleanOperator.AND, typeSearchMap, clazz);
-            querySpec.appendCloseParen();
+            //querySpec.appendCloseParen();
         }
 
         return querySpec;
@@ -288,9 +293,9 @@ public class DxSearchUtil implements RemoteAccess, Serializable {
             }
             //对象直接属性：ID Number Name State...改善
             if (typeSearchMap.keySet().contains(fieldName)) {
-                addQuerySpecOp(querySpec, operator);
                 SearchCondition sc = buildScd(clazz, typeSearchMap.get(fieldName), item.operator.name(), item.value);
                 if (ObjectsUtil.nonNull(sc)) {
+                    addQuerySpecOp(querySpec, operator);
                     querySpec.appendWhere(sc, new int[]{0});
                 }
                 continue;

src/com/yonde/doc/util/DxDocUtil.java

@@ -3,6 +3,7 @@ package com.yonde.doc.util;
 import com.yonde.basedata.service.BaseSearchService;
 import com.yonde.basedata.vo.DxDocumentFolderVO;
 import com.yonde.common.*;
+import com.yonde.contants.Global;
 import com.yonde.doc.vo.DxDocumentVO;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -78,7 +79,8 @@ public class DxDocUtil {
         //TypeIdentifier objType = CoreMetaUtility.getTypeIdentifier(fullType);
         //WTDocument doc = (WTDocument) CoreMetaUtility.newInstance(objType);
         WTDocument doc = WTDocument.newWTDocument();
-        TypeDefinitionReference tdr = ClientTypedUtility.getTypeDefinitionReference(fullType);
+        String typeName = CommonUtil.buildTypeKey(Global.PMD_DOMAIN, fullType, WTDocument.class);
+        TypeDefinitionReference tdr = ClientTypedUtility.getTypeDefinitionReference(typeName);
         if (ObjectsUtil.nonNull(tdr)) {
             doc.setTypeDefinitionReference(tdr);
         }

src/com/yonde/part/service/DxPartService.java

@@ -13,6 +13,7 @@ import org.apache.log4j.Logger;
 import org.springframework.stereotype.Service;
 import wt.doc.WTDocument;
 import wt.doc.WTDocumentMaster;
+import wt.fc.Persistable;
 import wt.fc.PersistenceHelper;
 import wt.fc.QueryResult;
 import wt.fc.WTObject;
@@ -33,7 +34,9 @@ import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.rmi.RemoteException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class DxPartService implements RemoteAccess, Serializable {
@@ -562,7 +565,12 @@ public class DxPartService implements RemoteAccess, Serializable {
                     ppart = (WTPart) ViewHelper.service.newBranchForView(partById, "Planning");
                     ppart.setContainer(partById.getContainer());
                     CommonUtil.setFolder("/Default/PBOM/PBOM零部件", partById.getContainerReference(), ppart);
-                    PersistenceHelper.manager.save(ppart);
+                    ppart = (WTPart) PersistenceHelper.manager.save(ppart);
+                    //set attr
+                    Map<String, Object> attrMap = new HashMap<String, Object>();
+                    attrMap.put("ePartOid", partById.toString());
+                    IBAUtil.forceSetIBAValues(ppart, attrMap);
+                    //set attr end
                 }
                 WTPartConfigSpec partConfigSpec = WTPartConfigSpec
                         .newWTPartConfigSpec(WTPartStandardConfigSpec.newWTPartStandardConfigSpec(ViewHelper.service.getView("Design"), null));
@@ -574,7 +582,12 @@ public class DxPartService implements RemoteAccess, Serializable {
                         p2 = (WTPart) ViewHelper.service.newBranchForView(tempPart, "Planning");
                         p2.setContainer(tempPart.getContainer());
                         CommonUtil.setFolder("/Default/PBOM/PBOM零部件", tempPart.getContainerReference(), p2);
-                        PersistenceHelper.manager.save(p2);
+                        //set attr
+                        p2 = (WTPart) PersistenceHelper.manager.save(p2);
+                        Map<String, Object> attrMap = new HashMap<String, Object>();
+                        attrMap.put("ePartOid", partById.toString());
+                        IBAUtil.forceSetIBAValues(p2, attrMap);
+                        //set attr end
                     }
                 }
                 ts.commit();