代采订单页面字段增加，功能更新

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

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

@@ -46,6 +46,12 @@ public class DeputyOrderItem implements Serializable {
 	@Column(name = "dei_prodname")
 	private String prodname;
 
+	/**
+	 * 品牌
+	 */
+	@Column(name = "dei_prodbrand")
+	private String prodbrand;
+
 	/**
 	 * 产品型号
 	 */
@@ -177,4 +183,12 @@ public class DeputyOrderItem implements Serializable {
 		this.detno = detno;
 	}
 
+	public String getProdbrand() {
+		return prodbrand;
+	}
+
+	public void setProdbrand(String prodbrand) {
+		this.prodbrand = prodbrand;
+	}
+
 }

src/main/java/com/uas/platform/b2b/service/impl/DeputyOrderServiceImpl.java

@@ -83,26 +83,32 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 						info.setProdspec(row.getCell(2).getStringCellValue().trim());
 					}
 
-					// 数量
+					// 品牌
 					if (row.getCell(3) != null) {
 						row.getCell(3).setCellType(Cell.CELL_TYPE_STRING);
-						info.setAmount(Integer.valueOf(row.getCell(3).getStringCellValue()));
+						info.setProdbrand(row.getCell(3).getStringCellValue());
 					}
 
-					// 单价
+					// 数量
 					if (row.getCell(4) != null) {
 						row.getCell(4).setCellType(Cell.CELL_TYPE_STRING);
-						info.setUnitprice(Double.valueOf(row.getCell(4).getStringCellValue()));
+						info.setAmount(Integer.valueOf(row.getCell(4).getStringCellValue()));
 					}
-					// 总价
+
+					// 单价
 					if (row.getCell(5) != null) {
 						row.getCell(5).setCellType(Cell.CELL_TYPE_STRING);
-						info.setTotalprice(Double.valueOf(row.getCell(5).getStringCellValue()));
+						info.setUnitprice(Double.valueOf(row.getCell(5).getStringCellValue()));
 					}
-					// 备注
+					// 总价
 					if (row.getCell(6) != null) {
 						row.getCell(6).setCellType(Cell.CELL_TYPE_STRING);
-						info.setRemark(row.getCell(6).getStringCellValue().trim());
+						info.setTotalprice(Double.valueOf(row.getCell(6).getStringCellValue()));
+					}
+					// 备注
+					if (row.getCell(7) != null) {
+						row.getCell(7).setCellType(Cell.CELL_TYPE_STRING);
+						info.setRemark(row.getCell(7).getStringCellValue().trim());
 					}
 					if (alters.size() > 0) {
 						modelMap.put("alters", alters);
@@ -164,6 +170,8 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		order.setRiskmethod(deorder.getRiskmethod());
 		order.setShipdate(deorder.getShipdate());
 		order.setDownloadstatus("未下载");
+		order.setSalecode(deorder.getSalecode());
+		order.setSalepocode(deorder.getSalepocode());
 		if (deorder.getStatus().equals("在录入")) {
 			order.setStatus(Status.UNAUDIT.getPhrase());
 			order.setStatuscode(Status.UNAUDIT.value());

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

@@ -11020,6 +11020,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 						{ 	prodname: null, 
 							prodcode: null, 
 							prodspec: null, 
+							prodbrand: null,
 							amount: null, 
 							unitprice: null, 
 							remark: null,
@@ -11030,6 +11031,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		$scope.del = function(index) {
 			$scope.deOrder.deputyOrderItems.splice(index, 1);
 		};
+		// 导入商品信息
 		$scope.uplodaByBatch = function() {
 			var modalInstance = $modal.open({
 				templateUrl: 'static/tpl/index/purc/modal/uplodaByBatch.html',
@@ -11050,7 +11052,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					angular.forEach($scope.deOrder.deputyOrderItems, function(item) {
 						$scope.deOrder.totalamount += item.amount * item.unitprice;
 						$scope.deOrder.usdpayment += item.amount * item.unitprice;
-						$scope.deOrder.orderamount += item.amount * item.purcprice;
+						$scope.deOrder.orderamount += item.amount * item.unitprice * (1 + $scope.rate.rate);
 					});
 				})
 				

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

@@ -334,7 +334,7 @@
                             </div>
                             <div class="fr">
                             	 <em>订单总价款({{deOrder.currency}})：</em>
-                                <span >{{deOrder.orderamount*(1+rate.rate)}}</span>
+                                <span >{{deOrder.orderamount}}</span>
                             </div>
                         </li>
                         <li>

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

@@ -314,7 +314,7 @@
                             <span class="wid02"><input type="text" class="text-center" ng-model="item.prodname"></span>
                             <span><input type="text" class="text-center" ng-model="item.prodcode"></span>
                             <span><input type="text" class="text-center" ng-model="item.prodspec"></span>
-                            <span><input type="text" class="text-center"></span>
+                            <span><input type="text" class="text-center" ng-model="item.prodbrand"></span>
                             <span><input type="text" class="text-center" ng-model="item.amount"></span>
                             <span><input type="text" class="text-center" ng-model="item.unitprice"></span>
                             <span>{{item.unitprice*(1+rate.rate)| number: 2}}</span>
@@ -342,7 +342,7 @@
                             </div>
                             <div class="fr">
                             	 <em>订单总价款({{deOrder.currency}})：</em>
-                                <span >{{deOrder.orderamount*(1+rate.rate)}}</span>
+                                <span >{{deOrder.orderamount}}</span>
                             </div>
                         </li>
                         <li>