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

src/main/java/com/uas/platform/b2b/model/PurchaseInquiryItem.java

@@ -586,7 +586,8 @@ public class PurchaseInquiryItem {
     }
 
     public void setErpstatus(Short erpstatus) {
-        this.erpstatus = erpstatus;
+
+	    this.erpstatus = erpstatus ;
     }
 
     /**
@@ -617,17 +618,20 @@ public class PurchaseInquiryItem {
 	 * @return
 	 */
 	public boolean isReplyable() {
+	    if(this.erpstatus == null) {
+	        this.erpstatus = Constant.YES;
+        }
 		if (this.inquiry.getEndDate() != null) {
 			return DateUtils
 					.compare(this.inquiry.getEndDate(), new Date(),
 							DateUtils.COMPARE_DAY) >= 0
 					&& (this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
 							&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES)
-							&& this.agreed == null));
+							&& this.agreed == null) && this.erpstatus != Constant.NO);
 		}
 		return this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
 				&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES)
-				&& this.agreed == null) || this.erpstatus != Constant.NO;
+				&& this.agreed == null) && this.erpstatus != Constant.NO;
 	}
 
     public static List<PurchaseInquiry> distinct(List<PurchaseInquiryItem> purcitems) {

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

@@ -327,8 +327,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
         List<PurchaseInquiryItem> items =  purchaseInquiryItemDao.findByEnUUAndBackStatus(SystemSession.getUser().getEnterprise().getUu(),
                 (short) Status.NOT_UPLOAD.value());
         if(!CollectionUtils.isEmpty(items)) {
-            //TODO 这个地方是后续查询要传输到ERP的询价单报价信息加传输状态过滤
-//        purchaseInquiryItemDao.updateStatus(SystemSession.getUser().getEnterprise().getUu(), Constant.NO);
+            purchaseInquiryItemDao.updateStatus(SystemSession.getUser().getEnterprise().getUu(), Constant.NO);
         }
 		return items;
 	}
@@ -339,6 +338,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 			PurchaseInquiryItem item = purchaseInquiryItemDao.findOne(Long.parseLong(id));
 			if (item != null) {
 				item.setBackStatus((short) Status.DOWNLOADED.value());
+				item.setErpstatus(Constant.YES);
 				purchaseInquiryItemDao.save(item);
 			}
 		}

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

@@ -6606,12 +6606,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         $scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
                         $scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
                         $scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
-
+                        $scope.checkall = true;
                         angular.forEach(page.content, function (notice) {
                             if ($rootScope.ids.indexOf(notice.id) > -1) {
                                 notice.$selected = true;
+                            } else {
+                                $scope.checkall = false;
                             }
                         });
+                        $scope.checkboxes = {
+                            checked: $scope.checkall
+                        };
                     }
                 }, function (response) {
                     $scope.loading = false;
@@ -6782,7 +6787,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
                 }
             });
-            console.log($rootScope.ids);
         };
 
         // 判断数组中是否存在某个对象
@@ -6818,6 +6822,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     $rootScope.ids.remove(order.id);
                 }
             }
+            $scope.checkboxes = {
+                checked: result
+            };
         };
 
         // 打开批量发货模态框

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -531,7 +531,7 @@
 				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1" class="block">
 					<span class="text-trans warning">已报价</span>
 					<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1" style="padding-top: 50px;">
-						<div ng-show="!inquiryItem.$editing">
+						<div ng-show="!inquiryItem.$editing && inquiryItem.replyable">
 							<a ng-click="inquiryItem.$editing=!inquiryItem.$editing;  getToken();">修改报价</a>
 						</div>
 						<div ng-show="inquiryItem.$editing">

src/main/webapp/resources/tpl/index/sale/inquiry_detail.html

@@ -301,7 +301,7 @@
 						<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid != 1" class="block">
 							<span class="text-trans warning">已报价</span>
 							<div ng-if="inquiryItem.inquiry.overdue == 0 && inquiryItem.inquiry.check != 1" style="padding-top: 50px;">
-								<div ng-show="!inquiryItem.$editing">
+								<div ng-show="!inquiryItem.$editing && inquiryItem.replyable">
 									<a ng-click="inquiryItem.$editing=!inquiryItem.$editing;getToken()">修改报价</a>
 								</div>
 								<div ng-show="inquiryItem.$editing">