Browse Source

模具批量报价后台

wangmh 8 years ago
parent
commit
ff61f4d8ce

+ 27 - 23
src/main/java/com/uas/platform/b2b/controller/SaleInquiryMouldController.java

@@ -432,29 +432,33 @@ public class SaleInquiryMouldController {
 	 public PurchaseInquiryMould getInquiryMouldHistoryById(@PathVariable("inquiryMouldId") Long inquiryMouldId) {
 		 return purchaseInquiryMouldService.findById(inquiryMouldId);
 	 }
-	
-	// /**
-	// * 作为卖家,报价时上传附件(模具询价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);
-	// }
+
+	/**
+	 * 作为卖家,报价时上传附件(模具询价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);
+			Set<Attach> attaches = new HashSet<>();
+			attaches.add(attach);
+			purchaseInquiryMould.setAttachs(attaches);
+		}
+		purchaseInquiryMouldService.reply(purchaseInquiryMould);
+		return new ResponseEntity<String>(HttpStatus.OK);
+	}
 
 
 

+ 5 - 0
src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryMouldServiceImpl.java

@@ -260,6 +260,11 @@ public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldServ
 		mould.setBackStatus((short) Status.NOT_UPLOAD.value());
 		mould.setReplySendStatus((short) Status.NOT_UPLOAD.value());
 		mould.setReplyDate(new Date());
+		if (mould.getAttachs() == null) {
+			mould.setAttachs(mould.getAttachs());
+		} else if (inquiryMould.getAttachs() != null) {
+			mould.getAttachs().addAll(inquiryMould.getAttachs());
+		}
 		Long userUU = mould.getVendUserUU();
 		if (userUU == null) {
 			userUU = mould.getRecorderuu();