更新新增采购单功能

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

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

@@ -1,18 +1,54 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
 import com.uas.account.entity.RequsetStatus;
 import com.uas.account.support.Page;
 import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.CartDetailDao;
+import com.uas.platform.b2b.dao.ComponentDao;
+import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.ProductDao;
+import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.event.PurchaseOrderSaveReleaseEvent;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.model.Cart;
+import com.uas.platform.b2b.model.CartDetail;
+import com.uas.platform.b2b.model.Component;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.EnterpriseInfo;
+import com.uas.platform.b2b.model.FileUpload;
+import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.model.PurchaseOrderAllItem;
+import com.uas.platform.b2b.model.UserBaseInfo;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.AttachService;
 import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.*;
+import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
+import com.uas.platform.b2b.temporary.model.NewPurcOrder;
+import com.uas.platform.b2b.temporary.model.OrderItems;
+import com.uas.platform.b2b.temporary.model.PartStatus;
+import com.uas.platform.b2b.temporary.model.ProdInfo;
+import com.uas.platform.b2b.temporary.model.UserSpaceDetail;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
@@ -22,19 +58,6 @@ 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.apache.commons.collections.CollectionUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 @Service
 public class BaseInfoServiceImpl implements BaseInfoService {
@@ -75,6 +98,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	public ModelMap releaseByWorkbook(Workbook workbook) {
 		ModelMap modelMap = new ModelMap();
 		List<String> alters = new ArrayList<String>();
+		List<String> infos = new ArrayList<String>();
 		List<Product> products = new ArrayList<Product>();
 		Sheet sheet = workbook.getSheetAt(0);
 		int rowNum = sheet.getLastRowNum();
@@ -91,9 +115,11 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					if (row.getCell(0) != null) {
 						row.getCell(0).setCellType(Cell.CELL_TYPE_STRING);
 						product.setTitle(row.getCell(0).getStringCellValue().trim());
+					} else {
+						infos.add("第" + r + 1 + "行商品名称为空");
 					}
 
-					// 编号
+					// 型号
 					if (row.getCell(1) != null) {
 						row.getCell(1).setCellType(Cell.CELL_TYPE_STRING);
 						String code = row.getCell(1).getStringCellValue().trim();
@@ -104,6 +130,8 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 						} else {
 							alters.add(code);
 						}
+					} else {
+						infos.add("第" + r + 1 + "行编号为空");
 					}
 
 					// 规格
@@ -139,6 +167,9 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					if (alters.size() > 0) {
 						modelMap.put("alters", alters);
 					}
+					if (infos.size() > 0) {
+						modelMap.put("infos", infos);
+					}
 					if (product.getCode() != null) {
 						modelMap.put("total", total);
 						modelMap.put("success", total - alters.size());
@@ -259,6 +290,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		purcOrder.setEnName(neworder.getCust().getEnName());
 		purcOrder.setCurrency(neworder.getCurrency());
 		purcOrder.setPayments(neworder.getPayments());
+		purcOrder.setRemark(neworder.getRemark());
 		short i = 1;
 		if (!CollectionUtils.isEmpty(neworder.getOrderItems())) {
 			for (OrderItems orderitem : neworder.getOrderItems()) {
@@ -413,6 +445,9 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				spacetDetail.setRequestStatus(request.getStatusCode());
 				spacetDetail.setMethod(request.getMethod());
 			}
+			if (spacetDetail.getBusinessCode().equals(SystemSession.getUser().getEnterprise().getEnBussinessCode())) {
+				spacetDetail.setCurrent(Constant.YES);
+			}
 			spaceDetails.add(spacetDetail);
 		}
 		userSpaceDetails.setContent(spaceDetails);
@@ -444,6 +479,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		cart.setStatus(Status.UNAUDIT.value());
 		cart.setCurrency(neworder.getCurrency());
 		cart.setPayments(neworder.getPayments());
+		cart.setRemark(neworder.getRemark());
 		short i = 1;
 		if (!CollectionUtils.isEmpty(neworder.getOrderItems())) {
 			for (OrderItems orderitem : neworder.getOrderItems()) {

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

@@ -19,10 +19,12 @@ import org.springframework.ui.ModelMap;
 import com.uas.platform.b2b.dao.CartDao;
 import com.uas.platform.b2b.dao.CartDetailDao;
 import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.model.Cart;
 import com.uas.platform.b2b.model.CartDetail;
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 import com.uas.platform.b2b.model.PurchaseOrderAllItem;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.CartService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -46,6 +48,9 @@ public class CartServiceImpl implements CartService {
 	@Autowired
 	private PurchaseOrderAllItemDao purchaseOrderAllItemDao;
 
+	@Autowired
+	private VendorDao vendorDao;
+
 	@Override
 	public org.springframework.data.domain.Page<Cart> getCartList(PageParams params, String keyword) {
 		final PageInfo pageInfo = new PageInfo();
@@ -85,6 +90,7 @@ public class CartServiceImpl implements CartService {
 		purcOrder.setEnName(cart.getEnName());
 		purcOrder.setCurrency(cart.getCurrency());
 		purcOrder.setPayments(cart.getPayments());
+		purcOrder.setRemark(cart.getRemark());
 		short i = 1;
 		if (!CollectionUtils.isEmpty(cart.getCartDetails())) {
 			for (CartDetail cartdetail : cart.getCartDetails()) {
@@ -171,4 +177,9 @@ public class CartServiceImpl implements CartService {
 		return cartDao.getTodoCountByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(),
 				Status.UNAUDIT.value());
 	}
+
+	@Override
+	public List<Vendor> getVendorInfo() {
+		return vendorDao.findByMyEnUU(SystemSession.getUser().getEnterprise().getUu());
+	}
 }