Merge remote-tracking branch 'origin/feature-201830-wangcz' into feature-201830-wangcz

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

@@ -2063,15 +2063,17 @@ public class ProductServiceImpl implements ProductService {
                     @Override
                     public void run() {
                         List<Product> productList = productDao.findByCmpUuId(component.getUuid());
-                        List<Product> list = new ArrayList<>();
+                        Set<Product> set = new HashSet<>();
                         List<Long> ids = new ArrayList<>();
                         for (Product product : productList) {
                             if (!StringUtils.isEmpty(component.getAttach())) {
+                                product.setAttachment(component.getAttach());
+                                set.add(product);
                                 ids.add(product.getId());
                             }
-                            if (StringUtils.isEmpty(product.getSpec()) && !StringUtils.isEmpty(component.getSpec())) {
+                            if ((StringUtils.isEmpty(product.getSpec()) && !StringUtils.isEmpty(component.getSpec()))) {
                                 product.setSpec(component.getSpec());
-                                list.add(product);
+                                set.add(product);
                             }
                         }
                         if (CollectionUtils.isNotEmpty(ids)) {
@@ -2098,8 +2100,8 @@ public class ProductServiceImpl implements ProductService {
                                 productPrivateDao.save(productPrivatelist);
                             }
                         }
-                        if (CollectionUtils.isNotEmpty(list)) {
-                            productDao.save(list);
+                        if (CollectionUtils.isNotEmpty(set)) {
+                            productDao.save(set);
                         }
                         goodsService.updateGoodsByComponent(component);
                     }
@@ -2220,7 +2222,7 @@ public class ProductServiceImpl implements ProductService {
     @Override
     public void saveByJdbcTemplate(List<ReleaseProductByBatch> list) {
         if (CollectionUtils.isNotEmpty(list)) {
-            jdbcTemplate.batchUpdate("insert into products(pr_code,pr_cmpimg,pr_enuu,pr_brand,pr_cmpcode,pr_cmpuuid,pr_kind,pr_kindid,pr_pcmpcode,pr_pbrand,pr_pbranden,pr_pbrandid,pr_pbranduuid,pr_standard,pr_create_time,pr_spec,pr_title,pr_issale, pr_price, pr_minpack, pr_packaging, pr_reserve) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+            jdbcTemplate.batchUpdate("insert into products(pr_code,pr_cmpimg,pr_enuu,pr_brand,pr_cmpcode,pr_cmpuuid,pr_kind,pr_kindid,pr_pcmpcode,pr_pbrand,pr_pbranden,pr_pbrandid,pr_pbranduuid,pr_standard,pr_create_time,pr_spec,pr_title,pr_issale, pr_price, pr_minpack, pr_packaging, pr_reserve,pr_attachment) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
                     list, list.size(), new ParameterizedPreparedStatementSetter<ReleaseProductByBatch>() {
 
                         @Override
@@ -2247,6 +2249,7 @@ public class ProductServiceImpl implements ProductService {
                             ps.setObject(20, t.getMinPackage());
                             ps.setObject(21, t.getPackaging());
                             ps.setObject(22, t.getReserve());
+                            ps.setObject(23, t.getAttach());
                         }
                     });
         } else {

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

@@ -1965,6 +1965,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 			List<Product> productes = productService.findProductIdAndProdnumsByProdNums(proNums);
 			for (Product producte : productes) {
 				ProductPrivate productPrivate = new ProductPrivate(producte.getId());
+				productPrivate.setAttach(producte.getAttachment());
 				productPrivates.add(productPrivate);
 
 				prIds.add(producte.getId());

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -69,8 +69,8 @@ define([ 'app/app' ], function(app) {
 	}]);
 
 	// 身份认证
-	app.controller('AuthenticationCtrl', ['$scope', '$window', 'AuthenticationService', '$rootScope', 'SessionService', 'collectionService', '$modal', 'toaster','$q', 'Cart', '$http',
-		function($scope, $window, AuthenticationService, $rootScope, SessionService, collectionService, $modal, toaster, $q, Cart, $http) {
+	app.controller('AuthenticationCtrl', ['$scope', '$window', 'AuthenticationService', '$rootScope', 'SessionService', 'collectionService', '$modal', 'toaster','$q', 'Cart', '$http', 'InternalMessage',
+		function($scope, $window, AuthenticationService, $rootScope, SessionService, collectionService, $modal, toaster, $q, Cart, $http, InternalMessage) {
 			$scope.user = {
 				j_username : "",
 				j_password : "",
@@ -238,11 +238,6 @@ define([ 'app/app' ], function(app) {
                 // 跳转账户中心
                 AuthenticationService.redirectRegister();
             };
-
-            //安全中心:
-
-
-
 		}]);
 
 	// 登录模态框
@@ -1662,10 +1657,10 @@ define([ 'app/app' ], function(app) {
 				toaster.pop('info', '提示', '请选择付款日期');
 				return ;
 			}
-			if(!$scope.image.src) {
-				toaster.pop('info', '提示', '请选择付款截图');
-				return ;
-			}
+			// if(!$scope.image.src) {
+			// 	toaster.pop('info', '提示', '请选择付款截图');
+			// 	return ;
+			// }
 			var buyAccount = angular.copy($scope.buyAccount);
 			var saleAccount = angular.copy($scope.saleAccount);
 			delete saleAccount.filterAccount;

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_transfer_ctrl.js

@@ -676,10 +676,14 @@ define([ 'app/app' ], function(app) {
 				}
 				return ;
 			}
-			if(!str || str == ''){
-				toaster.pop('info', '提示', '请选择付款截图');
-				return ;
-			}
+
+			/**
+			 * 上传水单选填非必填
+			 * */
+			// if(!str || str == ''){
+			// 	toaster.pop('info', '提示', '请选择付款截图');
+			// 	return ;
+			// }
 
 			if ($scope.type == "PAIDTOVENDOR") {
 				var firstItem = {};

src/main/webapp/resources/js/usercenter/controllers/forstore/order_detail_ctrl.js

@@ -13,6 +13,9 @@ define(['app/app'], function(app) {
 
     // 获取当前收货单所对应的物品信息
     function getReceiveInfo() {
+			if(!$scope.ChooseItem) {
+				return;
+			}
       Order.getSendOrderInfo(
           {id: $scope.order.id, invoiceid: $scope.ChooseItem}, {},
           function (data) {

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

@@ -14,11 +14,11 @@ define([ 'app/app' ], function(app) {
         // 更多操作数据和记录
         $scope.handleLink = [
             {name: '查看入库记录', tab: 'inBound', id: 0},
-            {name: '其它入库', tab: 'inBound', id: 1},
             {name: '采购入库', tab: 'inBound', id: 2},
+            {name: '其它入库', tab: 'inBound', id: 1},
             {name: '查看出库记录', tab: 'outBound', id: 0},
-            {name: '其它出库', tab: 'outBound', id: 1},
-            {name: '销售出库', tab: 'outBound', id: 2}];
+            {name: '销售出库', tab: 'outBound', id: 2},
+            {name: '其它出库', tab: 'outBound', id: 1}];
         $scope.handleItem = $stateParams.storage_tab ? 1 : ($scope.storage_tab === 'inBound'? $scope.handleLink[0].id : $scope.handleLink[3].id);
 
         // 销售方式数据

src/main/webapp/resources/view/common/site-nav.html

@@ -219,6 +219,7 @@
         <li ng-if="userInfo && !userInfo.enterprise" ><a href="./personalMaterial">卖家中心</a></li>
         <li ng-if="userInfo && userInfo.enterprise && userInfo.enterprise.isVendor != 313" ><a href="./register-saler">卖家中心</a></li>
         <li ng-if="userInfo" ><a href="sso#/index">帐户中心</a></li>
+        <li ng-if="userInfo.enterprise && userInfo.enterprise.isVendor == 313"><a href="user#/messagePersonal">消息 ({{unReadMessCount ? (unReadMessCount < 100 ? unReadMessCount : '99+') : 0}})</a></li>
         <li><a href="help/home" target="_blank">帮助中心</a></li>
         <!-- <li><a href="http://wpa.qq.com/msgrd?v=3&uin=3432892085&site=www.ubtoc.com&menu=yes" target="_blank">在线客服</a></li> -->
        <!-- <li><a href="javascript:void(0)">服务电话:400-830-1818</a></li>-->

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

@@ -483,20 +483,6 @@
 			<div class="log_menu" ng-if="acceptGoods">
 				<span>订单明细</span>
 			</div>
-			<div class="oder_xq clearfix" ng-if="address && !acceptGoods" style="background: #f8f8f8">
-				<p>
-					<b>收货人：</b>
-					<span ng-bind="address.name">王子鑫</span>
-				</p>
-				<p>
-					<b>收货地址：</b>
-					<span>{{address.area}}&nbsp;{{address.detailAddress}}</span>
-				</p>
-				<p>
-					<b>联系电话：</b>
-					<span ng-bind="address.tel">13526395698</span>
-				</p>
-			</div>
 			<div class="oder_xq_list" style="padding-top: 0;">
 				<dl class="clearfix">
 					<dt>
@@ -664,6 +650,20 @@
 					</dd>
 				</dl>
 			</div>
+			<div class="oder_xq clearfix" ng-if="address && !acceptGoods" style="background: #f8f8f8">
+				<p>
+					<b>收货人：</b>
+					<span ng-bind="address.name">王子鑫</span>
+				</p>
+				<p>
+					<b>收货地址：</b>
+					<span>{{address.area}}&nbsp;{{address.detailAddress}}</span>
+				</p>
+				<p>
+					<b>联系电话：</b>
+					<span ng-bind="address.tel">13526395698</span>
+				</p>
+			</div>
 			<div class="order_btn" ng-if="acceptGoods && orderStatus">
 				<div ng-click="goBack()" style="background:#aaaaaa">取消</div>
 				<div ng-click="ensureAccept()" style="background:#5078cb">确认收货</div>

src/main/webapp/resources/view/usercenter/left_nav.html

@@ -41,7 +41,7 @@
                     <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">采购订单</a></li>
                     <li ng-class="{'active' : active == 'buyer_pay_center'}"><a  ui-sref="pay_center">应付对账</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_no_invoice">发票管理</a></li>
-                    <!--<li ng-class="{'active' : active == 'vendor_productOn'}" ng-if="personage && !isPcbStore"><a  ui-sref="vendor_upload">产品导入</a></li>-->
+                    <li ng-class="{'active' : active == 'vendor_productOn'}" ng-if="personage && !isPcbStore"><a  ui-sref="vendor_upload">产品导入</a></li>
                 </div>
                 <!--<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion &&  userInfo.emailValidCode && userInfo.emailValidCode == 2)">-->
                     <!--<li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">订单中心</a></li>-->

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

@@ -1188,7 +1188,7 @@
 									</div>
 									<div ng-if="material.goods" ng-bind="(storeInfo.uuid != 'undefind' && material.goods.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营': '寄售'">自营</div>
 									<div>{{material.goods.breakUp ? '可拆卖' : '不可拆卖'}}</div>
-									<div>{{material.goods.status === 601 || material.goods.status === 602 ? '已上架' : '已下架' }}</div>
+									<div>{{material.goods.status === 601 || material.goods.status === 602 ? '已上架' : '未上架' }}</div>
 								</td>
 								<td class="edit">
 									<div style="text-align: center">

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

@@ -1382,7 +1382,8 @@
                     <td>系统自动生成</td>
                     <td ng-if="storage_tab === 'outBound'"><span ng-bind="item.orderid || '-'" title="{{item.orderid}}"></span></td>
                     <td ng-if="storage_tab === 'inBound'"><span ng-bind="item.invoiceid || '-'" title="{{item.invoiceid}}"></span></td>
-                    <td><span ng-bind="item.buyentername || item.buyerentername || item.buyername" title="{{item.buyentername || item.buyerentername || item.buyername}}"></span></td>
+                    <td ng-if="storage_tab === 'outBound'"><span ng-bind="item.buyentername || item.buyername" title="{{item.buyentername || item.buyername}}"></span></td>
+                    <td ng-if="storage_tab === 'inBound'"><span ng-bind="item.sellername || '-'" title="{{item.sellername || '-'}}"></span></td>
                     <td ng-bind="item.createtime | date: 'yyyy-MM-dd'"></td>
                     <td ng-if="!item.seleted"><a class="btn-click" ng-click="item.seleted = !item.seleted;unfoldClick(storageList, item)" ng-bind="storage_tab === 'inBound' ? '收货入库' : '发货出库'"></a></td>
                     <td ng-if="item.seleted"><a class="btn-click" ng-click="saveOtherCheck(item, storage_tab)">确定</a><a class="btn-click" ng-click="item.seleted = !item.seleted">取消</a></td>