bom求购列表管理

src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseController.java

@@ -209,30 +209,52 @@ public class SeekPurchaseController {
         return seekPurchaseService.getSeekPurchaseBomListPage(pageInfo, user, minReleaseDate, maxReleaseDate, name);
     }
 
-    // 根据bomId获取当前bom单的情况
+    /**
+     * 根据bomId获取当前bom单的情况
+     * @param bomId
+     * @return
+     */
     @RequestMapping(value = "/getImportBomInfo", method = RequestMethod.GET)
     public Map<String, Object> getImportBomInfo(Long bomId) {
         return seekPurchaseService.getImportBomInfo(bomId);
     }
 
-    // 修改临时表数据
+    /**
+     * 修改临时表数据
+     * @param seekPurchaseByBatch
+     * @return
+     */
     @RequestMapping(value = "/updateSeekPurchaseByBatch", method = RequestMethod.PUT)
     public ResultMap updateSeekPurchaseByBatch(@RequestBody SeekPurchaseByBatch seekPurchaseByBatch) {
         return seekPurchaseService.updateSeekPurchaseByBatch(seekPurchaseByBatch);
     }
 
-    // 删除临时表数据
+    /**
+     * 删除临时表数据
+     * @param json
+     * @return
+     */
     @RequestMapping(value = "/deleteSeekPurchaseByBatch", method = RequestMethod.PUT)
     public ResultMap deleteSeekPurchaseByBatch(@RequestBody String json) {
         JSONObject object = FastjsonUtils.parseObject(json);
         return seekPurchaseService.deleteSeekPurchaseByBatch(object.get("spIds").toString());
     }
 
+    /**
+     * 获取单个bom的信息
+     * @param bomId
+     * @return
+     */
     @RequestMapping(value = "/findOneBom", method = RequestMethod.GET)
     public SeekPurchaseBomList findOneBom(Long bomId) {
         return seekPurchaseService.findOneBom(bomId);
     }
 
+    /**
+     * 修改bom信息
+     * @param seekPurchaseBom
+     * @return
+     */
     @RequestMapping(value = "/updateSeekPurchaseBom", method = RequestMethod.PUT)
     public ResultMap updateSeekPurchaseBom(@RequestBody SeekPurchaseBom seekPurchaseBom){
         return seekPurchaseService.updateSeekPurchaseBom(seekPurchaseBom);

src/main/java/com/uas/platform/b2c/trade/seek/service/SeekPurchaseService.java

@@ -117,13 +117,38 @@ public interface SeekPurchaseService {
      */
     Page<SeekPurchaseBomList> getSeekPurchaseBomListPage(PageInfo pageInfo, User user, String minReleaseDate, String maxReleaseDate, String name);
 
+    /**
+     * 根据bomId获取当前bom单的情况
+     * @param bomId
+     * @return
+     */
     Map<String, Object> getImportBomInfo(Long bomId);
 
+    /**
+     * 修改临时表数据
+     * @param seekPurchaseByBatch
+     * @return
+     */
     ResultMap updateSeekPurchaseByBatch(SeekPurchaseByBatch seekPurchaseByBatch);
 
+    /**
+     * 删除临时表数据
+     * @param spIds
+     * @return
+     */
     ResultMap deleteSeekPurchaseByBatch(String spIds);
 
+    /**
+     * 修改Bom信息
+     * @param seekPurchaseBom
+     * @return
+     */
     ResultMap updateSeekPurchaseBom(SeekPurchaseBom seekPurchaseBom);
 
+    /**
+     * 获取单个bom信息
+     * @param bomId
+     * @return
+     */
     SeekPurchaseBomList findOneBom(Long bomId);
 }

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseServiceImpl.java

@@ -570,7 +570,6 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
 
     @Override
     public ResultMap deleteSeekPurchaseByBatch(String spIds) {
-        //seekPurchaseByBatchDao.batchDelete(Arrays.asList(spIds.split(",")));
         String sql = "delete from trade$seek_purchase_by_batch where sp_id in (:spIds)";
         Map<String, Object> param = new HashMap<>();
         param.put("spIds", spIds.contains(",") ? Arrays.asList(spIds.split(",")) : spIds);
@@ -580,7 +579,9 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
 
     @Override
     public ResultMap updateSeekPurchaseBom(SeekPurchaseBom seekPurchaseBom) {
-        seekPurchaseBomDao.save(seekPurchaseBom);
+        SeekPurchaseBom oldBom = seekPurchaseBomDao.findOne(seekPurchaseBom.getId());
+        oldBom.setName(seekPurchaseBom.getName());
+        seekPurchaseBomDao.save(oldBom);
         return ResultMap.success(null);
     }
 

src/main/webapp/resources/js/usercenter/app.js

@@ -416,14 +416,14 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 			controller : 'downPaymentCtrl',
 			controllerUrl : 'app/controllers/forstore/buyer_down_payment_ctrl'
 		})).state('buyerSeekPurchase', angularAMD.route({
-			url: '/seekPurchase',
+			url: '/seekPurchase?type',
 			templateUrl: 'static/view/usercenter/forstore/seekPurchase.html',
 			controller: 'seekPurchaseCtrl',
 			controllerUrl: 'app/controllers/forstore/seek_purchase_ctrl'
 		})).state('buyerBomDetail', angularAMD.route({
 			url: '/bomDetail/:id',
 			templateUrl: 'static/view/usercenter/forstore/bomDetail.html',
-			controller: 'seekPurchaseCtrl',
+			controller: 'bomDetailCtrl',
 			controllerUrl: 'app/controllers/forstore/bom_detail_ctrl'
 		}));
 	}]);

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

@@ -4,7 +4,7 @@
  */
 define(['app/app'], function (app) {
     'use strict';
-    app.register.controller('seekPurchaseCtrl',
+    app.register.controller('bomDetailCtrl',
         ['$scope', '$rootScope', 'seekPurchase', 'toaster', 'BaseService',
             'ngTableParams', 'Order', 'SessionService', '$filter', '$upload', '$stateParams',
             function ($scope, $rootScope, seekPurchase, toaster, BaseService,
@@ -17,11 +17,13 @@ define(['app/app'], function (app) {
                 $scope.bomName = '';
 
                 var getBomInfo = function () {
-                    seekPurchase.findOneBom({bomId: $stateParams.id}, function (data) {
+                    if ($stateParams.id) {
+                      seekPurchase.findOneBom({bomId: $stateParams.id}, function (data) {
                         $scope.bomInfo = data;
-                    }, function (error) {
-
-                    });
+                      }, function (response) {
+                        toaster.pop('error', response.data);
+                      });
+                    }
                 }
                 getBomInfo();
 
@@ -38,9 +40,11 @@ define(['app/app'], function (app) {
                             toaster.pop('success', '修改成功');
                             $scope.bomInfo.name = $scope.bomName;
                             $scope.setIsEditName(false);
+                        } else {
+                          toaster.pop('error', data.message);
                         }
-                    }, function (error) {
-                        toaster.pop('srror', '系统错误');
+                    }, function (response) {
+                        toaster.pop('error', response.data);
                     })
                 }
 
@@ -273,8 +277,8 @@ define(['app/app'], function (app) {
                 $scope.goodsCount = 0;
                 $scope.currentSeek = {};
                 $scope.setSeekStatus = function (seek, status) {
-                    $scope.offerCount = seek.offerAmount;
-                    $scope.goodsCount = seek.goodsAmount;
+                    $scope.offerCount = seek.offerAmount || 0;
+                    $scope.goodsCount = seek.goodsAmount || 0;
                     $scope.currentSeek = seek;
                     // 查看报价
                     if (status == 2 && $scope.offerCount != 0) {

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

@@ -6,13 +6,12 @@ define(['app/app'], function (app) {
   'use strict';
   app.register.controller('seekPurchaseCtrl',
       ['$scope', '$rootScope', 'seekPurchase', 'toaster', 'BaseService',
-        'ngTableParams', 'Order', 'SessionService', '$filter', '$upload',
+        'ngTableParams', 'Order', 'SessionService', '$filter', '$upload', '$stateParams',
         function ($scope, $rootScope, seekPurchase, toaster, BaseService,
-            ngTableParams, Order, SessionService, $filter, $upload) {
+            ngTableParams, Order, SessionService, $filter, $upload, $stateParams) {
           $rootScope.active = 'seek_purchase';
           document.title = '我的求购-优软商城';
-          $scope.activeType = 'seekManage';
-
+          $scope.activeType = $stateParams.type ? $stateParams.type :'seekManage';
           $scope.toogleType = function (type) {
             $scope.activeType = type;
           }

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

@@ -404,7 +404,7 @@
     <!--求购询价-->
     <div class="seek-purchase-content">
         <div class="BOM-header">
-            <a href="javascript:window.history.back(-1)">&lt;返回BOM列表</a>
+            <a href="user#/seekPurchase?type=bomManage">&lt;返回BOM列表</a>
             <div>
                 <p class="BOM-name-area" ng-show="!isEditName">
                     <span ng-bind="bomInfo.name"></span>
@@ -514,7 +514,7 @@
                 </td>
                 <td class="operate-seek">
                     <span ng-if="seek.offerAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></span>
-                    <span ng-if="seek.offerAmount == 0 && seek.goodsAmount>0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 1)">查看现货&nbsp;<i class="fa fa-angle-double-down"></i></span>
+                    <span ng-if="!seek.offerAmount && seek.goodsAmount>0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 1)">查看现货&nbsp;<i class="fa fa-angle-double-down"></i></span>
                     <span ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
                 </td>
             </tr>
@@ -522,8 +522,8 @@
                 <td colspan="10">
                     <div>
                         <div class="switch-line">
-                            <a ng-disabled="goodsCount == 0" ng-class="{'active': seek.$status == 1}" ng-click="setSeekStatus(seek, 1)">商城现货（<span ng-bind="goodsCount"></span>）</a>
-                            <a ng-disabled="offerCount == 0" ng-class="{'active': seek.$status == 2}"  ng-click="setSeekStatus(seek, 2)">当前报价（<span ng-bind="offerCount"></span>）</a>
+                            <a ng-disabled="goodsCount == 0" ng-class="{'active': seek.$status == 1}" ng-click="setSeekStatus(seek, 1)">商城现货（<span ng-bind="goodsCount || 0"></span>）</a>
+                            <a ng-disabled="offerCount == 0" ng-class="{'active': seek.$status == 2}"  ng-click="setSeekStatus(seek, 2)">当前报价（<span ng-bind="offerCount || 0"></span>）</a>
                         </div>
                         <div ng-show="seek.$status == 1">
                             <table>