8 жил өмнө · 9ec65d167d
--- a/src/main/java/com/uas/platform/b2b/service/impl/PurcOrderServiceImpl.java
+++ b/src/main/java/com/uas/platform/b2b/service/impl/PurcOrderServiceImpl.java
@@ -188,7 +188,7 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 
				 						modelMap.put("success", total - alters.size());

			
 
				 						// 如果物料不存在，则进行存储

			
 
				 						List<Product> prods = productDao

			
 
				-								.findByEnUUAndTitle(SystemSession.getUser().getEnterprise().getUu(), product.getTitle());

			
 
				+								.findByEnUUAndTitle(SystemSession.getUser().getEnterprise().getUu(), product.getCode());

			
 
				 						if (CollectionUtils.isEmpty(prods)) {

			
 
				 							product = productDao.save(product);

			
 
				 						} else {

			
--- a/src/main/webapp/resources/js/index/app.js
+++ b/src/main/webapp/resources/js/index/app.js
@@ -12961,6 +12961,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', '$http', function($scope, cartOperation, $stateParams, toaster, $timeout, BaseService, ngTableParams, $filter, Product, Vendor, ShipAddress, $modal, newPurcOrder, addtoCart, $http) {

			
 
				 		BaseService.scrollBackToTop();

			
 
				+		$scope.loading = true;

			
 
				 		var loadData = function() {

			
 
				 			cartOperation.getCartDetail({id: $stateParams.id}, function(data) {

			
 
				 				if(data.code) {

			
@@ -13201,7 +13202,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
				 			});

			
 
				 			modalInstance.result.then(function(data) {

			
 
				 				$scope.contact = data;

			
 
				-				$scope.contact.venduu = uu;

			
 
				+				$scope.contact.venduu = $scope.order.receiveCode;

			
 
				 				Vendor.saveContact({}, $scope.contact, function(data) {

			
 
				 					Vendor.contacts({venduu: $scope.order.receiveCode}, {}, function(data) {

			
 
				 						$scope.contacts = data;

			
--- a/src/main/webapp/resources/tpl/index/purc/cart_detail.html
+++ b/src/main/webapp/resources/tpl/index/purc/cart_detail.html
@@ -60,6 +60,9 @@
 
				 }

			
 
				 </style>

			
 
				 <body>

			
 
				+	<div class="loading in" ng-class="{'in': loading}">

			
 
				+		<i></i>

			
 
				+	</div>

			
 
				 	<div class="wrap" id="pub">

			
 
				 		<div class="content">

			
 
				 			<!--<div class="com_title">服务>采购模块>采购单<font>>新增采购单</font></div>-->