Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/external/erp/commodity/service/impl/ProductDetailERPServiceImpl.java

@@ -16,6 +16,7 @@ import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.prod.commodity.model.Product;
 import com.uas.platform.b2c.prod.commodity.model.ProductDetail;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
+import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,7 +87,8 @@ public class ProductDetailERPServiceImpl implements ProductDetailERPService {
     @Override
     public String getCurrency() {
         logger.log("物料详情", "获取币别，企业：" + SystemSession.getUser().getEnterprise().getEnName());
-        return enterpriseService.getCurrencyByRegisterAddress().getData().toString();
+        Object result = enterpriseService.getCurrencyByRegisterAddress().getData();
+        return result == null ? "" : result.toString();
     }
 
     @Override

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/usercenter/controllers/forstore/buyer_transfer_ctrl.js

@@ -646,10 +646,10 @@ define([ 'app/app' ], function(app) {
 				toaster.pop('info', '提示', '没有选择要付款的订单,或付款总额为0');
 				return ;
 			}
-			if(angular.isUndefined($scope.buyAccount)||angular.equals("{}", angular.toJson($scope.buyAccount))  || $scope.buyAccount == null) {
-				toaster.pop('info', '提示', '请选择买家账户');
-				return ;
-			}
+			// if(angular.isUndefined($scope.buyAccount)||angular.equals("{}", angular.toJson($scope.buyAccount))  || $scope.buyAccount == null) {
+			// 	toaster.pop('info', '提示', '请选择买家账户');
+			// 	return ;
+			// }
 			if ($scope.type == 'PAIDTOVENDOR'){
 				$scope.saleAccount = $scope.salePerAccount;
 			}
@@ -701,14 +701,14 @@ define([ 'app/app' ], function(app) {
 				transfer.installmentDetailId = installmentDetailId;
 			};
 
-			var buyAccount = angular.copy($scope.buyAccount);
-			var saleAccount = angular.copy($scope.saleAccount);
-			delete saleAccount.filterAccount;
-			delete buyAccount.filterAccount;
-			var jsonPament = angular.toJson(buyAccount);
-			var jsonReceive = angular.toJson(saleAccount);
-			transfer.jsonPament = jsonPament;
-			transfer.jsonReceive = jsonReceive;
+			// var buyAccount = angular.copy($scope.buyAccount);
+			// var saleAccount = angular.copy($scope.saleAccount);
+			// delete saleAccount.filterAccount;
+			// delete buyAccount.filterAccount;
+			// var jsonPament = angular.toJson(buyAccount);
+			// var jsonReceive = angular.toJson(saleAccount);
+			// transfer.jsonPament = jsonPament;
+			// transfer.jsonReceive = jsonReceive;
 			// console.log(transfer.jsonReceive)
 			transfer.imgUrl = str;
 			transfer.type = $scope.type;

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/usercenter/forstore/buyer_transfer.html

@@ -21,6 +21,7 @@
 					<!--</li>-->
 				<!--</ul>-->
 			<!--</div>-->
+			<!--
 			<div class="common-title margin-top-8">收款账户</div>
 			<div class="payment-style">
 				<ul class="payment-80">
@@ -64,6 +65,7 @@
 					</li>
 				</ul>
 			</div>
+			-->
 			<div class="common-title margin-top-8" ng-if="type == 'PAIDTOVENDOR'">分期付款明细</div>
 			<div class="payment-detail" ng-if="type == 'PAIDTOVENDOR'">
 				<ul>

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>