处理详情页修改报价无法保存问题；注释暂时不需要的功能。

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

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

@@ -18,8 +18,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.PurchaseInquiryMould;
 import com.uas.platform.b2b.model.PurchaseInquiryMouldDetail;
 import com.uas.platform.b2b.model.PurchaseInquiryMouldItem;
@@ -294,24 +292,28 @@ public class SaleInquiryMouldController {
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
-	/**
-	 * 作为卖家，报价时上传附件
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/{id}/send", method = RequestMethod.POST)
-	@ResponseBody
-	public ResponseEntity<String> sendAttachs(String json, @PathVariable("id") Long id, FileUpload uploadItem) {
-		PurchaseInquiryMould purchaseInquiryMould = FlexJsonUtils.fromJson(json, PurchaseInquiryMould.class);
-		if (uploadItem != null && uploadItem.getFile() != null && purchaseInquiryMould != null) {
-			Attach attach = attachService.uploadAndSave(uploadItem, "purchaseInquiryMould", "模具询价附件");
-			attach.setRelativeTable("purc$inquirymould");
-			attach.setRelativeKey(purchaseInquiryMould.getId());
-			attachService.save(attach);
-		}
-		return new ResponseEntity<String>(HttpStatus.OK);
-	}
+	// /**
+	// * 作为卖家，报价时上传附件（模具询价b2b目前不需要上传附件）
+	// *
+	// * @param id
+	// * @return
+	// */
+	// @RequestMapping(value = "/{id}/send", method = RequestMethod.POST)
+	// @ResponseBody
+	// public ResponseEntity<String> sendAttachs(String json,
+	// @PathVariable("id") Long id, FileUpload uploadItem) {
+	// PurchaseInquiryMould purchaseInquiryMould = FlexJsonUtils.fromJson(json,
+	// PurchaseInquiryMould.class);
+	// if (uploadItem != null && uploadItem.getFile() != null &&
+	// purchaseInquiryMould != null) {
+	// Attach attach = attachService.uploadAndSave(uploadItem,
+	// "purchaseInquiryMould", "模具询价附件");
+	// attach.setRelativeTable("purc$inquirymould");
+	// attach.setRelativeKey(purchaseInquiryMould.getId());
+	// attachService.save(attach);
+	// }
+	// return new ResponseEntity<String>(HttpStatus.OK);
+	// }
 
 	// /**
 	// * 作为卖家，查看同产品的报价历史

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

@@ -585,7 +585,7 @@ public class SaleOrderController {
 	}
 
 	/**
-	 * 作为买家，查看发出的采购单
+	 * 作为买家，查看发出的采购单（已结案）
 	 *
 	 * @param params
 	 * @return

src/main/java/com/uas/platform/b2b/erp/model/InquiryMould.java

@@ -405,6 +405,7 @@ public class InquiryMould {
 		inquiryMould.setTaxrate(this.in_tax);
 		inquiryMould.setVendName(this.in_vendname);
 		inquiryMould.setVenduu(this.in_veuu);
+		// 记录传入时间为当前时间
 		inquiryMould.setErpInDate(new Date());
 		inquiryMould.setSendStatus((short) Status.NOT_UPLOAD.value());
 		if (!StringUtils.isEmpty(this.in_adoptstatus)) {

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

@@ -2215,9 +2215,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		$scope.canSave = false;
 		
 		// items价格验证
-		$scope.verifyItems = function(value, index) {
+		$scope.verifyItems = function(price, index) {
 			var regex = /^(0|[1-9][0-9]{0,9})(\.[0-9]{1,6})?$/;//
-			if(regex.test(value) && price != 0) {
+			if(regex.test(price) && price != 0) {
 				var itemprice = $scope.inquiryMould.inquiryMouldItems[index].price;
 				if (itemprice != inquiryMould_copy.inquiryMouldItems[index].price) {
 					$scope.canSave = true;
@@ -2225,15 +2225,15 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					$scope.canSave = false;
 				}
 			} else {
-				toaster.pop('warning','格式错误','请输入最多六位小数的数字');
+				toaster.pop('warning','格式错误','请输入有效价格');
 				$scope.canSave = false;
 			}
 		}
 		
 		// prod下prods价格验证
-		$scope.verifyProds = function(value, index, parentIndex) {
+		$scope.verifyProds = function(price, index, parentIndex) {
 			var regex = /^(0|[1-9][0-9]{0,9})(\.[0-9]{1,6})?$/;//
-			if(regex.test(value) && price != 0) {
+			if(regex.test(price) && price != 0) {
 				var prodPrice = $scope.inquiryMould.inquiryMouldItems[parentIndex].inquiryMouldDetails[index].price;
 				if (prodPrice != inquiryMould_copy.inquiryMouldItems[parentIndex].inquiryMouldDetails[index].price) {
 					$scope.canSave = true;
@@ -2241,7 +2241,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					$scope.canSave = false;
 				}
 			} else {
-				toaster.pop('warning','格式错误','请输入最多六位小数的数字');
+				toaster.pop('warning','格式错误','请输入有效价格');
 				$scope.canSave = false;
 			}
 		}