优化平台采购删除功能

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

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

@@ -1,6 +1,20 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.dao.PagingReleaseDao;
+import java.util.List;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.transaction.Transactional;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
 import com.uas.platform.b2b.dao.VendorDao;
@@ -16,19 +30,6 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.search.b2b.model.SPage;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.transaction.Transactional;
-import java.util.List;
 
 @Service
 @Transactional
@@ -42,9 +43,6 @@ public class CartServiceImpl implements CartService {
 	@Autowired
 	private VendorDao vendorDao;
 
-	@Autowired
-	private  PagingReleaseDao pagingReleaseDao;
-
 	@Autowired
 	private PurchaseOrderAllDao purchaseOrderAllDao;
 
@@ -94,8 +92,10 @@ public class CartServiceImpl implements CartService {
 				purchaseOrderAllItemDao.delete(detail.getId());
 			}
 			purchaseOrderAllDao.delete(id);
+		} else if (purcOrder != null && CollectionUtils.isEmpty(purcOrder.getOrderItems())) {
+			purchaseOrderAllDao.delete(id);
 		} else {
-			map.put("error", "该条记录不存在，可能已被删除");
+			map.put("error", "该单据不存在，可能已被删除");
 		}
 		map.put("success", "删除成功");
 		return map;

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

@@ -479,6 +479,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmss_sss");
 		oldorder.setCode("DC" + sdf.format(new Date()));
 		oldorder.setDate(new Date());
+		oldorder.setEntrydate(new Date());
 		oldorder.setUseruu(SystemSession.getUser().getUserUU());
 		oldorder.setEntrystatus("保存");
 		oldorder.setStatus("在录入");

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

@@ -12959,7 +12959,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	/**
 	 * 购物车详情
 	 */
-	app.controller('CartDetailController', ['$scope', 'cartOperation', '$stateParams', 'toaster', '$timeout', 'BaseService', 'ngTableParams', '$filter', 'Product', 'Vendor', 'ShipAddress', '$modal', 'newPurcOrder', 'addtoCart', function($scope, cartOperation, $stateParams, toaster, $timeout, BaseService, ngTableParams, $filter, Product, Vendor, ShipAddress, $modal, newPurcOrder, addtoCart) {
+	app.controller('CartDetailController', ['$scope', 'cartOperation', '$stateParams', 'toaster', '$timeout', 'BaseService', 'ngTableParams', '$filter', 'Product', 'Vendor', 'ShipAddress', '$modal', 'newPurcOrder', 'addtoCart', '$http', function($scope, cartOperation, $stateParams, toaster, $timeout, BaseService, ngTableParams, $filter, Product, Vendor, ShipAddress, $modal, newPurcOrder, addtoCart, $http) {
 		BaseService.scrollBackToTop();
 		var loadData = function() {
 			cartOperation.getCartDetail({id: $stateParams.id}, function(data) {
@@ -12982,6 +12982,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		};
 		loadData();
 		
+		// 获取地址信息
+		$http.get('resources/citydata/city.json',  {"Accept": "application/json;charset=utf-8", "Accept-Charset": "charset=utf-8"
+		   }).then(function(response) {
+			$scope.provinces = response.data;
+		});
+		
 		// 获取收货地址列表
 		ShipAddress.shipAddList({}, function(data) {
 			$scope.ships = data;