.

src/main/resources/static/app/basic/enum/service/enumService.js

@@ -263,4 +263,25 @@ angular.module('app.basic').service("enumService", function($http, $q, APP_CONFI
     	});
     	return d.promise;
     }
+    
+    this.findConditionEnum = function(types, parentId, notParentId, notEnumId) {
+    	var d = $q.defer();
+    	$http({
+    		method: 'GET',
+    		url: APP_CONFIG.basicUrl + '/Enum/findConditionEnum',
+    		 params: {
+    			 parentId : parentId,
+    			 notParentId : notParentId,
+    			 notEnumId : notEnumId
+             }
+    	}).then(function successCallback(response) {
+    		var topTree = getTreeByData(response.data, types);
+    		// 请求成功执行代码
+    		d.resolve(topTree);
+    	}, function errorCallback(response) {
+    		// 请求失败执行代码
+    		d.reject("error");
+    	});
+    	return d.promise;
+    }
 });

src/main/resources/static/app/business/storeWareDetail/controller/storeWareDetailModalCtrl.js

@@ -132,11 +132,23 @@ angular.module('app.business').controller("storeWareDetailModalCtrl",
 	// 树形下拉框(粮食性质)
     $scope.getAttributeData = function() {
     	validator = $("#storeWareDetail-form").validate();
-    	var grainAttributeType=1032; //所有的粮油性质
+    	var parentid=1032; //粮油性质父级ID
+    	var notparentid = null;
+    	var notenumid = null;
     	
-    	//计划管理下的计划 粮食性质 不取储备粮的   用items.planManage区分
-    	
-        enumService.getTreeListByTypeId($scope.storeWareDetail.grainAttribute, grainAttributeType,items.planManage).then(function(data) {
+    	//计划管理下的计划 粮食性质 不取储备粮的，合同和通知单管理下出库业务中的粮食性质不取省级储备粮   用items.planManage区分
+    	var ywlx = items.executeType;
+    	detailType = "contract"
+    	if (items.detailType == "contract") {//合同业务
+    		if (ywlx == "3148" || ywlx == "7131") {//出库类型的业务
+    			notenumid = 6877;
+    		}
+    	} else if (items.detailType == "plan") {
+    		notparentid = 3045;
+    		notenumid = 3045;
+    	}
+
+        enumService.findConditionEnum($scope.storeWareDetail.grainAttribute, parentid, notparentid, notenumid).then(function(data) {
             $scope.grainAttributeTreeData = data;
         },function(data) {
             console.log(data);