Jelajahi Sumber

1:覆盖产品管理的功能。

yujia 8 tahun lalu
induk
melakukan
2017e4f082

+ 6 - 1
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -311,7 +311,7 @@ public class ProductServiceImpl implements ProductService {
         }
         Product persistProduct = productDao.findOne(product.getId());
         ProductModifyHistory productModifyHistory = new ProductModifyHistory();
-        if(product.getStandard() == 1){
+        if((persistProduct.getStandard() == 1)&&(persistProduct.getB2cEnabled() == 1)){
             ProductStandardPutOnInfo productStandardPutOnInfo= productStandardPutOnInfoDao.findByProductid(product.getId());
             if (product.getPackaging() != null){
                 productStandardPutOnInfo.setPackaging(product.getPackaging());
@@ -353,6 +353,11 @@ public class ProductServiceImpl implements ProductService {
                 if (product.getProduceDate() != null){
                     goods.setProduceDate(product.getProduceDate());
                 }
+                if(NumberUtil.compare(goods.getMinBuyQty(), goods.getReserve()) > 0) {
+                    goods.setStatus(Status.UNAVAILABLE.value());
+                }else {
+                    goods.setStatus(Status.AVAILABLE.value());
+                }
                 GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, GoodsHistory.OperateType.Modifying.getPhrase());
                 goodsHistoryDao.save(goodsHistory);
                 goodsDao.save(goods);

+ 3 - 3
src/main/webapp/resources/view/vendor/left_nav.html

@@ -27,9 +27,9 @@
 		<li ng-class="{'active' : active == 'pay_center'}"><a href="javascript:void(0)" ui-sref="pay_center">结算中心</a></li>
 		<li ng-class="{'active' : active == 'vendor_brand_apply'}"><a href="javascript:void(0)" ui-sref="vendor_brand_apply">品牌申请</a></li>
 		<li ng-class="{'active' : active == 'vendor_component_apply'}"><a href="javascript:void(0)" ui-sref="vendor_component_apply">器件申请</a></li>
-		<li ng-class="{'active' : active == 'vendor_productOn'}"><a href="javascript:void(0)" ui-sref="vendor_productOn">产品导入</a></li>
-		<li ng-class="{'active' : active == 'vendor_repository'}"><a href="javascript:void(0)" ui-sref="vendor_repository">仓库管理</a></li>
-		<li ng-class="{'active' : active == 'vendor_goods'}"><a href="javascript:void(0)" ui-sref="vendor_standardPutOn">产品管理</a></li>
+		<li ng-class="{'active' : active == 'vendor_upload'}"><a href="javascript:void(0)" ui-sref="vendor_upload">产品导入</a></li>
+		<!--<li ng-class="{'active' : active == 'vendor_repository'}"><a href="javascript:void(0)" ui-sref="vendor_repository">仓库管理</a></li>-->
+		<li ng-class="{'active' : active == 'vendor_material'}"><a href="javascript:void(0)" ui-sref="vendor_material">产品管理</a></li>
 		<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
 		<!--&lt;!&ndash;<a href="javascript:void(0)" ui-sref="vendor_after_sale">售后处理</a>&ndash;&gt;-->
 		<!--售后处理-->