处理产品bug问题

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

@@ -290,7 +290,7 @@ public class ProductController {
 	 * @return
 	 */
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-	public Product getProducts(@PathVariable("id") Long id) {
+	public V_ProductPrivate getProducts(@PathVariable("id") Long id) {
 		return productService.getProductById(id);
 	}
 

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

@@ -168,7 +168,7 @@ public interface ProductService {
      * @param id
      * @return
      */
-    Product getProductById(Long id);
+    V_ProductPrivate getProductById(Long id);
 
     /**
      * 通过product id获取物料交易详情

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

@@ -194,6 +194,8 @@ public class ProductServiceImpl implements ProductService {
     @Override
     public Page<V_ProductPrivate> getAllProducts(final PageInfo page, String keyword, String type) {
         page.expression(PredicateUtils.eq("enUU", SystemSession.getUser().getEnterprise().getUu(), true));
+        page.expression(PredicateUtils.isNotNull("pcmpcode"));
+        page.expression(PredicateUtils.isNotNull("pbranden"));
         if (StringUtils.isEmpty(type)) {
             type = "nStandard";
         }
@@ -1335,11 +1337,11 @@ public class ProductServiceImpl implements ProductService {
      * @return
      */
     @Override
-    public Product getProductById(Long id) {
-        if(id == null) {
+    public V_ProductPrivate getProductById(Long id) {
+        if (id == null) {
             return null;
-        }else {
-            return productDao.findOne(id);
+        } else {
+            return v_productPrivateDao.findOne(id);
         }
     }
 

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

@@ -158,6 +158,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 				} else {
 					$scope.$$nonProduct.canSelfSale = true;
 				}
+				console.log($scope.$$nonProduct.canSelfSale);
             }, function(response) {
                 toaster.pop('error', '获取店铺的信息失败, ' + response.data);
             });

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

@@ -1707,7 +1707,7 @@
                                                     <div class="content margin10">
                                                         <!--<p class="title">自营 / 寄售</p>-->
                                                         <div class="input-list">
-                                                            <select ng-disabled="$$nonProduct.canSelfSale" name="selfSale" class="wid56 select-adder form-control" ng-model="goods.editSelfSale" ng-disabled="$$nonProduct.canSelfSale">
+                                                            <select ng-disabled="!$$nonProduct.canSelfSale" name="selfSale" class="wid56 select-adder form-control" ng-model="goods.editSelfSale">
                                                                 <option value="1">自营</option>
                                                                 <option value="2">寄售</option>
                                                             </select>