1：处理ERP系统中提出的bug。

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

@@ -327,8 +327,9 @@ public class ProductServiceImpl implements ProductService {
                 Double multiple = NumberUtil.div(productStandardPutOnInfo.getMinBuyQty(), productStandardPutOnInfo.getMinPackQty());
                 if(multiple == 0){
                     productStandardPutOnInfo.setMinBuyQty(product.getMinPackQty());
+                }else {
+                    productStandardPutOnInfo.setMinBuyQty(NumberUtil.mul(product.getMinPackQty(), Math.ceil(multiple)));
                 }
-                productStandardPutOnInfo.setMinBuyQty(NumberUtil.mul(product.getMinPackQty(), Math.ceil(multiple)));
                 productStandardPutOnInfo.setMinPackQty(product.getMinPackQty());
                 productModifyHistory.setMinPackQty(product.getMinPackQty());
                 persistProduct.setMinPackQty(product.getMinPackQty());
@@ -339,13 +340,15 @@ public class ProductServiceImpl implements ProductService {
                 persistProduct.setMinPackQty(product.getMinPackQty());
             }
             if(productStandardPutOnInfo.getStatus() == Status.AVAILABLE.value()){
-                Goods goods =goodsDao.findByBatchCode(productStandardPutOnInfo.getGoBatch());
-                if(productStandardPutOnInfo.getMinBuyQty() != null && product.getMinPackQty() != null){
-                    goods.setMinBuyQty(NumberUtil.mul(product.getMinPackQty(), NumberUtil.div(productStandardPutOnInfo.getMinBuyQty(), productStandardPutOnInfo.getMinPackQty())));
-                    goods.setMinPackQty(product.getMinPackQty());
-                }else if(product.getMinPackQty() != null){
-                    goods.setMinPackQty(product.getMinPackQty());
-                    goods.setMinBuyQty(product.getMinPackQty());
+                Goods goods = goodsDao.findByBatchCode(productStandardPutOnInfo.getGoBatch());
+                if(productStandardPutOnInfo.getMinBuyQty() != null && productStandardPutOnInfo.getMinPackQty() != null){
+                    goods.setMinBuyQty(productStandardPutOnInfo.getMinBuyQty());
+                    goods.setMinPackQty(productStandardPutOnInfo.getMinPackQty());
+                }
+                if(NumberUtil.compare(goods.getMinBuyQty(), goods.getReserve()) > 0) {
+                    goods.setStatus(Status.UNAVAILABLE.value());
+                }else {
+                    goods.setStatus(Status.AVAILABLE.value());
                 }
                 if (product.getPackaging() != null){
                     goods.setPackaging(product.getPackaging());

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

@@ -15,6 +15,8 @@ define(['app/app'], function (app) {
 
         $scope.status = 'standard';
 
+        $scope.maxPackQty = 999999;
+
         $scope.toggleStandardStatus = function (status) {
             if($scope.status != status) {
                 $scope.status = status;
@@ -134,6 +136,10 @@ define(['app/app'], function (app) {
                 toaster.pop('warning', '提示', '包装数量必须为整数');
                 return ;
             }
+            if(Number($scope.currentPro.minPackQty) > $scope.maxPackQty) {
+                toaster.pop('warning', '提示', '包装数量必须小于' + $scope.maxPackQty);
+                return ;
+            }
             var updateProduct = { };
             updateProduct.id = product.id;
             updateProduct.standard = product.standard;

src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html

@@ -582,9 +582,9 @@
 							<span>
 								<div class="btn-wrap">
 									<span class="number">
-										<a class="reduce" ng-disabled="cart.minusDisabled" ng-click="reduce(cart)">-</a>
+										<a class="reduce" ng-disabled="cart.minusDisabled || cart.status == 1" ng-click="reduce(cart)">-</a>
 										<input type="text" ng-disabled="cart.status == 1" ng-model="cart.number" ng-blur="blurNum(cart)">
-										<a class="add" ng-disabled="cart.addDisabled" ng-click="add(cart)">+</a>
+										<a class="add" ng-disabled="cart.addDisabled || cart.status == 1" ng-click="add(cart)">+</a>
 									</span>
 									<i ng-if="cart.status == 2" style="color: #f00; margin-left: 32px;">库存紧张</i>
 								</div>