收货地址新增处理，发布招标单时，企业参数改为传uu

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7891 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/PurchaseTenderController.java

@@ -73,16 +73,16 @@ public class PurchaseTenderController {
     @RequestMapping(value = "/publish", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
-    public ResponseEntity<String> publishTender(String tender, String enterpriseBaseInfo) {
+    public ResponseEntity<String> publishTender(String tender, String vendorUUs) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
-        System.out.println(enterpriseBaseInfo);
-        if (null != enterpriseBaseInfo) {
-            enterpriseBaseInfo = "[".concat(enterpriseBaseInfo);
-            enterpriseBaseInfo = enterpriseBaseInfo.concat("]");
-            List<Enterprise> enterprises = FlexJsonUtils.fromJsonArray(enterpriseBaseInfo, Enterprise.class);
-            System.out.println("enterpriseBaseInfo" + JSON.toJSONString(enterprises));
+        System.out.println(vendorUUs);
+        if (null != vendorUUs) {
+            vendorUUs = "[".concat(vendorUUs);
+            vendorUUs = vendorUUs.concat("]");
+            List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
+            System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
             System.out.println("tender" + JSON.toJSONString(purchaseTender));
-            purchaseTenderService.publish(purchaseTender, enterprises);
+            purchaseTenderService.publish(purchaseTender, vendUUs);
         } else {
             purchaseTenderService.publishOpen(purchaseTender);
         }
@@ -94,20 +94,21 @@ public class PurchaseTenderController {
      * 作为采购方，保存招标单
      *
      * @param tender
-     * @param enterpriseBaseInfo
+     * @param vendUUs
      * @return
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
-    public ResponseEntity<String> saveTender(String tender, String enterpriseBaseInfo) {
+    public ResponseEntity<String> saveTender(String tender, String vendorUUs) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
-        if (null != enterpriseBaseInfo) {
-            enterpriseBaseInfo = "[".concat(enterpriseBaseInfo);
-            enterpriseBaseInfo = enterpriseBaseInfo.concat("]");
-            List<Enterprise> enterprises = FlexJsonUtils.fromJsonArray(enterpriseBaseInfo, Enterprise.class);
-            System.out.println("enterpriseBaseInfo" + JSON.toJSONString(enterprises));
-            purchaseTenderService.save(purchaseTender, enterprises);
+        if (null != vendorUUs) {
+            vendorUUs = "[".concat(vendorUUs);
+            vendorUUs = vendorUUs.concat("]");
+            List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
+            System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
+            System.out.println("tender" + JSON.toJSONString(purchaseTender));
+            purchaseTenderService.save(purchaseTender, vendUUs);
         } else {
             purchaseTenderService.saveOpen(purchaseTender);
         }
@@ -636,16 +637,15 @@ public class PurchaseTenderController {
     @RequestMapping(value = "/publishSaved", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
-    public ResponseEntity<String> publishSavedTender(String tender, String enterpriseBaseInfo) {
+    public ResponseEntity<String> publishSavedTender(String tender, String vendorUUs) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
-        System.out.println(enterpriseBaseInfo);
-        if (null != enterpriseBaseInfo) {
-            enterpriseBaseInfo = "[".concat(enterpriseBaseInfo);
-            enterpriseBaseInfo = enterpriseBaseInfo.concat("]");
-            List<Enterprise> enterprises = FlexJsonUtils.fromJsonArray(enterpriseBaseInfo, Enterprise.class);
-            System.out.println("enterpriseBaseInfo" + JSON.toJSONString(enterprises));
+        if (null != vendorUUs) {
+            vendorUUs = "[".concat(vendorUUs);
+            vendorUUs = vendorUUs.concat("]");
+            List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
+            System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
             System.out.println("tender" + JSON.toJSONString(purchaseTender));
-            purchaseTenderService.publishSaved(purchaseTender, enterprises);
+            purchaseTenderService.publishSaved(purchaseTender, vendUUs);
         } else {
             purchaseTenderService.publishSavedOpen(purchaseTender);
         }
@@ -657,20 +657,21 @@ public class PurchaseTenderController {
      * 更新在录入单据
      *
      * @param tender
-     * @param enterpriseBaseInfo
+     * @param vendorUUs
      * @return
      */
     @RequestMapping(value = "/updateSaved", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
-    public ResponseEntity<String> updateSavedTender(String tender, String enterpriseBaseInfo) {
+    public ResponseEntity<String> updateSavedTender(String tender, String vendorUUs) {
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
-        if (null != enterpriseBaseInfo) {
-            enterpriseBaseInfo = "[".concat(enterpriseBaseInfo);
-            enterpriseBaseInfo = enterpriseBaseInfo.concat("]");
-            List<Enterprise> enterprises = FlexJsonUtils.fromJsonArray(enterpriseBaseInfo, Enterprise.class);
-            System.out.println("enterpriseBaseInfo" + JSON.toJSONString(enterprises));
-            purchaseTenderService.updateSaved(purchaseTender, enterprises);
+        if (null != vendorUUs) {
+            vendorUUs = "[".concat(vendorUUs);
+            vendorUUs = vendorUUs.concat("]");
+            List<Long> vendUUs = FlexJsonUtils.fromJsonArray(vendorUUs, Long.class);
+            System.out.println("vendUUs" + JSON.toJSONString(vendUUs));
+            System.out.println("tender" + JSON.toJSONString(purchaseTender));
+            purchaseTenderService.updateSaved(purchaseTender, vendUUs);
         } else {
             purchaseTenderService.updateSavedOpen(purchaseTender);
         }

src/main/java/com/uas/platform/b2b/service/PurchaseTenderService.java

@@ -17,7 +17,7 @@ public interface PurchaseTenderService {
      * @param tender
      * @return
      */
-    void save(PurchaseTender tender, List<Enterprise> enterprises);
+    void save(PurchaseTender tender, List<Long> vendUUs);
 
     /**
      * 发布招标单
@@ -25,7 +25,7 @@ public interface PurchaseTenderService {
      * @param tender
      * @return
      */
-    void publish(PurchaseTender tender, List<Enterprise> enterprises);
+    void publish(PurchaseTender tender, List<Long> vendUUs);
 
     /**
      * 投标
@@ -132,9 +132,9 @@ public interface PurchaseTenderService {
     /**
      *  发布已保存单据
      * @param purchaseTender
-     * @param enterprises
+     * @param vendUUs
      */
-    void publishSaved(PurchaseTender purchaseTender, List<Enterprise> enterprises);
+    void publishSaved(PurchaseTender purchaseTender, List<Long> vendUUs);
 
     /**
      *  发布已保存单据为公开招标
@@ -145,9 +145,9 @@ public interface PurchaseTenderService {
     /**
      *  更新已保存单据
      * @param purchaseTender
-     * @param enterprises
+     * @param vendUUs
      */
-    void updateSaved(PurchaseTender purchaseTender, List<Enterprise> enterprises);
+    void updateSaved(PurchaseTender purchaseTender, List<Long> vendUUs);
 
     /**
      *  更新已保存单据为公开

src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -62,12 +62,12 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
      * @return
      */
     @Override
-    public void save(PurchaseTender tender, List<Enterprise> enterprises) {
+    public void save(PurchaseTender tender, List<Long> vendUUs) {
         tender.setIsPublish(Constant.NO);
         tender.setStatus("待发布");
         tender.setEnUU(SystemSession.getUser().getEnterprise().getUu());
         tender.setEnterprise(SystemSession.getUser().getEnterprise());
-        saveTenderItem(tender, enterprises);
+        saveTenderItem(tender, vendUUs);
     }
 
     /**
@@ -77,21 +77,21 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
      * @return
      */
     @Override
-    public void publish(PurchaseTender tender, List<Enterprise> enterprises) {
+    public void publish(PurchaseTender tender, List<Long> vendUUs) {
         tender.setIsPublish(Constant.YES);
         tender.setStatus("待投标");
         tender.setEnUU(SystemSession.getUser().getEnterprise().getUu());
         tender.setEnterprise(SystemSession.getUser().getEnterprise());
-        saveTenderItem(tender, enterprises);
+        saveTenderItem(tender, vendUUs);
     }
 
-    private void saveTenderItem (PurchaseTender tender, List<Enterprise> enterprises) {
+    private void saveTenderItem (PurchaseTender tender, List<Long> vendUUs) {
 //        List<SaleTenderItem> saleTenderItems = new ArrayList<>();
         Set<PurchaseTenderProd> tenderProds = tender.getPurchaseTenderProds();
         for (PurchaseTenderProd tenderProd : tenderProds) {
             tenderProd.setTender(tender);
             purchaseTenderProdDao.save(tenderProd);
-            addSaleTender(tender, enterprises, tenderProd);
+            addSaleTender(tender, vendUUs, tenderProd);
         }
     }
 
@@ -299,11 +299,11 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
      * 发布已保存单据
      *
      * @param purchaseTender
-     * @param enterprises
+     * @param vendUUs
      */
     @Override
-    public void publishSaved(PurchaseTender purchaseTender, List<Enterprise> enterprises) {
-        publishOrSave(purchaseTender, enterprises , true , false);
+    public void publishSaved(PurchaseTender purchaseTender, List<Long> vendUUs) {
+        publishOrSave(purchaseTender, vendUUs , true , false);
     }
 
     /**
@@ -320,11 +320,11 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
      * 更新已保存单据
      *
      * @param purchaseTender
-     * @param enterprises
+     * @param vendUUs
      */
     @Override
-    public void updateSaved(PurchaseTender purchaseTender, List<Enterprise> enterprises) {
-        publishOrSave(purchaseTender, enterprises , false , false);
+    public void updateSaved(PurchaseTender purchaseTender, List<Long> vendUUs) {
+        publishOrSave(purchaseTender, vendUUs , false , false);
     }
 
     /**
@@ -341,11 +341,11 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
      * 发布或保存方法（针对保存的单据）
      *
      * @param purchaseTender
-     * @param enterprises
+     * @param vendUUs
      * @param isPublish
      * @param ifOpen
      */
-    private void publishOrSave(PurchaseTender purchaseTender, List<Enterprise> enterprises, boolean isPublish, boolean ifOpen) {
+    private void publishOrSave(PurchaseTender purchaseTender, List<Long> vendUUs, boolean isPublish, boolean ifOpen) {
         PurchaseTender oldTender = purchaseTenderDao.findOne(purchaseTender.getId());
         if (null != oldTender) {
             if (isPublish) {
@@ -412,7 +412,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
                         tenderProd.setTender(oldTender);
                         purchaseTenderProdDao.save(tenderProd);
                     }
-                    addSaleTender(oldTender, enterprises, tenderProd);
+                    addSaleTender(oldTender, vendUUs, tenderProd);
                 }
             }
 //            if (!CollectionUtils.isEmpty(oldTender.getTenderAttaches())) {
@@ -435,11 +435,16 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     /**
      *  根据供应商信息和招标单新增投标单
      * @param tender
-     * @param enterprises
+     * @param vendUUs
      * @param tenderProd
      */
-    private void addSaleTender(PurchaseTender tender, List<Enterprise> enterprises, PurchaseTenderProd tenderProd) {
-        for (Enterprise enterprise : enterprises) {
+    private void addSaleTender(PurchaseTender tender, List<Long> vendUUs, PurchaseTenderProd tenderProd) {
+        List<Enterprise> vendors = new ArrayList<>();
+        for (Long vendUU: vendUUs) {
+            Enterprise vendor = enterpriseDao.findOne(vendUU);
+            vendors.add(vendor);
+        }
+        for (Enterprise enterprise : vendors) {
             EnterpriseBaseInfo enBaseInfo = enterpriseBaseInfoDao.findOne(enterprise.getUu());
             if (null == enBaseInfo) {
                 enBaseInfo = new EnterpriseBaseInfo(enterprise.getUu(), enterprise.getEnBussinessCode(), enterprise.getEnName(), enterprise.getEnAddress());
@@ -656,5 +661,5 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
 //        return tenderItems;
 //    }
 
-
 }
+

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

@@ -10721,7 +10721,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             prodTitle: null,
             prodCode: null,
             brand: null,
-            unit: null,
+            unit: 'PCS',
             qty: null
             // 供应商企业信息
             // enterpriseBaseInfo: [{}]
@@ -10744,7 +10744,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 prodTitle: null,
                 prodCode: null,
                 brand: null,
-                unit: null,
+                unit: 'PCS',
                 qty: null
                 // 供应商企业信息
                 // enterpriseBaseInfo: [{}]
@@ -10982,9 +10982,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 $scope.tender.tenderAttaches = $scope.attaches;
                 $scope.tender.shipAddress = $scope.tender.shipAdd.address + $scope.tender.shipAdd.addressdet + ' ' + $scope.tender.shipAdd.receiver + ' ' + $scope.tender.shipAdd.usertel;
                 console.log($scope.tender.shipAddress);
+                var vendorUUs = [];
+                angular.forEach($scope.tenderProd.enterpriseBaseInfo, function(enterpriseBaseInfo){
+                    vendorUUs.push(enterpriseBaseInfo.uu);
+                });
                 if (isPublish) { // 发布
                     toaster.pop('info', '提示', '正在发布，请稍候');
-                    PurcTender.publish({tender: $scope.tender, enterpriseBaseInfo: $scope.tenderProd.enterpriseBaseInfo}, {},  function(data){
+                    PurcTender.publish({tender: $scope.tender, vendorUUs: vendorUUs}, {},  function(data){
                         sleep(1500); //当前方法暂停1.5秒
                         $scope.loading = false;
                         toaster.pop('success', '成功', '发布成功');
@@ -10995,7 +10999,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                     });
                 } else { // 保存
                     toaster.pop('info', '提示', '正在保存，请稍候');
-                    PurcTender.save({tender: $scope.tender, enterpriseBaseInfo: $scope.tenderProd.enterpriseBaseInfo}, {},  function(data) {
+                    PurcTender.save({tender: $scope.tender, vendorUUs: vendorUUs}, {},  function(data) {
                         $scope.loading = false;
                         sleep(1500); //当前方法暂停1.5秒  给更新索引留点时间
                         toaster.pop('success', '成功', '保存成功');
@@ -11043,12 +11047,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                     $scope.tender.purchaseTenderProds[i].index = i + 1;
                 }
                 $scope.tender.tenderAttaches = $scope.attaches;
-                if ($scope.tender.shipAddress.address !== null && $scope.tender.shipAddress.addressdet !== null && $scope.tender.shipAddress.receriver !== null && $scope.tender.shipAddress.usertel !== null) {
-                    $scope.tender.shipAddress = $scope.tender.shipAddress.address + $scope.tender.shipAddress.addressdet + ' ' + $scope.tender.shipAddress.receiver + ' ' + $scope.tender.shipAddress.usertel;
-                }
+                $scope.tender.shipAddress = $scope.tender.shipAdd.address + $scope.tender.shipAdd.addressdet + ' ' + $scope.tender.shipAdd.receiver + ' ' + $scope.tender.shipAdd.usertel;
+                var vendorUUs = [];
+                angular.forEach($scope.tenderProd.enterpriseBaseInfo, function(enterpriseBaseInfo){
+                    vendorUUs.push(enterpriseBaseInfo.uu);
+                });
                 if (isPublish) { // 发布
                     toaster.pop('info', '提示', '正在发布，请稍候');
-                    PurcTender.publishSaved({tender: $scope.tender, enterpriseBaseInfo: $scope.tenderProd.enterpriseBaseInfo}, {},  function(data){
+                    PurcTender.publishSaved({tender: $scope.tender, vendorUUs: vendorUUs}, {},  function(data){
                         sleep(1500); //当前方法暂停1.5秒
                         $scope.loading = false;
                         toaster.pop('success', '成功', '发布成功');
@@ -11059,7 +11065,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                     });
                 } else { // 保存
                     toaster.pop('info', '提示', '正在保存，请稍候');
-                    PurcTender.updateSaved({tender: $scope.tender, enterpriseBaseInfo: $scope.tenderProd.enterpriseBaseInfo}, {},  function(data) {
+                    PurcTender.updateSaved({tender: $scope.tender, vendorUUs: vendorUUs}, {},  function(data) {
                         $scope.loading = false;
                         sleep(1500); //当前方法暂停1.5秒  给更新索引留点时间
                         toaster.pop('success', '成功', '保存成功');
@@ -11109,14 +11115,18 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             // now = now.setDate(now.getDate()+1);
             // var minDate = angular.copy($scope.tender.endDate);
             // minDate = minDate.setDate(minDate.getDate() + 1);
-            var minDate = $scope.tender.endDate.getTime() + 24*60*60*1000 + 1; // 不能选相同一天
+            if ($scope.tender.endDate instanceof Date) {
+                var minDate = $scope.tender.endDate.getTime() + 24*60*60*1000 + 1; // 不能选相同一天
+            }
             return $scope.tender.endDate ? $filter('date')(minDate, 'yyyy-MM-dd'):$filter('date')(new Date(), 'yyyy-MM-dd');
         };
 
         $scope.getMaxDate = function() {
             // var maxDate = angular.copy($scope.tender.publishDate);
             // maxDate = maxDate.setDate(maxDate.getDate() - 1);
-            var maxDate = $scope.tender.publishDate.getTime() - 1; // 不能选同一天
+            if ($scope.tender.publishDate instanceof Date) {
+                var maxDate = $scope.tender.publishDate.getTime() - 1; // 不能选同一天
+            }
             return $scope.tender.publishDate ? $filter('date')(maxDate, 'yyyy-MM-dd'):"";
         };
 

src/main/webapp/resources/tpl/index/purc/tender.html

@@ -484,7 +484,7 @@
                     <div class="col-xs-12">
                         <div class="tender-desc">收货地址：</div>
                         <span>
-                             <select class="select fl" style="width: 70%; height: 34px; line-height: 34px;" ng-model="tender.shipAddress"
+                             <select class="select fl" style="width: 70%; height: 34px; line-height: 34px;" ng-model="tender.shipAdd"
                                      ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 								<option value="">请选择收货地址</option>
 							</select>
@@ -672,10 +672,10 @@
                 </div>
                 <div class="col-xs-12" style="padding: 30px;">
                     <div class="col-xs-2 pull-right btn-publish">
-                        <button class="btn" ng-disabled="tenderForm.$invalid || !tender.shipAddress" ng-click="save(true)">发布</button>
+                        <button class="btn" ng-disabled="tenderForm.$invalid || !tender.shipAdd" ng-click="save(true)">发布</button>
                     </div>
                     <div class="col-xs-2 pull-right btn-save">
-                        <button class="btn" ng-disabled="tenderForm.$invalid || !tender.shipAddress" ng-click="save(false)">保存</button>
+                        <button class="btn" ng-disabled="tenderForm.$invalid || !tender.shipAdd" ng-click="save(false)">保存</button>
                     </div>
                 </div>
             </div>