代采功能优化更新：1、增加下载和未下载状态过滤，方便查询；2、重复单据传输后传回平台进行状态更新，防止一直传输下载；3、代采企业调整，不再关联企业信息，可以一个代采uu对应多个名称

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

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

@@ -210,6 +210,7 @@ public class DeputyOrderController {
 			pageParams.getFilters().put("deo_enuu", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("deo_entrystatus", "已提交");
+		pageParams.getFilters().put("deo_downloadstatus", "未下载");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
@@ -241,6 +242,7 @@ public class DeputyOrderController {
 			pageParams.getFilters().put("deo_enuu", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("deo_entrystatus", "已提交");
+		pageParams.getFilters().put("deo_downloadstatus", "已下载");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));

src/main/java/com/uas/platform/b2b/erp/controller/DeputyOrderDownController.java

@@ -158,6 +158,9 @@ public class DeputyOrderDownController {
 					log.setDate(new Date());
 					deputyOrdersLogDao.save(log);
 				}
+				DeputyOrder order = deputyOrderDao.findOne(log.getSourceid());
+				order.setDownloadstatus("停止下载");
+				deputyOrderDao.save(order);
 			}
 		}
 	}

src/main/java/com/uas/platform/b2b/model/DeputyEnterprise.java

@@ -3,14 +3,11 @@ package com.uas.platform.b2b.model;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
@@ -50,12 +47,19 @@ public class DeputyEnterprise implements Serializable {
 	@Column(name = "de_deputyenuu")
 	private Long deputyenuu;
 	
+	// /**
+	// * 代采企业
+	// */
+	// @OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
+	// @JoinColumn(name = "de_deputyenuu", insertable = false, updatable =
+	// false)
+	// private Enterprise deputyEnterprise;
+
 	/**
-	 * 代采企业
+	 * 代采企业名称（和上面uu号无关，这个是名称传输，uu号是传到指定的账套）
 	 */
-	@OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
-	@JoinColumn(name = "de_deputyenuu", insertable = false, updatable = false)
-	private Enterprise deputyEnterprise;
+	@Column(name = "de_deputyenname")
+	private String deputyenname;
 
 	/**
 	 * 设置人uu
@@ -109,12 +113,20 @@ public class DeputyEnterprise implements Serializable {
 		this.date = date;
 	}
 
-	public Enterprise getDeputyEnterprise() {
-		return deputyEnterprise;
+	public String getDeputyenname() {
+		return deputyenname;
 	}
 
-	public void setDeputyEnterprise(Enterprise deputyEnterprise) {
-		this.deputyEnterprise = deputyEnterprise;
+	public void setDeputyenname(String deputyenname) {
+		this.deputyenname = deputyenname;
 	}
 
+	// public Enterprise getDeputyEnterprise() {
+	// return deputyEnterprise;
+	// }
+	//
+	// public void setDeputyEnterprise(Enterprise deputyEnterprise) {
+	// this.deputyEnterprise = deputyEnterprise;
+	// }
+
 }

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

@@ -12768,7 +12768,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 代采企业列表
 		DeputyOrder.deputyEnterprise({}, function(data) {
 			$scope.deputyEnterprises = data;
-			$scope.deOrder.deputyuu = $scope.deputyEnterprises[0].deputyEnterprise.uu;
+			$scope.deOrder.deputyuu = $scope.deputyEnterprises[0].deputyenuu;
 			// 费率
 			DeputyOrder.vendorRate( {enuu: $scope.deOrder.deputyuu}, {}, function(data) {
 				$scope.rate = data;
@@ -13113,7 +13113,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 代采企业列表
 		DeputyOrder.deputyEnterprise({}, function(data) {
 			$scope.deputyEnterprises = data;
-			$scope.deOrder.deputyuu = $scope.deputyEnterprises[0].deputyEnterprise.uu;
+			$scope.deOrder.deputyuu = $scope.deputyEnterprises[0].deputyenuu;
 			// 费率
 			DeputyOrder.vendorRate( {enuu: $scope.deOrder.deputyuu}, {}, function(data) {
 				$scope.rate = data;

src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -196,7 +196,7 @@
                         </div>
                         <div class="btn-group">
                             <button type="button" class="btn btn-select"
-                                    ng-class="{'btn-selected':active=='done'}" ng-click="setActive('end')">已下载</button>
+                                    ng-class="{'btn-selected':active=='end'}" ng-click="setActive('end')">已下载</button>
                         </div>
                     </div>
                    <!-- <div class="col-xs-1 pull-right" style="padding-top: 5px;">

src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -293,7 +293,7 @@
                                 <em><b>*</b>代采企业：</em>
                                <span>
                                		<select name="" class="select" ng-model="deOrder.deputyuu"  style="width: 200px" 
-                               			ng-options="deputyEn.deputyEnterprise.uu as deputyEn.deputyEnterprise.enName for deputyEn in deputyEnterprises"  ng-disabled="!deOrder.$editing">
+                               			ng-options="deputyEn.deputyenuu as deputyEn.deputyenname for deputyEn in deputyEnterprises" ng-disabled="!deOrder.$editing">
                                		<option value="">请选择代采企业</option>
                                		</select>
                                </span>

src/main/webapp/resources/tpl/index/purc/deputyOrder_new.html

@@ -296,7 +296,7 @@
                                 <em><b>*</b>代采企业：</em>
                                <span>
                                		<select name="" class="select" ng-model="deOrder.deputyuu" style="width: 200px" ng-change="change(deOrder.deputyuu)"
-                               			ng-options="deputyEn.deputyEnterprise.uu as deputyEn.deputyEnterprise.enName for deputyEn in deputyEnterprises">
+                               			ng-options="deputyEn.deputyenuu as deputyEn.deputyenname for deputyEn in deputyEnterprises">
                                		<option value="">请选择代采企业</option>
                                		</select>
                                </span>