erp反提交报价单，平台对应操作，模具询价单界面修改

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

src/main/java/com/uas/platform/b2b/erp/controller/InquiryMouldController.java

@@ -1,17 +1,5 @@
 package com.uas.platform.b2b.erp.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.erp.model.InquiryMould;
 import com.uas.platform.b2b.erp.model.InquiryMouldDecide;
@@ -26,6 +14,17 @@ import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.util.ArrayUtils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 对买家ERP数据接口<br>
@@ -80,6 +79,19 @@ public class InquiryMouldController {
 				.check(ArrayUtils.convertStringToNumberArray(URLDecoder.decode(data, "UTF-8"), Long.class));
 	}
 
+	/**
+	 * 买家ERP反提交
+	 *
+	 * @param data
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/reCheck", method = RequestMethod.POST)
+	@ResponseBody
+	public void reCheckInquiryMould(@RequestParam("data") String data) throws UnsupportedEncodingException {
+		purchaseInquiryMouldService
+				.reCheck(ArrayUtils.convertStringToNumberArray(URLDecoder.decode(data, "UTF-8"), Long.class));
+	}
+
 	/**
 	 * 买家ERP获取平台的报价信息
 	 *

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

@@ -239,4 +239,10 @@ public interface PurchaseInquiryMouldService {
 	 * @return
 	 */
 	public PurchaseInquiryMould findByEnuuAndErpSourceId(Long enuu,Long in_id);
+
+	/**
+	 * 买家反提交
+	 * @param longs
+	 */
+	void reCheck(Long[] ids);
 }

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

@@ -1,43 +1,11 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
 import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.dao.AttachDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryMouldDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryMouldDetailDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryMouldItemDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryMouldProdReplyDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryMouldReplyDao;
-import com.uas.platform.b2b.dao.UserBaseInfoDao;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.QuotationDown;
 import com.uas.platform.b2b.event.PurchaseInquiryMouldSaveEvent;
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.PurchaseInquiryMould;
-import com.uas.platform.b2b.model.PurchaseInquiryMouldDetail;
-import com.uas.platform.b2b.model.PurchaseInquiryMouldItem;
-import com.uas.platform.b2b.model.PurchaseInquiryMouldProdReply;
-import com.uas.platform.b2b.model.PurchaseInquiryMouldReply;
-import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.model.UserBaseInfo;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseInquiryMouldService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -49,6 +17,23 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.search.b2b.model.PageParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
 
 @Service
 public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldService {
@@ -349,6 +334,15 @@ public class PurchaseInquiryMouldServiceImpl implements PurchaseInquiryMouldServ
 		}
 	}
 
+	@Override
+	public void reCheck(Long[] ids) {
+		for (Long id : ids) {
+			PurchaseInquiryMould mould = purchaseInquiryMouldDao.findOne(id);
+			mould.setCheck(Constant.NO);
+			purchaseInquiryMouldDao.save(mould);
+		}
+	}
+
 	// Long[] ls = new Long[1];
 	// ls[0] = 217L;
 	// purchaseInquiryMouldDao.updateByCheck((short) 1, ls);

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

@@ -311,11 +311,11 @@ tbody td div.text-mould {
 			</tr>
 			<tr class="toolbar toolbar-top">
 				<td colspan="6">
-					<div>
+					<!--<div>
 						<label><input ng-disabled="true" type="checkbox" class="selector select_all"
 							ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 							class="btn btn-default btn-xs">批量报价</a>
-					</div> <!-- 分页 -->
+					</div>--> <!-- 分页 -->
 				</td>
 				<td class="text-center">
 					<a href="sale/mould/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
@@ -364,9 +364,9 @@ tbody td div.text-mould {
 			<tr class="order-hd">
 				<td class="first">
 					<div class="order-main">
-						<span> <input type="checkbox" class="selector"
+						<!--<span> <input type="checkbox" class="selector"
 							ng-model="inquiryMould.$selected">
-						</span> <span class="text-num text-bold"
+						</span>--> <span class="text-num text-bold"
 							title="{{inquiryMould.date}}"
 							ng-bind="::inquiryMould.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
 							class="text-num" ng-bind="::inquiryMould.code" ui-sref="sale.inquiry_mould_detail({id:inquiryMould.id})" target="_self"></a></span>