【退货单】单据中不包含采购单详情的，采用以enuu获取企业信息的方式显示企业名称。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7161 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/SaleReturnController.java

@@ -14,9 +14,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.PurchaseReturn;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
+import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.PurchaseReturnService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -49,6 +51,9 @@ public class SaleReturnController {
 
 	@Autowired
 	private SearchService searchService;
+	
+	@Autowired
+	private EnterpriseService enterpriseService;
 
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
@@ -95,6 +100,17 @@ public class SaleReturnController {
 		return purchaseReturnService.findById(id);
 	}
 
+	/**
+	 * 根据企业uu获取客户名称
+	 * @param enuu
+	 * @return
+	 */
+	@RequestMapping(value = "/{id}/enname", method = RequestMethod.GET)
+	@ResponseBody
+	public Enterprise getEnterprieNameByEnuu(@PathVariable("id")Long id,Long enuu) {
+		return enterpriseService.findByEnUU(enuu);
+	}
+	
 	/**
 	 * 导出
 	 * 

src/main/java/com/uas/platform/b2b/service/PurchaseInquiryMouldService.java

@@ -232,7 +232,7 @@ public interface PurchaseInquiryMouldService {
 
 
 	/**
-	 * 根据venduu和erpSourceId获取单据
+	 * 根据enuu和erpSourceId获取单据
 	 * 
 	 * @param enuu
 	 * @param in_id

src/main/webapp/resources/js/index/app.js

@@ -4009,6 +4009,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		var getService = function() {
 			return PurcReturn;
 		};
+		
 		$scope.tableParams = new ngTableParams({
 			page : 1, 
 			count : 5,
@@ -4028,6 +4029,13 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 						params.total(page.totalElement);
 						$defer.resolve(page.content);
 						$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
+						angular.forEach(page.content, function(data) {
+							if (!data.returnItems[0].orderItem) {
+								PurcReturn.getEnterpriseName({id: data.id, enuu : data.enUU},function(enterprise) {
+									data.enName = enterprise.enName;
+								});
+							}
+						});
 					}
 				}, function(response){
 					$scope.loading = false;

src/main/webapp/resources/js/index/services/Purc.js

@@ -303,7 +303,13 @@ define([ 'ngResource'], function() {
 		});
 	}]).factory('PurcReturn', ['$resource', function($resource) {
 		return $resource('sale/return/:id', {}, {
-			getAll: {}
+			getAll: {
+				
+			},
+			getEnterpriseName: {
+				url:"sale/return/:id/enname",
+				method: "GET"
+			}
 		});
 	}]).factory('PurcBadIn', ['$resource', function($resource) {
 		return $resource('sale/badIn/:id', {}, {

src/main/webapp/resources/tpl/index/sale/returns.html

@@ -218,8 +218,9 @@
 						class="text-num" ng-bind="::returns.code"></a></span>
 				</div>
 			</td>
-			<td colspan="3"><a title="客户名称"
+			<td colspan="3" ng-if="returns.returnItems[0].orderItem"><a title="客户名称"
 				ng-bind="::returns.returnItems[0].orderItem.order.enterprise.enName"></a></td>
+			<td colspan="3" ng-if="!returns.returnItems[0].orderItem"><a title="客户名称">{{returns.enName}}</a></td>
 			<td colspan="1" class="order-sum">
 				<div class="text-ellipsis" ng-if="returns.sendCode != null" style="width: 120px;" title="送货单号：{{::returns.sendCode}}" > 
 					<i style="color: #CC9933;" class="fa fa-truck"></i>