| 
					
				 | 
			
			
				@@ -292,6 +292,9 @@ public class SynSupplierFromSAPTask extends AbstractTask implements StopTask { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //        DynamicObject groupstandard = BusinessDataServiceHelper.loadSingleFromCache("bd_suppliergroupstandard", "id, number, name", qFilter.toArray()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //子分录--默认分类(支持多分类) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         DynamicObjectCollection groupstandardCol = supplier.getDynamicObjectCollection("entry_groupstandard"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //先清除分类 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        groupstandardCol.clear(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         DynamicObjectType billtype = groupstandardCol.getDynamicObjectType(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         DynamicObject groupdetail = new DynamicObject(billtype); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         groupdetail.set("standardid", suppliergroup.getDynamicObject("standard")); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -332,8 +335,35 @@ public class SynSupplierFromSAPTask extends AbstractTask implements StopTask { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             DynamicObject customerObj = BusinessDataServiceHelper.loadSingle(supplierId, "bd_supplier"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            OperationServiceHelper.executeOperate("submit", ENTITY_SUPPLIER, new DynamicObject[]{customerObj}, OperateOption.create()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            OperationServiceHelper.executeOperate("audit", ENTITY_SUPPLIER, new DynamicObject[]{customerObj}, OperateOption.create()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            OperationResult resultSubmit = OperationServiceHelper.executeOperate("submit", ENTITY_SUPPLIER, new DynamicObject[]{customerObj}, OperateOption.create()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            err.setLength(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (resultSubmit.getSuccessPkIds().size() <= 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                for (int i = 0; i < resultSubmit.getAllErrorOrValidateInfo().size(); i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    String message = resultSubmit.getAllErrorOrValidateInfo().get(i).getMessage(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    err.append("/").append(message); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                returnMap.put("code", "500"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                returnMap.put("msg", err.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                return returnMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            OperationResult resultAudit = OperationServiceHelper.executeOperate("audit", ENTITY_SUPPLIER, new DynamicObject[]{customerObj}, OperateOption.create()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            err.setLength(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (resultAudit.getSuccessPkIds().size() <= 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                for (int i = 0; i < resultAudit.getAllErrorOrValidateInfo().size(); i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    String message = resultAudit.getAllErrorOrValidateInfo().get(i).getMessage(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    err.append("/").append(message); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                returnMap.put("code", "500"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                returnMap.put("msg", err.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                return returnMap; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //组织分配 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -367,7 +397,7 @@ public class SynSupplierFromSAPTask extends AbstractTask implements StopTask { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if(differenceList.size() > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         String unAssignOrgString = String.join(",", differenceList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        logger.info("同步成功、部分组织分配失败:" + unAssignOrgString + ", 这些组织在星瀚中为匹配到!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        logger.info("同步成功、部分组织分配失败:" + unAssignOrgString + ", 这些组织在星瀚中未匹配到!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 |