代采订单复制功能

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

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

@@ -5,7 +5,6 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.alibaba.fastjson.JSONObject;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -24,6 +23,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.DeputyEnterprise;
 import com.uas.platform.b2b.model.DeputyHisVendors;
 import com.uas.platform.b2b.model.DeputyLastOrderKeywords;
@@ -43,6 +43,7 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.model.Status;
 import com.uas.platform.core.web.bind.RequestState;
 import com.uas.search.b2b.model.MultiValue;
 import com.uas.search.b2b.model.SPage;
@@ -258,6 +259,72 @@ public class DeputyOrderController {
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
 
+	/**
+	 * 买家查看代采订单（已下载，审核同意）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/getDeOrder", params = RequestState.AGREED, method = RequestMethod.GET)
+	public SPage<DeputyOrder> getDeOrderAgreed(PageParams params, String keyword) {
+		logger.log("客户代采订单", "查看代采订单（审核同意）");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("deo_enuu", SystemSession.getUser().getEnterprise().getUu());
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			pageParams.getFilters().put("deo_enuu", new MultiValue(list, true));
+		}
+		pageParams.getFilters().put("deo_entrystatus", "已提交");
+		pageParams.getFilters().put("deo_downloadstatus", "已下载");
+		pageParams.getFilters().put("deo_statuscode", Status.AGREED.value());
+		// 排序条件
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
+	}
+
+	/**
+	 * 买家查看代采订单（已下载，审核同意）
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/getDeOrder", params = RequestState.REFUSED, method = RequestMethod.GET)
+	public SPage<DeputyOrder> getDeOrderRefused(PageParams params, String keyword) {
+		logger.log("客户代采订单", "查看代采订单（审核不同意）");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		// 当前登录企业作为供应商
+		pageParams.getFilters().put("deo_enuu", SystemSession.getUser().getEnterprise().getUu());
+		SearchFilter filter = userService.distribute();
+		if (filter != null && filter.getDistribute() == null) {
+			return null;
+		}
+		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
+			List<Object> list = new ArrayList<>();
+			for (Object object : filter.getDistribute()) {
+				list.add(object);
+			}
+			pageParams.getFilters().put("deo_enuu", new MultiValue(list, true));
+		}
+		pageParams.getFilters().put("deo_entrystatus", "已提交");
+		pageParams.getFilters().put("deo_downloadstatus", "已下载");
+		pageParams.getFilters().put("deo_statuscode", Status.NOTAGREED.value());
+		// 排序条件
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
+	}
+
 	/**
 	 * 查看订单详情
 	 * 
@@ -437,9 +504,21 @@ public class DeputyOrderController {
 	 * 
 	 * @return
 	 */
-	@RequestMapping(value = "/repetitions",method = RequestMethod.GET)
+	@RequestMapping(value = "/repetitions", method = RequestMethod.GET)
 	@ResponseBody
 	public Page<DeputyOrdersLog> getRepetitions(PageParams params, String keyword) {
 		return deputyOrderService.getRepetitions(params, keyword);
 	}
+	
+	/**
+	 * 复制代采订单
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/copyorder/{id}", method = RequestMethod.POST)
+	@ResponseBody
+	public ModelMap copyOrder(@PathVariable("id") Long id) {
+		return deputyOrderService.copyOrder(id);
+	}
 }

src/main/java/com/uas/platform/b2b/service/DeputyOrderService.java

@@ -152,4 +152,12 @@ public interface DeputyOrderService {
 	 * @return
 	 */
 	public DeputyLastOrderKeywords getLastKeywords();
+
+	/**
+	 * 通过主表id复制一张代采订单
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public ModelMap copyOrder(Long id);
 }

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

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -223,6 +224,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		order.setVenduser(deorder.getVenduser());
 		order.setVenduseruu(deorder.getVenduseruu());
 		order.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		order.setUseruu(SystemSession.getUser().getUserUU());
 		order.setEntrystatus(deorder.getEntrystatus());
 		order.setDeputyuu(deorder.getDeputyuu());// TODO
 		order.setPaycomaddress(deorder.getPaycomaddress());
@@ -233,6 +235,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		order.setPickupdate(deorder.getPickupdate());
 		order = deputyOrderDao.save(order);
 		int i = 1;
+		System.out.println(JSON.toJSON(deorder.getDeputyOrderItems()));
 		List<DeputyOrderItem> items = new ArrayList<DeputyOrderItem>();
 		if (order.getId() != null) {
 			if (!CollectionUtils.isEmpty(deorder.getDeputyOrderItems())) {
@@ -300,7 +303,6 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		keywords.setEnuu(SystemSession.getUser().getEnterprise().getUu());
 		keywords.setMadealcode(order.getMadealcode());
 		keywords.setMadealdate(order.getMadealdate());
-		System.out.println(JSON.toJSON(keywords));
 		deputyLastOrderKeywordsDao.save(keywords);
 		return map;
 	}
@@ -459,4 +461,27 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		return deputyLastOrderKeywordsDao.findByEnuu(SystemSession.getUser().getEnterprise().getUu());
 	}
 
+	@Override
+	public ModelMap copyOrder(Long id) {
+		DeputyOrder oldorder = deputyOrderDao.findOne(id);
+		oldorder.setId(null);
+		oldorder.setSalecode(null);
+		oldorder.setSalepocode(null);
+		SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmss_sss");
+		oldorder.setCode("DC" + sdf.format(new Date()));
+		oldorder.setDate(new Date());
+		oldorder.setUseruu(SystemSession.getUser().getUserUU());
+		oldorder.setEntrystatus("保存");
+		if (!CollectionUtils.isEmpty(oldorder.getDeputyOrderItems())) {
+			for (DeputyOrderItem item : oldorder.getDeputyOrderItems()) {
+				item.setId(null);
+				item.setDeoid(null);
+				item.setDetno(null);
+				item.setDeputyOrder(null);
+			}
+		}
+		System.out.println(JSON.toJSON(oldorder));
+		return saveDeOrder(oldorder);
+	}
+
 }