新增采购单增加税率

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

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

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.FileUpload;
@@ -212,7 +211,6 @@ public class BaseInfoController {
 			e.printStackTrace();
 		}
 		logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了物料，数量为" + map.size());
-		System.out.println(JSON.toJSON(map));
 		return map;
 	}
 	

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

@@ -317,6 +317,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				orderItem.setNumber(i);
 				orderItem.setOrder(purcOrder);
 				orderItem.setPrice(Double.valueOf(orderitem.getPrice()));
+				orderItem.setTaxrate(orderitem.getRate());
 				orderItems.add(orderItem);
 				i++;
 			}
@@ -521,6 +522,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				cartDetail.setNumber(i);
 				cartDetail.setCart(cart);
 				cartDetail.setPrice(Double.valueOf(orderitem.getPrice()));
+				cartDetail.setTaxrate(orderitem.getRate());
 				cartDetails.add(cartDetail);
 				i++;
 			}

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

@@ -107,6 +107,7 @@ public class CartServiceImpl implements CartService {
 				orderItem.setNumber(i);
 				orderItem.setOrder(purcOrder);
 				orderItem.setPrice(Double.valueOf(cartdetail.getPrice()));
+				orderItem.setTaxrate(cartdetail.getTaxrate());
 				orderItems.add(orderItem);
 				i++;
 			}

src/main/java/com/uas/platform/b2b/temporary/model/OrderItems.java

@@ -20,6 +20,7 @@ public class OrderItems {
 	private String unit;
 	private Long userUU;
 	private Long sourceId;
+	private Float rate;
 
 	public Date getDelivery() {
 		return delivery;
@@ -141,12 +142,21 @@ public class OrderItems {
 		this.remark = remark;
 	}
 
+	public Float getRate() {
+		return rate;
+	}
+
+	public void setRate(Float rate) {
+		this.rate = rate;
+	}
+
 	@Override
 	public String toString() {
 		return "OrderItems [delivery=" + delivery + ", qty=" + qty + ", remark=" + remark + ", price=" + price
 				+ ", code=" + code + ", enUU=" + enUU + ", id=" + id + ", leadtime=" + leadtime + ", minOrder="
 				+ minOrder + ", minPack=" + minPack + ", spec=" + spec + ", title=" + title + ", unit=" + unit
-				+ ", userUU=" + userUU + ", sourceId=" + sourceId + "]";
+				+ ", userUU=" + userUU + ", sourceId=" + sourceId + ", rate=" + rate + "]";
 	}
 
+
 }

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

@@ -8274,6 +8274,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				if($scope.order.orderItems[i].delivery instanceof Date) {
 					$scope.order.orderItems[i].delivery = $scope.order.orderItems[i].delivery.getTime();
 				}
+				if($scope.order.currency != 'RMB') {
+					$scope.order.orderItems[i].rate = 0;
+				}
 			}
 			addtoCart.save({}, $scope.order, function(data){
 				$scope.loading = false;
@@ -8299,6 +8302,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				if($scope.order.orderItems[i].delivery instanceof Date) {
 					$scope.order.orderItems[i].delivery = $scope.order.orderItems[i].delivery.getTime();
 				}
+				if($scope.order.currency != 'RMB') {
+					$scope.order.orderItems[i].rate = 0;
+				}
 			}
 			newPurcOrder.save({}, $scope.order, function(data){
 				$scope.loading = false;

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

@@ -111,7 +111,8 @@
                     <b>{{item.unit}}</b>
                     <b><input class="editable" type="text" ng-model="item.price" placeholder="单价" style="cursor: pointer;" required="true" ng-pattern="/^(([0-9]+\.[0-9]{1,6})|([0-9]*[1-9][0-9]*\.[0-9]{1,6})|([0-9]*[1-9][0-9]*))$/"/></b>
                     <b><input class="editable" type="text" ng-model="item.qty"  placeholder="数量" style="cursor: pointer;" required="true" ng-pattern="/^\+?[1-9][0-9]*$/"/></b>
-                    <b><input class="editable" type="text" ng-model="item.rate" placeholder="税率" style="cursor: pointer;" ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/"/></b>
+                    <b ng-if="order.currency == 'RMB'"><input class="editable" type="text" ng-model="item.rate" placeholder="税率" style="cursor: pointer;" ng-pattern="/^[1-9][0-9]{0,1}$/"/></b>
+                    <b ng-if="order.currency != 'RMB'"><input class="editable" type="text" style="cursor: pointer;" value="0" readonly="readonly"/></b>
                     <b>
 						<input ng-model="item.delivery" type="text" class="editable" 
 							placeholder="选择时间" datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"