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

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

@@ -15,6 +15,7 @@ import com.uas.platform.b2b.model.PurchaseOrderChange;
 import com.uas.platform.b2b.service.PurchaseOrderChangeService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
@@ -36,12 +37,12 @@ public class SaleOrderChangeController {
 	 * @param json
 	 * @return
 	 */
-	@RequestMapping(method = RequestMethod.POST)
+	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public Page<PurchaseOrderChange> getReceivedPurchaseOrders(@RequestBody String json) {
-		PageInfo info = new PageInfo(json);
+	public Page<PurchaseOrderChange> getReceivedPurchaseOrders(PageParams params) {
+		PageInfo info = new PageInfo(params);
 		// 我作为卖家，把我的企业ID作为供应商ID传入
-		info.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
+		info.filter("order.vendUU", SystemSession.getUser().getEnterprise().getUu());
 		return purchaseOrderChangeService.findAllByPageInfo(info);
 	}
 

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

@@ -133,7 +133,7 @@ public class PurchaseOrderChange implements Serializable {
 	/**
 	 * 采购订单
 	 */
-	@OneToOne(cascade = { CascadeType.MERGE })
+	@OneToOne(cascade = { CascadeType.REFRESH })
 	@JoinColumn(name = "pc_puid", insertable = false, updatable = false)
 	private PurchaseOrder order;
 

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

@@ -14,6 +14,8 @@ import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
+import org.codehaus.jackson.annotate.JsonIgnore;
+
 /**
  * 平台里面的订单变更单明细
  * 
@@ -109,6 +111,7 @@ public class PurchaseOrderChangeItem {
 		this.number = number;
 	}
 
+	@JsonIgnore
 	public PurchaseOrderChange getOrderChange() {
 		return orderChange;
 	}

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

@@ -11,6 +11,8 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
+import org.codehaus.jackson.annotate.JsonIgnore;
+
 /**
  * 平台里面，以供应商的角度来查看采购订单明细
  * 
@@ -139,6 +141,7 @@ public class PurchaseOrderItem {
 		this.number = number;
 	}
 
+	@JsonIgnore
 	public PurchaseOrder getOrder() {
 		return order;
 	}

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

@@ -107,7 +107,7 @@
 	border: none;
 }
 </style>
-<div ng-controller="SaleOrderCtrl" class="block">
+<div ng-controller="SaleChangeCtrl" class="block">
 	<div class="loading in">
 		<i></i>
 	</div>
@@ -115,8 +115,10 @@
 		<div class="state-wrap">
 			<ul class="list-unstyled list-inline">
 				<li class="first"><a href="#"><span>所有订单</span></a></li>
-				<li><a ui-sref="sale.order.reply"><span>待回复</span><em class="tm-h">6</em></a></li>
-				<li class="active"><a ui-sref="sale.change"><span>变更中</span><em class="tm-h">2</em></a></li>
+				<li><a ui-sref="sale.order.reply"><span>待回复</span><em
+						class="tm-h">6</em></a></li>
+				<li class="active"><a ui-sref="sale.change"><span>变更中</span><em
+						class="tm-h">2</em></a></li>
 				<li><a href="#"><span>待发货</span><em class="tm-h">0</em></a></li>
 				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
 			</ul>
@@ -155,14 +157,15 @@
 						<span> <input type="checkbox" class="selector"
 							ng-model="change.$selected">
 						</span> <span class="text-num text-bold" title="{{change.date}}"
-							ng-bind="change.date"></span> <span>订单号：<a
-							class="text-num" ng-bind="change.code" href="#"></a></span>
+							ng-bind="change.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
+							class="text-num" ng-bind="change.code" href="#"></a></span> <span>订单：<a
+							class="text-num" ng-bind="change.order.code" href="#"></a></span>
 					</div>
 				</td>
 				<td colspan="3"><a href="#"
 					ng-bind="change.order.enterprise.enName"></a></td>
 				<td colspan="1" class="order-sum">{{change.newCurrency}}： <span
-					ng-bind="getOrderTotal(change.changeItems) | number : 2"
+					ng-bind="getOrderTotal(change.orderChangeItems) | number : 2"
 					class="text-num text-bold"></span>
 				</td>
 				<td colspan="1" class="text-center">
@@ -172,7 +175,7 @@
 					</div>
 				</td>
 			</tr>
-			<tr class="order-bd" ng-repeat="item in change.changeItems">
+			<tr class="order-bd" ng-repeat="item in change.orderChangeItems">
 				<td class="product">
 					<div class="text-num text-bold">
 						<a href="#" ng-bind="item.newProduct.code"></a>
@@ -183,8 +186,14 @@
 					<div class="text-muted" title="{{item.newProduct.spec}}"
 						ng-bind="item.newProduct.spec"></div>
 				</td>
-				<td class="text-center text-num" title="{{item.newQrice}}"
-					ng-bind="item.newPrice"></td>
+				<td class="text-center">
+					<div class="text-num"
+						ng-class="{'text-inverse': item.newPrice != item.orderItem.price}"
+						title="{{item.newPrice}}" ng-bind="item.newPrice"></div>
+					<div ng-show="item.newPrice != item.orderItem.price">
+						<u class="text-muted" ng-bind="item.orderItem.price"></u>
+					</div>
+				</td>
 				<td class="text-center">
 					<div class="text-num" title="{{item.qty}}" ng-bind="item.newQty"></div>
 					<div class="text-muted" ng-bind="item.newProduct.unit"></div>

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

@@ -156,7 +156,7 @@
 						<span> <input type="checkbox" class="selector"
 							ng-model="order.$selected">
 						</span> <span class="text-num text-bold" title="{{order.date}}"
-							ng-bind="order.date"></span> <span>订单号：<a class="text-num"
+							ng-bind="order.date | date:'yyyy-MM-dd'"></span> <span>订单号：<a class="text-num"
 							ng-bind="order.code" href="#"></a></span>
 					</div>
 				</td>