Merge branch 'dev-mysql' into feature_release-tomysql

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

@@ -243,9 +243,9 @@ public class GoodsServiceImpl implements GoodsService {
 //        if(!PatternUtil.matchChineseAndEnglish(goods.getTag())) {
 //            throw new IllegalOperatorException("自定义标签的信息只能包含中文和英文");
 //        }
-        if (goods.getPackaging() == null) {
+        /*if (goods.getPackaging() == null) {
             throw new IllegalOperatorException("包装信息为空");
-        }
+        }*/
 //        if (goods.getPackaging().length() > 10) {
 //            throw new IllegalOperatorException("包装信息操作约定的10个字符");
 //        }
@@ -1618,7 +1618,8 @@ public class GoodsServiceImpl implements GoodsService {
                     reserve = NumberUtil.add(reserve, oldGoods.getReserve());
                     reserve = NumberUtil.sub(reserve, nowGoods.getReserve());
                     if (NumberUtil.compare(reserve, DoubleConstant.zero) < 0) {
-                        throw new IllegalOperatorException("总在售库存量超过空闲库存量");
+                        // 下架这部分的库存
+                        //throw new IllegalOperatorException("总在售库存量超过空闲库存量");
                     }
                 }
             }

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

@@ -644,7 +644,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 				g.edit = false;
 			});
 			if (material.sourceApp == 'ERP') {
-				material.averMonthSalePrice = (material.productDetail && material.productDetail.price) ? material.productDetail.price : 0;
+				material.averMonthSalePrice = (material && material.price) ? material.price : 0;
 			}
             $scope.$$nonProduct.editGoods = angular.copy(goods);
 			goods.edit = true;
@@ -1901,7 +1901,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			$scope.goods.editMinDelivery = (data && data.minDelivery) || $scope.uasBatchPutOnProperty.minDelivery;
 			$scope.goods.editMaxDelivery = (data && data.maxDelivery) || $scope.uasBatchPutOnProperty.maxDelivery;
 			product.selected = true;
-			product.averMonthSalePrice = (data && data.price) ? data.price : 0;
+			product.averMonthSalePrice = (product && product.price) ? product.price : 0;
 			var goodQtyPrice = {start: $scope.goods.editMinBuyQty, end: $scope.maxReserve};
 			var price = (((data && data.price) ? data.price : 0) *
 			($scope.uasBatchPutOnProperty.fluctuateRate ? $scope.uasBatchPutOnProperty.fluctuateRate : 1));

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html

@@ -1708,7 +1708,10 @@
 							<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>
 							<td class="edit">
 								<span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>
-								<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="showShelfArea(material)"><span>添加产品</span></span>
+								<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="showShelfArea(material)">
+									<span ng-if="material.batchCount">添加产品</span>
+									<span ng-if="!material.batchCount">编辑上架</span>
+								</span>
 								<span ng-if="material.batchCount" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="expandGoods(material)"><span>展开<i class="fa fa-angle-down" style="margin-left:2px;"></i></span></span>
 								<!--收起-->
 								<span ng-show="!isBatch && material.exPandOper" ng-click="disExpandGoods(material)" class="packUp"><span>收起<i class="fa fa-angle-up" style="margin-left:2px;"></i></span></span>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_unstandard_erp.html

@@ -1721,7 +1721,10 @@
 							<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>
 							<td class="edit">
 								<span name="delete-material" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="deleteMaterial(material)"><span>删除</span></span>
-								<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="showShelfArea(material)"><span>添加产品</span></span>
+								<span ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="showShelfArea(material)">
+									<span ng-if="material.batchCount">添加产品</span>
+									<span ng-if="!material.batchCount">编辑上架</span>
+								</span>
 								<span ng-if="material.batchCount" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="expandGoods(material)"><span>展开<i class="fa fa-angle-down" style="margin-left:2px;"></i></span></span>
 								<!--收起-->
 								<span ng-show="!isBatch && material.exPandOper" ng-click="disExpandGoods(material)" class="packUp"><span>收起<i class="fa fa-angle-up" style="margin-left:2px;"></i></span></span>