Merge branch 'dev-mysql' into feature_fix_shenjj

src/main/java/com/uas/platform/b2c/prod/commodity/controller/ProductController.java

@@ -197,6 +197,16 @@ public class ProductController {
 		return productFacade.newStockByStandardProduct(id, isSelfSupport, goods);
 	}
 
+	/**
+	 * 根据物料Id获取替代物料列表
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/{id}/replaces", method = RequestMethod.GET)
+	public List<ProductReplace> getReplacesByProductId(@PathVariable("id") Long id) {
+    	return productService.getReplacesByProductId(id);
+	}
+
     /**
      * 单个匹配
      *

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ProductReplaceDao.java

@@ -12,4 +12,6 @@ public interface ProductReplaceDao extends JpaRepository<ProductReplace, Long>,
 
     @Query(nativeQuery = true, value = "select * from product$replace where ptr_useruu = :userUU and ptr_prid = :prid")
     List<ProductReplace> findByUserUUAndProductId(@Param("userUU") Long userUU, @Param("prid") Long prId);
+
+    List<ProductReplace> findByProductIdOrderByDetno(Long productId);
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/ProductService.java

@@ -49,6 +49,13 @@ public interface ProductService {
      */
     boolean setProductReplacesByPerson(Long productId, List<ProductReplace> productReplaceList);
 
+    /**
+     * 根据物料id获取物料的替代物料列表
+     * @param id
+     * @return
+     */
+    List<ProductReplace> getReplacesByProductId(Long id);
+
 
     /**
      * 下载产品资料

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -381,7 +381,8 @@ public class ProductServiceImpl implements ProductService {
         if (productId == null) {
             return false;
         }
-        Date date = new Date(System.currentTimeMillis());
+        Date date = new Date();
+        // 删除原有的替代料数据
         List<ProductReplace> productReplacesOld = productReplaceDao.findByUserUUAndProductId(SystemSession.getUser().getUserUU(), productId);
         productReplaceDao.delete(productReplacesOld);
         for (ProductReplace productReplace : productReplaceList) {
@@ -392,6 +393,11 @@ public class ProductServiceImpl implements ProductService {
         return true;
     }
 
+    @Override
+    public List<ProductReplace> getReplacesByProductId(Long id) {
+        return productReplaceDao.findByProductIdOrderByDetno(id);
+    }
+
     @Override
     public List<Goods> getProductsGoods(String type, String keyword) {
         final PageInfo page = new PageInfo();

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -1287,6 +1287,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
                 })
             } else {
                 $scope.showSimilarUser = false;
+                loadDataReload();
 			}
 
         }
@@ -1298,6 +1299,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
         $scope.setProdName = function (item) {
 			$scope.enUser.prodName = item.userName;
 			$scope.param.userUU = item.userUU;
+            loadDataReload();
 			$scope.showSimilarUser = false;
         }
 

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1831,8 +1831,8 @@
 			<div class="search-check">
 				<div class="search fl">
 					<label>人员选择：</label>
-					<input type="text" class="form-control prod-name" ng-model="enUser.prodName" ng-change="onUserUUChange()" placeholder="姓名"/>
-					<ul ng-if="showSimilarUser" class="prodUserList" ng-mouseenter="similarUserObj.isInSimilarUser = true" ng-mouseleave="similarUserObj.isInSimilarUser = false">
+					<input type="text" class="form-control prod-name" ng-model="enUser.prodName" ng-change="onUserUUChange()" ng-search="onSearch()" placeholder="姓名"/>
+					<ul ng-if="showSimilarUser" class="prodUserList" ng-mouseenter="similarUserObj.isInSimilarUser = true" ng-search="onSearch()" ng-mouseleave="similarUserObj.isInSimilarUser = false">
 						<li ng-repeat="item in similarUser.content" ng-click="setProdName(item)">
 							{{item.userName}}（{{item.userUU}}）
 						</li>