Просмотр исходного кода

B2B采购回复每次写的数量不做叠加处理,仅仅只是更新,回复数量只写本次最新的回复数量

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10691 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
huangct 8 лет назад
Родитель
Сommit
33f171e3a7

+ 39 - 31
src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -1,42 +1,12 @@
 package com.uas.platform.b2b.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.servlet.ModelAndView;
-
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
 import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
 import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
-import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderDone;
-import com.uas.platform.b2b.model.PurchaseOrderEnd;
-import com.uas.platform.b2b.model.PurchaseOrderItem;
-import com.uas.platform.b2b.model.PurchaseOrderReceived;
-import com.uas.platform.b2b.model.PurchaseOrderReply;
-import com.uas.platform.b2b.model.PurchaseOrderTodo;
-import com.uas.platform.b2b.model.PurchaseOrderWaiting;
-import com.uas.platform.b2b.model.SearchFilter;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.service.UserService;
@@ -55,6 +25,21 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 卖家对订单的操作
@@ -556,6 +541,29 @@ public class SaleOrderController {
 		return purchaseOrderService.findReplyByOrderItem(orderItemId);
 	}
 
+
+	/**
+	 * 作为卖家,查看我的回复
+	 *
+	 * @param orderItemId
+	 *            订单明细行ID
+	 * @return
+	 */
+	@RequestMapping(value = "/items/{orderItemId}/latestReplyQty", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap getLatestReplyQty(@PathVariable("orderItemId") Long orderItemId) {
+		ModelMap map = new ModelMap();
+		Double latestReplyQty = null;
+		List<PurchaseOrderReply> orderReplies = purchaseOrderService.findReplyByOrderItem(orderItemId);
+		if (!CollectionUtils.isEmpty(orderReplies)) {
+			latestReplyQty = orderReplies.get(0).getQty();
+		}
+
+		map.put("latestReplyQty",latestReplyQty);
+
+		return map;
+	}
+
 	/**
 	 * 作为卖家,批量回复采购订单
 	 *

+ 8 - 1
src/main/webapp/resources/js/index/services/Purc.js

@@ -72,7 +72,7 @@ define([ 'ngResource'], function() {
 				params: {
 					orderItemId: 'orderItemId'
 				}
-			}, 
+			},
 			getReply: {
 				url: 'sale/orders/items/:orderItemId/reply',
 				method: 'GET',
@@ -81,6 +81,13 @@ define([ 'ngResource'], function() {
 					orderItemId: 'orderItemId'
 				}
 			},
+			getLatestReplyQty: {
+				url: 'sale/orders/items/:orderItemId/latestReplyQty',
+				method: 'GET',
+				params: {
+				orderItemId: 'orderItemId'
+				}
+			},
 			setRead:{
 				url: 'sale/orders/setRead',
 				method: 'POST'