Merge remote-tracking branch 'origin/master'

pom.xml

@@ -48,8 +48,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <skipTests>true</skipTests>
     </properties>
 

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

@@ -1,8 +1,20 @@
 package com.uas.platform.b2b.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.model.AddPartner;
+import com.uas.platform.b2b.service.AddPartnerService;
+import com.uas.platform.b2b.support.SPageUtils;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
 import com.uas.platform.core.logging.BufferedLoggerManager;
+import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.model.Status;
+import com.uas.platform.core.web.bind.RequestState;
+import com.uas.search.b2b.model.SPage;
 import com.uas.sso.entity.PartnershipRecordView;
+import com.uas.sso.util.AccountUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -13,18 +25,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.uas.sso.util.AccountUtils;
-import com.uas.platform.b2b.model.AddPartner;
-import com.uas.platform.b2b.service.AddPartnerService;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
-import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.model.Status;
-import com.uas.platform.core.web.bind.RequestState;
-import com.uas.search.b2b.model.SPage;
-
 /**
  * 添加合作伙伴
  * 
@@ -51,7 +51,7 @@ public class AddPartnerController {
 	@RequestMapping(value = "/request", method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<BasePartnersInfo> getAllRequest(PageParams params, String keyword) throws Exception {
-		return addPartnerService.findByBusCodeAndKeyWord(keyword, null, params.getCount(), params.getPage());
+		return SPageUtils.covert(addPartnerService.findByBusCodeAndKeyWord(keyword, null, params.getCount(), params.getPage()));
 	}
 
 	/**
@@ -66,8 +66,8 @@ public class AddPartnerController {
 	@RequestMapping(value = "/request", params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<BasePartnersInfo> getTodoRequest(PageParams params, String keyword) throws Exception {
-		return addPartnerService.findByBusCodeAndKeyWord(keyword, Status.UNAUDIT.value(), params.getCount(),
-				params.getPage());
+		return SPageUtils.covert(addPartnerService.findByBusCodeAndKeyWord(keyword, Status.UNAUDIT.value(), params.getCount(),
+				params.getPage()));
 	}
 
 	/**
@@ -81,8 +81,8 @@ public class AddPartnerController {
 	@RequestMapping(value = "/request", params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<BasePartnersInfo> getDoneRequest(PageParams params, String keyword) throws Exception {
-		return addPartnerService.findByBusCodeAndKeyWord(keyword, Status.ENABLED.value(), params.getCount(),
-				params.getPage());
+		return SPageUtils.covert(addPartnerService.findByBusCodeAndKeyWord(keyword, Status.ENABLED.value(), params.getCount(),
+				params.getPage()));
 	}
 
 	/**
@@ -96,8 +96,8 @@ public class AddPartnerController {
 	@RequestMapping(value = "/request", params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<BasePartnersInfo> getEndRequest(PageParams params, String keyword) throws Exception {
-		return addPartnerService.findByBusCodeAndKeyWord(keyword, Status.UNAPPLY.value(), params.getCount(),
-				params.getPage());
+		return SPageUtils.covert(addPartnerService.findByBusCodeAndKeyWord(keyword, Status.UNAPPLY.value(), params.getCount(),
+				params.getPage()));
 	}
 
 	/**

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

@@ -5,6 +5,7 @@ import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.service.ProductService;
@@ -85,7 +86,7 @@ public class BaseInfoController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -120,7 +121,7 @@ public class BaseInfoController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -154,7 +155,7 @@ public class BaseInfoController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -168,6 +169,8 @@ public class BaseInfoController {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（全部）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isSale", Constant.YES);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		/*pageInfo.filter("b2bDisabled", Constant.NO);*/
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -181,6 +184,8 @@ public class BaseInfoController {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isSale", Constant.YES);
 		pageInfo.filter("standard", Constant.YES);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		/*pageInfo.filter("b2bDisabled", Constant.NO);*/
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -193,6 +198,9 @@ public class BaseInfoController {
 		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（非标准）");
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("isSale", Constant.YES);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+        pageInfo.filter("standard", Constant.NO);
+		/*pageInfo.filter("b2bDisabled", Constant.NO);*/
 		return productService.findNotStandardB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -303,7 +311,7 @@ public class BaseInfoController {
 		pageInfo.filter("isSale", Constant.YES);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getAllProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "全部物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出全部可卖产品Excel列表");
@@ -325,7 +333,7 @@ public class BaseInfoController {
 		pageInfo.filter("standard", Constant.YES);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出标准可卖产品Excel列表");
@@ -347,7 +355,7 @@ public class BaseInfoController {
 		pageInfo.filter("standard", Constant.NO);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getNonStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "非标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出非标准可卖产品Excel列表");
@@ -368,9 +376,9 @@ public class BaseInfoController {
 		InputStream is = null;
 		Workbook workbook = null;
 		is = uploadItem.getFile().getInputStream();
-		if ("xls".equals(suffix)) {
+		if (JxlsExcelView.EXCEL_XLS.equals(suffix)) {
 			workbook = new HSSFWorkbook(is);
-		} else if ("xlsx".equals(suffix)) {
+		} else if (JxlsExcelView.EXCEL_XLSX.equals(suffix)) {
 			workbook = new XSSFWorkbook(is);
 		} else {
 			throw new IllegalOperatorException("文件格不正确，请上传.xls或.xlsx的文件");
@@ -475,8 +483,8 @@ public class BaseInfoController {
 		pageParams.getFilters().put("searchstatus", Constant.YES);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("status", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id", true, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
 	}
@@ -498,8 +506,8 @@ public class BaseInfoController {
 		pageParams.getFilters().put("status", Status.ENABLED.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("status", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("id", true, Type.LONG, new Long(1)));
+		sortList.add(new Sort("status", false, Type.INT, new Long(1)));
+		sortList.add(new Sort("id", true, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
 	}
@@ -529,17 +537,6 @@ public class BaseInfoController {
 		baseInfoService.switchPorduct(status);
 	}
 
-	/**
-	 * 一键匹配物料信息
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/edit/matchbytype/{type}", method = RequestMethod.POST)
-	@ResponseBody
-	private ModelMap matchall(@PathVariable String type) throws Exception {
-		return productService.matchall(type);
-	}
-
 	/**
 	 * 设置单据已读
 	 *

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

@@ -77,7 +77,7 @@ public class CartController {
 		// 当前登录企业作为供应商
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_useruu", SystemSession.getUser().getUserUU());

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

@@ -1,85 +0,0 @@
-package com.uas.platform.b2b.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.uas.platform.b2b.model.Attach;
-import com.uas.platform.b2b.model.ChangeAdmin;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.FileUpload;
-import com.uas.platform.b2b.service.AttachService;
-import com.uas.platform.b2b.service.ChangeAdminService;
-import com.uas.platform.b2b.service.EnterpriseService;
-import com.uas.platform.core.model.Status;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
-
-/**
- * 
- * @author aof
- * @date 2015年12月25日 下午8:14:58
- *
- */
-@SuppressWarnings("deprecation")
-@Controller
-@RequestMapping(value = "/changeadmin")
-public class ChangeAdminController {
-	
-	@Autowired
-	private AttachService attachService;
-	
-	@Autowired
-	private ChangeAdminService changeAdminService;
-	
-	@Autowired
-	private EnterpriseService enterpriseService;
-	/**
-	 * 用户提交更换管理员申请
-	 */
-	@RequestMapping(method = RequestMethod.POST)
-	public @ResponseBody ResponseEntity<ModelMap> changeAdmin(String enterprise, FileUpload uploadItem, Boolean isSaas) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json; charset=utf-8");
-		ModelMap map = new ModelMap();
-		ChangeAdmin newAdmin = FlexJsonUtils.fromJson(enterprise,ChangeAdmin.class);
-		boolean stamp = false;
-		if (newAdmin != null) {
-			ChangeAdmin admins = changeAdminService.checkEnuu(newAdmin.getEnBussinessCode(),newAdmin.getUu(),(short) Status.UNAUDIT.value());
-			Enterprise enter = enterpriseService.findEnterpriseByUuAndEnBussinessCode(newAdmin.getUu(), newAdmin.getEnBussinessCode());
-			if (admins != null) {//申请状态为申请中
-				map.put("tab", "UNAUDIT");
-				return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
-			} else if (enter != null) {//企业uu和营业执照号不匹配
-				stamp = true;
-			} else {
-				map.put("tab", "undefine");
-				return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
-			}
-		}
-				
-		if (stamp) {
-			Attach attach = attachService.upload(uploadItem, "bussinessCodeImg", "客户营业执照复印件或照片");// 先保存上传到文件
-			if (attach == null) {// 文件过大
-				map.put("error", "文件过大");
-				return new ResponseEntity<ModelMap>(map, headers, HttpStatus.FORBIDDEN);
-			} else {// 上传成功
-				newAdmin.setEnBussinessCodeAttach(attach);
-				//保存申请表
-				ChangeAdmin admin = changeAdminService.changeAdmin(newAdmin);
-				if (admin == null) {// 营业执照码验证
-					map.put("error", "操作失败");
-					return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
-				}
-				map.put("uu", admin.getUu());
-				return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
-			}
-		}
-		return null;
-	}
-}

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

@@ -166,7 +166,7 @@ public class DeputyOrderController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -200,7 +200,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_statuscode", Status.UNAUDIT.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -234,7 +234,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_downloadstatus", "未下载");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -268,7 +268,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_downloadstatus", "已下载");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -301,7 +301,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_statuscode", Status.AGREED.value());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -333,7 +333,7 @@ public class DeputyOrderController {
 		pageParams.getFilters().put("deo_entrystatus", "保存");
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("deo_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("deo_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchDeputyOrderCheckIds(keyword, pageParams);
 	}
@@ -426,7 +426,7 @@ public class DeputyOrderController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("ve_myenuu", enuu);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchVendorCheckIds(keyword, pageParams);
 	}

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

@@ -1,168 +1,157 @@
-package com.uas.platform.b2b.controller;
-
-import java.util.List;
-
-import com.uas.platform.b2b.model.PurchaseApBillOutInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.alibaba.fastjson.JSON;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.GrowthProcess;
-import com.uas.platform.b2b.model.ShipAddress;
-import com.uas.platform.b2b.service.EnterpriseService;
-import com.uas.platform.b2b.service.GrowthService;
-import com.uas.platform.b2b.service.ShipAddressService;
-import com.uas.platform.b2b.service.UserService;
-import com.uas.platform.b2b.support.SystemSession;
-
-/**
- * 账户管理--企业信息管理
- * 
- * @author yingp
- * 
- * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
- * @see com.uas.platform.b2b.v2.controller.EnterpriseController
- * 
- */
-@Deprecated
-@Controller
-@RequestMapping(value = "/account/enterprise")
-public class EnterpriseController {
-
-	@Autowired
-	private EnterpriseService enterpriseService;
-
-	@Autowired
-	private GrowthService growthService;
-
-	@Autowired
-	private UserService userService;
-
-	@Autowired
-	private ShipAddressService shipAddressService;
-
-	/**
-	 * 取企业基本资料
-	 * 
-	 * @return
-	 */
-	@RequestMapping(method = RequestMethod.GET)
-	@ResponseBody
-	public Enterprise getEnterprise() {
-		Enterprise enterprise = SystemSession.getUser().getEnterprise();
-		enterprise.setAdmin(userService.findUserByUserUU(enterprise.getEnAdminuu()));
-		return enterprise;
-	}
-
-	/**
-	 * 修改企业基本资料
-	 * 
-	 * @return
-	 */
-	@RequestMapping(method = RequestMethod.POST)
-	@ResponseBody
-	public void updateEnterprise(@RequestBody Enterprise enterprise) {
-		enterprise = enterpriseService.save(enterprise);
-		SystemSession.getUser().setCurrentEnterprise(enterprise);
-	}
-
-	/**
-	 * 申请优企云服
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/applySaas", method = RequestMethod.POST)
-	@ResponseBody
-	public void applySaas(Long enUU, String enSaasUrl, String enAdminPassword) {
-		Enterprise enterprise = enterpriseService.applySaas(enUU, enSaasUrl, enAdminPassword);
-		SystemSession.getUser().setCurrentEnterprise(enterprise);
-	}
-
-	/**
-	 * 企业成长历程
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/growth", method = RequestMethod.GET)
-	@ResponseBody
-	public List<GrowthProcess> getGrowth() {
-		return growthService.findAllProcess();
-	}
-
-	/**
-	 * 新增或修改企业地址
-	 * 
-	 * @param shipAddress
-	 * @return
-	 */
-	@RequestMapping(value = "/saveShipAddress", method = RequestMethod.POST)
-	@ResponseBody
-	private ModelMap saveShipAddress(@RequestBody String ship) {
-		ShipAddress shipAddress = JSON.parseObject(ship, ShipAddress.class);
-		return shipAddressService.saveShipAddress(shipAddress);
-	}
-
-	/**
-	 * 获取收货地址列表
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/shipAddList", method = RequestMethod.GET)
-	@ResponseBody
-	private List<ShipAddress> getShipAddress() {
-		return shipAddressService.getShipAddress();
-	}
-
-	/**
-	 * 删除收货地址
-	 * 
-	 * @param id
-	 */
-	@RequestMapping(value = "/removeShipAddress/{id}", method = RequestMethod.DELETE)
-	@ResponseBody
-	private void removeShipAddress(@PathVariable Long id) {
-		shipAddressService.removeShipAddress(id);
-	}
-
-	/**
-	 * 根据uu获取企业基本信息
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	@RequestMapping(value = "/info/{bussinessCode}", method = RequestMethod.GET)
-	@ResponseBody
-	private Enterprise getInfo(@PathVariable String bussinessCode) {
-		return enterpriseService.findByenBussinessCode(bussinessCode);
-	}
-
-	/**
-	 * 修改企业开票信息
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/saveApBillOutInfo", method = RequestMethod.POST)
-	@ResponseBody
-	public void saveApBillOutInfo(@RequestBody String json) {
-		PurchaseApBillOutInfo apBillOutInfo = JSON.parseObject(json, PurchaseApBillOutInfo.class);
-		enterpriseService.saveApBillOutInfo(apBillOutInfo);
-	}
-
-	/**
-	 * 获取企业开票信息
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/getApBillOutInfo/{enuu}", method = RequestMethod.GET)
-	@ResponseBody
-	public PurchaseApBillOutInfo getApBillOutInfo(@PathVariable Long enuu) {
-		return enterpriseService.getApBillOutInfo(enuu);
-	}
-}
+package com.uas.platform.b2b.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.GrowthProcess;
+import com.uas.platform.b2b.model.ShipAddress;
+import com.uas.platform.b2b.service.EnterpriseService;
+import com.uas.platform.b2b.service.GrowthService;
+import com.uas.platform.b2b.service.ShipAddressService;
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.b2b.support.SysConf;
+import com.uas.platform.b2b.support.SystemSession;
+
+/**
+ * 账户管理--企业信息管理
+ * 
+ * @author yingp
+ * 
+ * @since 2016-9-26 21:18:35 账户中心统一管理；部分功能保留，但转移到v2目录
+ * @see com.uas.platform.b2b.v2.controller.EnterpriseController
+ * 
+ */
+@Deprecated
+@Controller
+@RequestMapping(value = "/account/enterprise")
+public class EnterpriseController {
+
+	@Autowired
+	private EnterpriseService enterpriseService;
+
+	@Autowired
+	private GrowthService growthService;
+
+	@Autowired
+	private UserService userService;
+
+	@Autowired
+	private ShipAddressService shipAddressService;
+
+	/**
+	 * 取企业基本资料
+	 * 
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	@ResponseBody
+	public Enterprise getEnterprise() {
+		Enterprise enterprise = SystemSession.getUser().getEnterprise();
+		enterprise.setAdmin(userService.findUserByUserUU(enterprise.getEnAdminuu()));
+		return enterprise;
+	}
+
+	/**
+	 * 修改企业基本资料
+	 * 
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.POST)
+	@ResponseBody
+	public void updateEnterprise(@RequestBody Enterprise enterprise) {
+		enterprise = enterpriseService.save(enterprise);
+		SystemSession.getUser().setCurrentEnterprise(enterprise);
+	}
+
+	/**
+	 * 申请优企云服
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/applySaas", method = RequestMethod.POST)
+	@ResponseBody
+	public void applySaas(Long enUU, String enSaasUrl, String enAdminPassword) {
+		Enterprise enterprise = enterpriseService.applySaas(enUU, enSaasUrl, enAdminPassword);
+		SystemSession.getUser().setCurrentEnterprise(enterprise);
+	}
+
+	/**
+	 * 企业成长历程
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/growth", method = RequestMethod.GET)
+	@ResponseBody
+	public List<GrowthProcess> getGrowth() {
+		return growthService.findAllProcess();
+	}
+
+	/**
+	 * 新增或修改企业地址
+	 * 
+	 * @param ship
+	 * @return
+	 */
+	@RequestMapping(value = "/saveShipAddress", method = RequestMethod.POST)
+	@ResponseBody
+	private ModelMap saveShipAddress(@RequestBody String ship) {
+		ShipAddress shipAddress = JSON.parseObject(ship, ShipAddress.class);
+		return shipAddressService.saveShipAddress(shipAddress);
+	}
+
+	/**
+	 * 获取收货地址列表
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/shipAddList", method = RequestMethod.GET)
+	@ResponseBody
+	private List<ShipAddress> getShipAddress() {
+		return shipAddressService.getShipAddress();
+	}
+
+	/**
+	 * 删除收货地址
+	 * 
+	 * @param id
+	 */
+	@RequestMapping(value = "/removeShipAddress/{id}", method = RequestMethod.DELETE)
+	@ResponseBody
+	private void removeShipAddress(@PathVariable Long id) {
+		shipAddressService.removeShipAddress(id);
+	}
+
+	/**
+	 * 根据uu获取企业基本信息
+	 * 
+	 * @param bussinessCode
+	 * @return
+	 */
+	@RequestMapping(value = "/info/{bussinessCode}", method = RequestMethod.GET)
+	@ResponseBody
+	private Enterprise getInfo(@PathVariable String bussinessCode) {
+		return enterpriseService.findByenBussinessCode(bussinessCode);
+	}
+
+	/**
+	 * 获取B2C路径
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/getB2cUrl", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap getB2cUrl() {
+		return new ModelMap("url", ContextUtils.getBean(SysConf.class).getB2c());
+	}
+}

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

@@ -96,7 +96,7 @@ public class InvitationRecordController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("in_useruu", SystemSession.getUser().getUserUU());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         logger.log("邀请注册", "查询邀请记录（个人）");
 		return invitationRecordService.getRecords(pageParams, keyword);
@@ -112,7 +112,7 @@ public class InvitationRecordController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         logger.log("邀请注册", "查询邀请记录（企业）");
 		return invitationRecordService.getRecords(pageParams, keyword);
@@ -129,7 +129,7 @@ public class InvitationRecordController {
 		pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("in_active", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("in_date", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         logger.log("邀请注册", "查询邀请记录（企业）--已激活");
 		return invitationRecordService.getRecords(pageParams, keyword);

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

@@ -89,7 +89,7 @@ public class MakeAcceptController {
         pageParams.getFilters().put("ma_venduu", SystemSession.getUser().getEnterprise().getUu());
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeAcceptIds(filter.getKeyword(), pageParams);
 	}

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

@@ -94,7 +94,7 @@ public class MakeOrderChangeController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("mcd_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("mcd_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderChangeIds(filter.getKeyword(), pageParams);
 	}

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

@@ -98,7 +98,7 @@ public class MakeOrderController {
         }
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}
@@ -144,7 +144,7 @@ public class MakeOrderController {
 		pageParams.getFilters().put("ma_end", Constant.NO);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}
@@ -190,7 +190,7 @@ public class MakeOrderController {
 		pageParams.getFilters().put("ma_end", Constant.NO);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}
@@ -234,7 +234,7 @@ public class MakeOrderController {
 		pageParams.getFilters().put("ma_end", Constant.YES);
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(filter.getKeyword(), pageParams);
 	}

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

@@ -83,7 +83,7 @@ public class MakeOutOrderController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeOrderIds(keyword, pageParams);
 	}
@@ -134,7 +134,7 @@ public class MakeOutOrderController {
 		// TODO 供应商分配，已去除
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ma_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ma_id", false, Type.INT, new Long(1)));
 		searchPageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		List<MakeOrder> makeOrders =  searchService.searchMakeOrderIds(keyword, searchPageParams).getContent();
 

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

@@ -85,7 +85,7 @@ public class MakeReturnController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("mr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("mr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchMakeReturnIds(keyword, pageParams);
 	}

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

@@ -1,145 +0,0 @@
-package com.uas.platform.b2b.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.service.PurchaseApBillOutService;
-import com.uas.platform.b2b.service.PurchaseApCheckService;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-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 javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-/**
- * 票加加开票数据回传接口
- *
- * @author huangct
- * @time 创建时间：2018年03月07日
- */
-
-@SuppressWarnings("deprecation")
-@Controller
-@RequestMapping("/public/apBillOut")
-public class PiaoPlusNoticeController {
-
-	@Autowired
-	PurchaseApCheckService purchaseApCheckService;
-
-	@Autowired
-	private PurchaseApBillOutService purchaseApBillOutService;
-
-	/**
-	 * 电子发票开票成功通知
-	 * @param data
-	 * @return
-	 */
-	@RequestMapping(value = "/electricBillSuccessNotice", method = RequestMethod.POST)
-	@ResponseBody
-	public ModelMap electricBillSuccessNotice(@RequestParam("data") String data){
-		JSONObject noticeData = JSONObject.parseObject(data);
-		String taxpayerId = noticeData.getString("taxpayerId");
-		String billRequestNum = noticeData.getString("billRequestNum");
-		String orderNo = noticeData.getString("orderNo");
-		String reIssue = noticeData.getString("reIssue");//是否允许重开 0允许，1不允许
-		String code = noticeData.getString("code");
-		String resMsg = noticeData.getString("resMsg");
-
-
-		return null;
-	}
-
-	/**
-	 * 电子开票失败通知
-	 * @param data
-	 * @return
-	 */
-	@RequestMapping(value = "/electricBillFailNotice", method = RequestMethod.POST)
-	@ResponseBody
-	public ModelMap electricBillFailNotice(@RequestParam("data") String data){
-		JSONObject noticeData = JSONObject.parseObject(data);
-		String taxpayerId = noticeData.getString("taxpayerId");
-		String billRequestNum = noticeData.getString("billRequestNum");
-		String orderNo = noticeData.getString("orderNo");
-		String reIssue = noticeData.getString("reIssue");//是否允许重开 0允许，1不允许
-
-		//电子发票只有这俩个
-		String code = noticeData.getString("code");
-		String resMsg = noticeData.getString("resMsg");
-
-		return null;
-	}
-
-	/**
-	 * 纸质发票开票成功通知
-	 * @param request
-	 * @return
-	 */
-	@RequestMapping(value = "/paperBillSuccessNotice", method = RequestMethod.POST)
-	@ResponseBody
-	public JSONObject billSuccessNotice(HttpServletRequest request) throws IOException {
-		String data = IOUtils.toString(request.getInputStream(), request.getCharacterEncoding());
-		JSONObject jsonObject = new JSONObject();
-		JSONObject noticeData = JSONObject.parseObject(data);
-		String sysOrderNo = noticeData.getString("sysOrderNo");
-		String orderNo = noticeData.getString("orderNo");
-		String fpdm = noticeData.getString("fpdm");//发票代码
-		String code = noticeData.getString("code");//0000 成功
-		String fplx = noticeData.getString("fplx");
-		String billRequestNum = noticeData.getString("billRequestNum");//请求流水号
-		String totalMoney = noticeData.getString("totalMoney");
-		String reIssue = noticeData.getString("reIssue");//是否允许重开 0允许，1不允许
-		String resMsg = noticeData.getString("resMsg");
-		String taxpayerId = noticeData.getString("taxpayerId");
-		String fphm = noticeData.getString("fphm");//发票号码
-
-		//TODO 查询出错
-		/*PurchaseApBillOut apBillOut = purchaseApBillOutService.findByCode(sysOrderNo);
-
-		apBillOut.setNsrsbh(taxpayerId);
-		apBillOut.setInfoTypeCode(fpdm);
-		apBillOut.setInfoNumber(fphm);
-		apBillOut.setRequestCode(billRequestNum);
-		apBillOut.setReissue(reIssue);
-		apBillOut.setRetmsg(resMsg);
-
-		//修改开票单状态
-		apBillOut.setCheckStatus("已开票");
-
-		purchaseApBillOutService.save(apBillOut);*/
-
-		jsonObject.put("code", "0000");
-		jsonObject.put("resMsg", "开票成功！");
-
-		return jsonObject;
-	}
-
-	/**
-	 * 纸质开票失败通知
-	 * @param data
-	 * @return
-	 */
-	@RequestMapping(value = "/paperBillFailNotice", method = RequestMethod.POST)
-	@ResponseBody
-	public ModelMap billFailNotice(@RequestParam("data") String data){
-		JSONObject noticeData = JSONObject.parseObject(data);
-		String taxpayerId = noticeData.getString("taxpayerId");
-		String billRequestNum = noticeData.getString("billRequestNum");
-		String totalMoney = noticeData.getString("totalMoney");//税金合计
-		String fplx = noticeData.getString("fplx");//发票类型  1表示蓝票，2表示红票
-		String fpdm = noticeData.getString("fpdm");//发票代码  开票结果为成功时必填
-		String fphm = noticeData.getString("fphm");//发票号码  开票结果为成功时必填
-		String yfpdm = noticeData.getString("yfpdm");//原发票代码  开票类型为红票时必填
-		String yfphm = noticeData.getString("yfphm");//原发票号码  开票类型为红票时必填
-		String sysOrderNo = noticeData.getString("sysOrderNo");//BPM申请单编号  当前开票请求由BPM发起时回填，否则该字段为空。
-
-		String code = noticeData.getString("code");
-		String resMsg = noticeData.getString("resMsg");
-
-		return null;
-	}
-}

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

@@ -1,15 +1,13 @@
 package com.uas.platform.b2b.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.model.Component;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.ProductMatchResult;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.b2b.temporary.model.UpdateByBatchParameter;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
@@ -22,8 +20,10 @@ import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.ArrayList;
@@ -34,7 +34,6 @@ import java.util.List;
  * 物料
  * 
  * @author suntg
- * 
  */
 @Controller
 @RequestMapping("/product")
@@ -64,7 +63,7 @@ public class ProductController {
 			map.put("pr_b2bdisabled", Constant.YES);
 			pageParams.setNotEqualFilters(map);
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			return searchService.searchProductsCheckIds(keyword, pageParams);
 		} else {
@@ -91,7 +90,7 @@ public class ProductController {
 			map.put("pr_b2bdisabled", Constant.YES);
 			pageParams.setNotEqualFilters(map);
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+			sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			return searchService.searchProductsCheckIds(keyword, pageParams);
 		} else {
@@ -114,7 +113,7 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -148,7 +147,7 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -180,7 +179,7 @@ public class ProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -196,6 +195,8 @@ public class ProductController {
 	@ResponseBody
 	public SPage<Product> getProductInfo(PageParams params, String keyword) {
 		PageInfo pageInfo = new PageInfo(params);
+        pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+        /*pageInfo.filter("b2bDisabled", Constant.NO);*/
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -211,6 +212,8 @@ public class ProductController {
 	public SPage<Product> getProductInfoStandard(PageParams params, String keyword) {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("standard", Constant.YES);
+        pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+        /*pageInfo.filter("b2bDisabled", Constant.NO);*/
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -226,6 +229,8 @@ public class ProductController {
 	public SPage<Product> getProductInfoNonStandard(PageParams params, String keyword) {
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("standard", Constant.NO);
+        pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+        /*pageInfo.filter("b2bDisabled", Constant.NO);*/
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
@@ -290,7 +295,7 @@ public class ProductController {
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getAllProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "全部物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出全部Excel列表");
@@ -311,7 +316,7 @@ public class ProductController {
 		pageInfo.filter("standard", Constant.YES);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出标准Excel列表");
@@ -332,164 +337,13 @@ public class ProductController {
 		pageInfo.filter("standard", Constant.NO);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				:getNonStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "非标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出非标准Excel列表");
 		return modelAndView;
 	}
 
-	/**
-	 * 批量修改物料数据 -- 未使用
-	 * 
-	 * @param products
-	 * @param updatetype
-	 * @param keyword
-	 * @return
-	 */
-	@RequestMapping(value = "/updateByBatch", method = RequestMethod.POST)
-	@ResponseBody
-	private ModelMap updateByBatch(@RequestBody String products, String updatetype, String keyword) throws Exception {
-		List<Product> prods = JSONObject.parseArray(products, Product.class);
-		return productService.updateByBatch(prods, updatetype, keyword);
-	}
-
-	/**
-	 * 批量修改物料数据
-	 * 
-	 * @param parameter
-	 * @return
-	 */
-	@RequestMapping(value = "/alterByBatch", method = RequestMethod.POST)
-	@ResponseBody
-	private ModelMap alterByBatch(String parameter) throws Exception {
-		UpdateByBatchParameter param = JSONObject.parseObject(parameter, UpdateByBatchParameter.class);
-		return productService.alterByBatch(param);
-	}
-
-	/**
-	 * 获取企业所有的品牌
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/brands", method = RequestMethod.GET)
-	@ResponseBody
-	private List<Product> getBrands(String parameter) {
-		UpdateByBatchParameter param = JSONObject.parseObject(parameter, UpdateByBatchParameter.class);
-		return productService.getBrands(param);
-	}
-
-	/**
-	 * 获取所有类目
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/titles", method = RequestMethod.GET)
-	@ResponseBody
-	private List<Product> getTitles(String parameter) {
-		UpdateByBatchParameter param = JSONObject.parseObject(parameter, UpdateByBatchParameter.class);
-		return productService.getTitles(param);
-	}
-
-	/**
-	 * 一键匹配物料信息
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/matchbytype/{type}", method = RequestMethod.GET)
-	@ResponseBody
-	private ModelMap matchall(@PathVariable String type) throws Exception {
-		return productService.matchall(type);
-	}
-
-	/**
-	 * 得到匹配结果数量
-	 * 
-	 * @param type
-	 * @return
-	 */
-	@RequestMapping(value = "/matchsize/{type}", method = RequestMethod.GET)
-	@ResponseBody
-	private ModelMap matchsize(@PathVariable String type) {
-		return productService.matchsize(type);
-	}
-
-	/**
-	 * 一键匹配物料信息
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/matchall/{code}", method = RequestMethod.GET)
-	@ResponseBody
-	private List<Component> matchByCode(String code) throws Exception {
-		return productService.matchByCode(code);
-	}
-
-	/**
-	 * 查看匹配的物料信息（全部）
-	 */
-	@RequestMapping(value = "/matchResult", method = RequestMethod.GET)
-	@ResponseBody
-	public SPage<Product> getmatchResult(PageParams params, String keyword) {
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
-		pageParams.getFilters().put("pr_matchstatus", Status.SUBMITTED.value());
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		pageParams.setNotEqualFilters(map);
-
-		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
-		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
-	}
-
-	/**
-	 * 查看匹配的物料信息（销售）
-	 */
-	@RequestMapping(value = "/matchResult", params = RequestState.STANDARD, method = RequestMethod.GET)
-	@ResponseBody
-	public SPage<Product> getmatchResultOnSale(PageParams params, String keyword) {
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
-		pageParams.getFilters().put("pr_matchstatus", Status.SUBMITTED.value());
-		pageParams.getFilters().put("pr_issale", Constant.YES);
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		pageParams.setNotEqualFilters(map);
-
-		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
-		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
-	}
-
-	/**
-	 * 查看匹配的物料信息（采购）
-	 */
-	@RequestMapping(value = "/matchResult", params = RequestState.NONSTANDARD, method = RequestMethod.GET)
-	@ResponseBody
-	public SPage<Product> getmatchResultOnPurc(PageParams params, String keyword) {
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
-		pageParams.getFilters().put("pr_matchstatus", Status.SUBMITTED.value());
-		pageParams.getFilters().put("pr_ispurchase", Constant.YES);
-
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2bdisabled", Constant.YES);
-		pageParams.setNotEqualFilters(map);
-
-		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
-		sortList.add(new Sort("pr_matchsize", true, Type.LONG, new Long(1)));
-		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchProductsCheckIds(keyword, pageParams);
-	}
-
 	/**
 	 * 查看自己的物料资料--不查询（全部）
 	 */
@@ -528,42 +382,6 @@ public class ProductController {
 		return productService.findB2bEnabledProductInfoByPageInfo(pageInfo, keyword);
 	}
 
-	/**
-	 * 更新物料
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/refreshproduct/{id}", method = RequestMethod.POST)
-	@ResponseBody
-	public ModelMap refreshproduct(@PathVariable Long id) {
-		return productService.refreshproduct(id);
-	}
-
-	/**
-	 * 批量更新
-	 * 
-	 * @param ids
-	 * @return
-	 */
-	@RequestMapping(value = "/updateall", method = RequestMethod.POST)
-	@ResponseBody
-	public ModelMap updateall(boolean status, String type, @RequestBody String ids) {
-		List<Long> idStrings = JSONObject.parseArray(ids, Long.class);
-		return productService.updateall(status, type, idStrings);
-	}
-
-	/**
-	 * 全部更新
-	 * 
-	 * @return
-	 */
-	// @RequestMapping(value = "/updateByEn", method = RequestMethod.POST)
-	// @ResponseBody
-	// public ModelMap updateByEn() {
-	// return productService.updateByEn();
-	// }
-	
 	/**
 	 * 单个匹配
 	 * 

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

@@ -70,7 +70,7 @@ public class ProductUsersController {
         pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pu_useruu", SystemSession.getUser().getUserUU());
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+        sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return searchService.searchProductUsersCheckIds(keyword, pageParams);
     }
@@ -96,24 +96,18 @@ public class ProductUsersController {
      */
     @RequestMapping(value = "/edit/release/excel", method = RequestMethod.POST)
     public ModelMap releaseByExcel(FileUpload uploadItem) throws IllegalOperatorException, IOException {
-        ModelMap map = new ModelMap();
         String fileName = uploadItem.getFile().getOriginalFilename();
         String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
-        InputStream is = null;
-        Workbook workbook = null;
-//        try {
-            is = uploadItem.getFile().getInputStream();
-            if ("xls".equals(suffix)) {
+        InputStream is = uploadItem.getFile().getInputStream();
+        Workbook workbook;
+            if (JxlsExcelView.EXCEL_XLS.equals(suffix)) {
                 workbook = new HSSFWorkbook(is);
-            } else if ("xlsx".equals(suffix)) {
+            } else if (JxlsExcelView.EXCEL_XLSX.equals(suffix)) {
                 workbook = new XSSFWorkbook(is);
             } else {
                 throw new IllegalOperatorException("文件格式不正确，请上传.xls或.xlsx的文件");
             }
-            map = productUsersService.releaseByWorkbook(workbook);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
+        ModelMap map = productUsersService.releaseByWorkbook(workbook);
         logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了个人物料，数量为" + map.get("success"));
         return map;
     }

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

@@ -1,36 +1,23 @@
 package com.uas.platform.b2b.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.search.SearchService;
+import com.uas.platform.b2b.model.OrderStatus;
+import com.uas.platform.b2b.model.PublicInquiryItemInfo;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.service.PubInquiryService;
-import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.TokenService;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.model.Status;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.platform.core.web.bind.RequestState;
-import com.uas.search.b2b.model.MultiValue;
 import com.uas.search.b2b.model.SPage;
-import com.uas.search.b2b.model.Sort;
-import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * 公共询价（针对供应商）
@@ -46,27 +33,6 @@ public class PubInquiryController {
     @Autowired
     private PubInquiryService pubInquiryService;
 
-    @Autowired
-    private UserService userService;
-
-    @Autowired
-    private SearchService searchService;
-
-    @Autowired
-    private TokenService tokenService;
-
-    /**
-     * 转成客户询价单
-     *
-     * @param id 公共询价明细id
-     * @return
-     */
-    @RequestMapping(value = "/turntoInquiry/{id}", method = RequestMethod.POST)
-    private ModelMap transtoInquiry(@PathVariable Long id) {
-        logger.log("公共询价单", "将公共询价单（" + id + ")转成询价报价单");
-        return pubInquiryService.transtoInquiry(id);
-    }
-
     /**
      * 作为卖家，收到的采购询价（全部）不搜索
      *
@@ -179,245 +145,6 @@ public class PubInquiryController {
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.agreed.name());
     }
 
-    /**
-     * 作为卖家，收到的采购询价（全部）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     * @return
-     */
-    @RequestMapping(value = "/info/search", method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getReceivedPurchaseInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看收到的客户询价单列表（全部）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为供应商
-        pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-        SearchFilter filter = userService.distribute();
-        if (filter != null && filter.getDistribute() == null) {
-            return null;
-        }
-        if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-            List<Object> list = new ArrayList<>();
-            for (Object object : filter.getDistribute()) {
-                list.add(object);
-            }
-            pageParams.getFilters().put("id_inid", new MultiValue(list, true));
-        }
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为卖家，收到的采购询价（待报价）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     * @return
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getTodoInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看收到的客户询价单（待报价）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为供应商
-        pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-        SearchFilter filter = userService.distribute();
-        if (filter != null && filter.getDistribute() == null) {
-            return null;
-        }
-        if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-            List<Object> list = new ArrayList<>();
-            for (Object object : filter.getDistribute()) {
-                list.add(object);
-            }
-            pageParams.getFilters().put("id_inid", new MultiValue(list, true));
-        }
-        pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
-        pageParams.getFilters().put("id_overdue", Constant.NO);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为卖家，收到的采购询价（已过期）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getEndInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看收到的客户询价单（已过期）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为供应商
-        pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-        SearchFilter filter = userService.distribute();
-        if (filter != null && filter.getDistribute() == null) {
-            return null;
-        }
-        if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-            List<Object> list = new ArrayList<>();
-            for (Object object : filter.getDistribute()) {
-                list.add(object);
-            }
-            pageParams.getFilters().put("id_inid", new MultiValue(list, true));
-        }
-        pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
-        pageParams.getFilters().put("id_overdue", Constant.YES);
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("id_invalid", Constant.NO);
-        pageParams.setNotEqualFilters(map);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为卖家，收到的采购询价（已报价）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     * @return
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getDoneInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看收到的客户询价单（已报价）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为供应商
-        pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-        SearchFilter filter = userService.distribute();
-        if (filter != null && filter.getDistribute() == null) {
-            return null;
-        }
-        if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-            List<Object> list = new ArrayList<>();
-            for (Object object : filter.getDistribute()) {
-                list.add(object);
-            }
-            pageParams.getFilters().put("id_inid", new MultiValue(list, true));
-        }
-        pageParams.getFilters().put("id_status", Status.REPLIED.value());
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("id_invalid", Constant.YES);
-        pageParams.setNotEqualFilters(map);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为卖家，收到的采购询价（已失效）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.INVALID, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getInvalidInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看收到的客户询价单（已失效）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为供应商
-        pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-        SearchFilter filter = userService.distribute();
-        if (filter != null && filter.getDistribute() == null) {
-            return null;
-        }
-        if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-            List<Object> list = new ArrayList<>();
-            list.addAll(filter.getDistribute());
-            pageParams.getFilters().put("id_inid", new MultiValue(list, true));
-        }
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, 1L));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为卖家，收到的采购询价（已采纳）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     * @return
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.AGREED, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getAgreedInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看收到的客户询价单（已采纳）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为供应商
-        pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-        SearchFilter filter = userService.distribute();
-        if (filter != null && filter.getDistribute() == null) {
-            return null;
-        }
-        if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-            List<Object> list = new ArrayList<>();
-            for (Object object : filter.getDistribute()) {
-                list.add(object);
-            }
-            pageParams.getFilters().put("id_inid", new MultiValue(list, true));
-        }
-        pageParams.getFilters().put("id_agreed", Constant.YES);
-        pageParams.getFilters().put("id_status", Status.REPLIED.value());
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("id_invalid", Constant.YES);
-        pageParams.setNotEqualFilters(map);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为卖家，收到的采购询价（未采纳）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     * @return
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.REFUSED, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getRefusedInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看收到的客户询价单（未采纳）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为供应商
-        pageParams.getFilters().put("id_venduu", SystemSession.getUser().getEnterprise().getUu());
-        SearchFilter filter = userService.distribute();
-        if (filter != null && filter.getDistribute() == null) {
-            return null;
-        }
-        if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-            List<Object> list = new ArrayList<>();
-            for (Object object : filter.getDistribute()) {
-                list.add(object);
-            }
-            pageParams.getFilters().put("id_inid", new MultiValue(list, true));
-        }
-        pageParams.getFilters().put("id_agreed", Constant.NO);
-        pageParams.getFilters().put("id_status", Status.REPLIED.value());
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
     /**
      * 作为卖家，根据询价单ID查找询价单(含明细)
      *
@@ -425,81 +152,9 @@ public class PubInquiryController {
      * @return
      */
     @RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
-    public PublicInquiryItem getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) throws Exception {
+    public PublicInquiryItemInfo getReceivedPurchaseOrderItemById(@PathVariable("id") Long id) throws Exception {
         logger.log("公共询价单", "查看详情", "查看[" + id + "]的详情");
         return pubInquiryService.findById(id);
     }
 
-    /**
-     * 作为卖家，查看同产品的报价历史
-     *
-     */
-    @RequestMapping(value = "/items/{itemId}/history", method = RequestMethod.GET)
-    public List<PublicInquiryItemInfo> getInquiryHistoryById(@PathVariable("itemId") Long itemId) throws Exception {
-        logger.log("公共询价单", "查看历史报价信息", "查看[" + itemId+ "]的历史报价");
-        return pubInquiryService.findHistoryByItemId(itemId);
-    }
-
-    /**
-     * 作为卖家，给公共询价单报价
-     *
-     * @param json 前台数据
-     * @param inquiryItemId 询价明细id
-     * @return
-     */
-    @RequestMapping(value = "/items/{inquiryItemId}/reply", method = RequestMethod.POST)
-    public ResponseEntity<String> replyInquiryItem(@RequestBody String json, @PathVariable("inquiryItemId") Long inquiryItemId, String token) {
-        PublicInquiryItem item = FlexJsonUtils.fromJson(json, PublicInquiryItem.class);
-        boolean flag = tokenService.enabled(token);
-        if (flag) {
-            item = pubInquiryService.reply(item);
-            tokenService.delete(token);
-            logger.log("公共询价单", "给单个客户公共询价明细填写价格并确认报价", item.replyDescription(), item.getInquiry().getCode(), inquiryItemId);
-        } else {
-            throw new IllegalOperatorException("页面信息已过期，请刷新重试");
-        }
-        return new ResponseEntity<String>(HttpStatus.OK);
-    }
-
-    /**
-     * 作为卖家，保存更新公共询价单
-     *
-     * @param json 前台数据
-     * @param inquiryItemId 询价明细id
-     * @return
-     */
-    @RequestMapping(value = "/items/{inquiryItemId}/save", method = RequestMethod.POST)
-    public ResponseEntity<String> saveInquiryItem(@RequestBody String json,
-                                                  @PathVariable("inquiryItemId") Long inquiryItemId, String token) {
-        PublicInquiryItem item = FlexJsonUtils.fromJson(json, PublicInquiryItem.class);
-        boolean flag = tokenService.enabled(token);
-        if (flag) {
-            item = pubInquiryService.save(item);
-            tokenService.delete(token);
-            logger.log("公共询价单", "给单个客户公共询价明细填写价格", item.replyDescription(), item.getInquiry().getCode(), inquiryItemId);
-        } else {
-            throw new IllegalOperatorException("页面信息已过期，请刷新重试");
-        }
-        return new ResponseEntity<String>(HttpStatus.OK);
-    }
-
-    /**
-     *  公共询价报价上传附件
-     *
-     * @param item 公共询价明细信息
-     * @param uploadItem 附件信息
-     * @param method 操作方法
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/addAttach", method = RequestMethod.POST)
-    public ModelMap addItemAttaches(String item, String method, FileUpload uploadItem) throws Exception {
-        PublicInquiryItem inquiryItem = FlexJsonUtils.fromJson(item, PublicInquiryItem.class);
-        if (method.equals("save")) {
-            logger.log("公共询价", "给单个客户公共询价明细填写价格，上传附件信息",  inquiryItem.replyDescription(), inquiryItem.getInquiry().getCode(), inquiryItem.getId());
-        } else if (method.equals("reply")) {
-            logger.log("公共询价", "给单个客户公共询价明细填写价格、上传附件信息并报价",  inquiryItem.replyDescription(), inquiryItem.getInquiry().getCode(), inquiryItem.getId());
-        }
-        return pubInquiryService.addAttaches(inquiryItem, method, uploadItem);
-    }
 }

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

@@ -1,24 +1,18 @@
 package com.uas.platform.b2b.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.OrderStatus;
 import com.uas.platform.b2b.model.PublicInquiryItemInfo;
 import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PubInquiryService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.temporary.model.InquiryDetailInfo;
 import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.model.Status;
 import com.uas.platform.core.web.bind.RequestState;
 import com.uas.search.b2b.model.SPage;
-import com.uas.search.b2b.model.Sort;
-import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -26,9 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * 公共询价（针对客户）
@@ -44,9 +35,6 @@ public class PubInquiryForPurcController {
     @Autowired
     private PubInquiryService pubInquiryService;
 
-    @Autowired
-    private SearchService searchService;
-
     /**
      * 作为买家，发出的公共询价（全部）不搜索
      *
@@ -159,171 +147,6 @@ public class PubInquiryForPurcController {
         return pubInquiryService.findByPageInfo(pageInfo, null, filter, OrderStatus.agreed.name());
     }
 
-
-    /**
-     * 作为买家，发出的公共询价（全部）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     * @return
-     */
-    @RequestMapping(value = "/info/search", method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getReceivedPurchaseInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看发出的已转报价的公共询价单列表（全部）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为客户
-        pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为买家，发出的公共询价（待报价）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     * @return
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getTodoInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看发出的已转报价的公共询价单（待报价）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为客户
-        pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
-        pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
-        pageParams.getFilters().put("id_overdue", Constant.NO);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为买家，发出的公共询价（已过期）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getEndInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看发出的已转报价的公共询价单（已过期）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为客户
-        pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
-        pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
-        pageParams.getFilters().put("id_overdue", Constant.YES);
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("id_invalid", Constant.NO);
-        pageParams.setNotEqualFilters(map);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为买家，发出的公共询价（已报价）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     * @return
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getDoneInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看发出的已转报价的公共询价单（已报价）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为客户
-        pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
-        pageParams.getFilters().put("id_status", Status.REPLIED.value());
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("id_invalid", Constant.YES);
-        pageParams.setNotEqualFilters(map);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为买家，发出的公共询价（已失效）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.INVALID, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getInvalidInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看发出的已转报价的公共询价单（已失效）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为客户
-        pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, 1L));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为买家，发出的公共询价（已采纳）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     * @return
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.AGREED, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getAgreedInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看发出的已转报价的公共询价单（已采纳）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为客户
-        pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
-        pageParams.getFilters().put("id_agreed", Constant.YES);
-        pageParams.getFilters().put("id_status", Status.REPLIED.value());
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("id_invalid", Constant.YES);
-        pageParams.setNotEqualFilters(map);
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
-    /**
-     * 作为买家，发出的公共询价（未采纳）- 搜索
-     *
-     * @param params 分页参数
-     * @param searchFilter 过滤条件
-     * @return
-     */
-    @RequestMapping(value = "/info/search", params = RequestState.REFUSED, method = RequestMethod.GET)
-    public SPage<PublicInquiryItemInfo> getRefusedInquiries(PageParams params, String searchFilter) {
-        logger.log("客户询价单", "搜索查看发出的已转报价的公共询价单（未采纳）");
-        JSONObject jsonObject = JSON.parseObject(searchFilter);
-        String keyword = jsonObject.getString("keyword");
-        com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-        // 当前登录企业作为客户
-        pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
-        pageParams.getFilters().put("id_agreed", Constant.NO);
-        pageParams.getFilters().put("id_status", Status.REPLIED.value());
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_id", false, Sort.Type.LONG, new Long(1)));
-        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-        return searchService.searchPublicInquiryItemInfoIds(keyword, pageParams);
-    }
-
     /**
      * 作为卖家，根据询价单ID查找询价单(含明细)
      *

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

@@ -116,7 +116,7 @@ public class PubInquiryListController {
      */
     @RequestMapping(value = "/turnToQuotation", method = RequestMethod.POST)
     private ModelMap turanToQuotation(String item, String method, FileUpload uploadItem) throws Exception {
-        PublicInquiryItem inquiryItem = JSON.parseObject(item, PublicInquiryItem.class);
+        PublicInquiryItemInfo inquiryItem = JSON.parseObject(item, PublicInquiryItemInfo.class);
         logger.log("公共询价", "将公共询价转成客户询价单", "关联id：" + inquiryItem.getId());
         return enquiryService.turnToQuotation(inquiryItem, method, uploadItem);
     }

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

@@ -211,7 +211,7 @@ public class PurcInquiryController {
 			// 当前登录企业作为供应商
 			pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 			List<Sort> sortList = new ArrayList<>();
-			sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+			sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 			pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 			return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 		}
@@ -247,7 +247,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
             pageParams.getFilters().put("id_overdue", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -281,7 +281,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -314,7 +314,7 @@ public class PurcInquiryController {
 			map.put("id_invalid", Constant.YES);
 			pageParams.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -352,7 +352,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_agreed", Constant.YES);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -390,7 +390,7 @@ public class PurcInquiryController {
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_agreed", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+            sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
         }
@@ -468,7 +468,7 @@ public class PurcInquiryController {
 		pageParams.getFilters().put("in_enterystatus", Status.ENABLED.value());
 		pageParams.getFilters().put("in_isopen", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("in_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("in_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		logger.log("采购询价", "查看询价", "查询公共询价信息，关键词： " + keyword);
 		return searchService.searchPurcInquiryCheckIds(keyword, pageParams);
@@ -493,7 +493,7 @@ public class PurcInquiryController {
 		map.put("id_inid", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		logger.log("采购询价", "查看询价", "查询公共询价信息，关键词： " + keyword);
 		return searchService.searchPurcInquiryItemCheckIds(keyword, pageParams);
@@ -510,18 +510,6 @@ public class PurcInquiryController {
 		return purcInquiryService.getInquiryDetail(id);
 	}
 
-	/**
-	 * 明细详情
-	 *
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/inquiryItem/{id}", method = RequestMethod.GET)
-	private ModelMap getInquiryItemDetail(@PathVariable Long id) {
-		logger.log("采购询价", "查看询价详情", "关联id：" + id);
-		return purcInquiryService.getInquiryItemDetail(id);
-	}
-
 	/**
 	 * 转成客户询价单（弃用）
 	 *

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

@@ -23,7 +23,6 @@ import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -77,7 +76,7 @@ public class PurcOrderChangeController {
             map.put("pu_status", Status.UNAUDIT.value());
             params.setNotEqualFilters(map);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("pu_id", false, Sort.Type.INT, new Long(1)));
             params.getFilters().put(SearchConstants.SORT_KEY, sortList);
             sPage = searchService.findEnableToChange(filter.getKeyword(), params);
         } else {
@@ -114,7 +113,7 @@ public class PurcOrderChangeController {
         if (!StringUtils.isEmpty(filter.getKeyword())) {
             pageParams.getFilters().put("pc_enuu", SystemSession.getUser().getEnterprise().getUu());
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("pc_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
         } else {
@@ -141,7 +140,7 @@ public class PurcOrderChangeController {
             pageParams.getFilters().put("pc_status", Status.NOT_REPLY.value());
             pageParams.getFilters().put("pc_unneedreply", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("pc_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
         } else {
@@ -170,7 +169,7 @@ public class PurcOrderChangeController {
             pageParams.getFilters().put("pc_status", Status.REPLIED.value());
             pageParams.getFilters().put("pc_unneedreply", Constant.NO);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("pc_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
         } else {
@@ -198,7 +197,7 @@ public class PurcOrderChangeController {
             pageParams.getFilters().put("pc_enuu", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("pc_unneedreply", Constant.YES);
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("pc_id", false, Sort.Type.LONG, new Long(1)));
+            sortList.add(new Sort("pc_id", false, Sort.Type.INT, new Long(1)));
             pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.searchPurchaseOrderChangeIds(filter.getKeyword(), pageParams);
         } else {

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

@@ -24,6 +24,12 @@ import org.springframework.web.servlet.ModelAndView;
 import java.io.IOException;
 import java.io.InputStream;
 
+/**
+ * 采购订单
+ * 
+ * @author hejq
+ * @date 2018-07-27 9:05
+ */
 @Controller
 @RequestMapping("/purchase")
 public class PurcOrderController {
@@ -174,11 +180,12 @@ public class PurcOrderController {
 		String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
 		InputStream is = null;
 		Workbook workbook = null;
+
 		try {
 			is = uploadItem.getFile().getInputStream();
-			if ("xls".equals(suffix)) {
+			if (JxlsExcelView.EXCEL_XLS.equals(suffix)) {
 				workbook = new HSSFWorkbook(is);
-			} else if ("xlsx".equals(suffix)) {
+			} else if (JxlsExcelView.EXCEL_XLSX.equals(suffix)) {
 				workbook = new XSSFWorkbook(is);
 			} else {
 				throw new IllegalOperatorException("文件格不正确，请上传.xls或.xlsx的文件");

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

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.FileUpload;
 import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.service.ProductService;
@@ -96,7 +97,7 @@ public class PurcProductController {
 		pageInfo.filter("isPurchase", Constant.YES);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getAllProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "全部物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出可买物料Excel列表");
@@ -118,7 +119,7 @@ public class PurcProductController {
 		pageInfo.filter("standard", Constant.YES);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				: getStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出可买物料Excel列表");
@@ -140,7 +141,7 @@ public class PurcProductController {
 		pageInfo.filter("standard", Constant.NO);
 		ModelAndView modelAndView = new ModelAndView();
 		PageParams params = new PageParams(pageInfo);
-		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? productService.findAllByPageInfo(pageInfo, keyword).getContent()
+		modelAndView.addObject("data", null == keyword || "".equals(keyword) ? ProductUtils.findByPageInfo(pageInfo, keyword).getContent()
 				:getNonStandardProductInfo(params, keyword).getContent());
 		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/baseInfo/baseInfo", "非标准物料资料表"));
 		logger.log("物料资料", "导出Excel列表", "导出可买物料Excel列表");
@@ -155,24 +156,18 @@ public class PurcProductController {
 	 */
 	@RequestMapping(value = "/edit/release/excel", method = RequestMethod.POST)
 	public ModelMap releaseByExcel(FileUpload uploadItem) throws IOException,IllegalOperatorException {
-		ModelMap map = new ModelMap();
 		String fileName = uploadItem.getFile().getOriginalFilename();
 		String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
-		InputStream is = null;
-		Workbook workbook = null;
-//		try {
-		is = uploadItem.getFile().getInputStream();
-		if ("xls".equals(suffix)) {
+		Workbook workbook;
+		InputStream is = uploadItem.getFile().getInputStream();
+		if (JxlsExcelView.EXCEL_XLS.equals(suffix)) {
 			workbook = new HSSFWorkbook(is);
-		} else if ("xlsx".equals(suffix)) {
+		} else if (JxlsExcelView.EXCEL_XLSX.equals(suffix)) {
 			workbook = new XSSFWorkbook(is);
 		} else {
 			throw new IllegalOperatorException("文件格不正确，请上传.xls或.xlsx的文件");
 		}
-		map = purcProductService.releaseByWorkbook(workbook);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
+		ModelMap map = purcProductService.releaseByWorkbook(workbook);
 		logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了物料，数量为" +  map.get("success"));
 		return map;
 	}
@@ -193,7 +188,7 @@ public class PurcProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -228,7 +223,7 @@ public class PurcProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -261,7 +256,7 @@ public class PurcProductController {
 		pageParams.setNotEqualFilters(map);
 
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
@@ -383,14 +378,4 @@ public class PurcProductController {
 		return map;
 	}
 
-	/**
-	 * 一键匹配物料信息
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/edit/matchbytype/{type}", method = RequestMethod.POST)
-	@ResponseBody
-	private ModelMap matchall(@PathVariable String type) throws Exception {
-		return productService.matchall(type);
-	}
 }

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

@@ -89,7 +89,7 @@ public class PurchaseARCheckController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("sac_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("sac_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleARCheckIds(keyword, pageParams);
 	}

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

@@ -217,7 +217,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
@@ -245,7 +245,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -274,7 +274,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -304,7 +304,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("st_ispublish", Constant.YES);
@@ -338,7 +338,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("st_ispublish", Constant.YES);
@@ -368,7 +368,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -393,7 +393,7 @@ public class PurchaseTenderController {
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
@@ -486,7 +486,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchPurcTenderIds(keyword, pageParams);
@@ -536,7 +536,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -568,7 +568,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -594,7 +594,7 @@ public class PurchaseTenderController {
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         // 当前登录企业作为客户
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = userService.distribute();

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

@@ -86,7 +86,7 @@ public class SaleAcceptController {
 			pageParams.getFilters().put("pa_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseAcceptIds(keyword, pageParams);
 	}

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

@@ -85,7 +85,7 @@ public class SaleApBillController {
 		}
 		// 排序条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pab_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pab_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		SPage<PurchaseApBill> apbills = searchService.searchPurchaseApBillIds(keyword, pageParams);
 		return apbills;

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

@@ -1,837 +0,0 @@
-package com.uas.platform.b2b.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.dao.CommonDao;
-import com.uas.platform.b2b.dao.PurchaseApBillOutDao;
-import com.uas.platform.b2b.dao.PurchaseApCheckItemInfoDao;
-import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.search.SearchService;
-import com.uas.platform.b2b.service.*;
-import com.uas.platform.b2b.support.JxlsExcelView;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.PageInfo;
-import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import com.uas.platform.core.web.bind.RequestState;
-import com.uas.search.b2b.model.MultiValue;
-import com.uas.search.b2b.model.SPage;
-import com.uas.search.b2b.model.Sort;
-import com.uas.search.b2b.model.Sort.Type;
-import com.uas.search.b2b.util.SearchConstants;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * 
- * 航天开票
- *
- */
-
-@SuppressWarnings("deprecation")
-@Controller
-@RequestMapping("/sale/apBillOut")
-public class SaleApBillOutController {
-
-	@Autowired
-	private ErpProdIODetailService erpProdIODetailService;
-
-	@Autowired
-	PurchaseApCheckService purchaseApCheckService;
-
-	@Autowired
-	private VendorService vendorService;
-
-	@Autowired
-	private UserService userService;
-
-	@Autowired
-	private SearchService searchService;
-
-	@Autowired
-	private  PurchaseApCheckItemInfoDao PurchaseApCheckItemInfoDao;
-
-	@Autowired
-	private PurchaseApBillOutService purchaseApBillOutService;
-
-	@Autowired
-	private CommonDao commonDao;
-
-    @Autowired
-    private PurchaseApBillOutDao purchaseApBillOutDao;
-
-	@Autowired
-	private SOAPConsoleService sOAPConsoleService;
-
-	@Autowired
-	private PiaoPlusService piaoPlusService;
-
-	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
-	/**
-	 * 打印对账单，增加打印次数
-	 * 
-	 * @param id
-	 * @return
-	 */
-	// 此方法只是更新了打印次数  目前处于弃用状态
-	@RequestMapping(value = "/printCount/{id}", method = RequestMethod.POST)
-	@ResponseBody
-	public ResponseEntity<String> printCount(@PathVariable("id") Long id) {
-		purchaseApCheckService.print(id);
-		logger.log("开票单", "打印开票单单据", id.toString());
-		return new ResponseEntity<String>(HttpStatus.OK);
-	}
-
-	/**
-	 * 得到所有的供应商信息便于筛选
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/getAllCustomers", method = RequestMethod.GET)
-	@ResponseBody
-	public Set<Object> getAllApChecksCustomers() {
-		Set<Object> set = new HashSet<>();
-		// 判断当前用户是否被客户分配
-		SearchFilter filter = userService.distribute();
-		// 不是管理员也没被分配客户是直接返回空
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		}
-		Set<Role> roles = SystemSession.getUser().getRoles();
-		boolean isSys = false;
-		for (Role role : roles) {
-			if (role.getIssys() == 1) {
-				isSys = true;
-			}
-		}
-		if (!SystemSession.getUser().isSys() && !isSys) { // 不是管理员，被分配客户时
-			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
-			if (!CollectionUtils.isEmpty(vendors)) {
-				for (Vendor v : vendors) {
-					if (v.getApcheck().equals(Constant.YES)) {// 只有开通了B2B对账的才筛选
-						set.add(v.getMyEnterprise().getEnName()); // 这里添加客户名称
-					}
-				}
-			} else {
-				return null;
-			}
-		} else {
-			List<Vendor> vendors = vendorService.findMyCustomers();
-			for (Vendor vendor : vendors) {
-				set.add(vendor.getMyEnterprise().getEnName());
-			}
-		}
-		return set;
-	}
-
-
-	@RequestMapping(value = "/getDoneByKeywords", method = RequestMethod.GET)
-	@ResponseBody
-	public Set<PurchaseApCheckItemInfo> getDoneApchecksByDate(Long fromDate, Long endDate, String keyword) {
-		List<Long> distributes = null;
-		// 判断当前用户是否被客户分配
-		if (!SystemSession.getUser().isSys()) {
-			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
-			distributes = new ArrayList<Long>();
-			if (!CollectionUtils.isEmpty(vendors)) {
-				for (Vendor v : vendors) {
-					distributes.add(v.getMyEnUU());
-				}
-			} else {
-				return null;
-			}
-		}
-		List<PurchaseApCheckItem> purchaseApCheckItems = purchaseApCheckService.findDoneApCheckItems(distributes, keyword, fromDate, endDate);  //erpProdIODetailService.findDoneXlsApChecks(distributes, keyword, fromDate, endDate);
-
-		Set<PurchaseApCheckItemInfo> apCheckItems = new HashSet<PurchaseApCheckItemInfo>();
-		for (PurchaseApCheckItem purchaseApCheckItem : purchaseApCheckItems ){
-			Long id = purchaseApCheckItem.getId();
-			PurchaseApCheckItemInfo item = PurchaseApCheckItemInfoDao.findOne(id);
-			apCheckItems.add(item);
-		}
-		return apCheckItems;
-	}
-
-	/**
-	 * 保存生成的开票单主记录
-	 */
-	@RequestMapping(value = "/save", method = RequestMethod.POST)
-	@ResponseBody
-	public ModelMap saveApBillOut(@RequestBody String json) {
-		ModelMap map = new ModelMap();
-		List<String> alters = new ArrayList<String>();
-		JSONObject jsonObject = JSON.parseObject(json);
-		//提取数据来源单据信息
-		String sourceInfos = jsonObject.getString("sourceInfos");
-		List<HashMap<String, Object>> sourceInfoList = FlexJsonUtils.fromJsonArray(sourceInfos, HashMap.class);
-		jsonObject.remove("sourceInfos");
-		json = jsonObject.toJSONString();
-		PurchaseApBillOut apBillOut = FlexJsonUtils.fromJson(json, PurchaseApBillOut.class);
-		if (apBillOut != null) {
-			for (PurchaseApBillOutItem item : apBillOut.getItems()) {
-				List<PurchaseApBillOutItem> items = purchaseApBillOutService
-						.findBySourceTableAndSourceId(item.getSourceTable(), item.getSourceId());
-				for (PurchaseApBillOutItem newitem : items) {
-					if (newitem.getApBillOut().getCheckStatus().equals("未开票")) {
-						alters.add(newitem.getApBillOut().getCode());
-					}
-				}
-			}
-			if (alters.size() > 0) {
-				map.put("alters", alters);
-				throw new IllegalOperatorException("开票单" + alters + "存在未开票的单据，请先进行开票！");
-			} else {
-				apBillOut = purchaseApBillOutService.save(apBillOut,sourceInfoList);
-
-				logger.log("开票单", "多个单据生成同一张开票单", apBillOut.getRemark(), null, apBillOut.getId());
-				map.put("id", apBillOut.getId());
-				return map;
-			}
-		} else {
-			throw new IllegalOperatorException("保存失败！");
-		}
-	}
-
-	/**
-	 * 获得开票单，对应id
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public PurchaseApBillOut getCreatedPurchaseApBillOutById(@PathVariable("id") Long id) {
-		logger.log("开票单", "查看单个开票单", null, null, id);
-		return purchaseApBillOutService.findById(id);
-	}
-
-	/**
-	 * 作为卖家，获取全部开票单（全部）
-	 * 
-	 * @param params
-	 * @param searchFilter
-	 * @return
-	 */
-	@RequestMapping(method = RequestMethod.GET)
-	@ResponseBody
-	public SPage<PurchaseApBillOut> getAllApBillOuts(PageParams params, String searchFilter) {
-		logger.log("开票单", "获取全部开票单据");
-		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-		String keyword = jsonObject.getString("keyword");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-		// 当前登录企业作为买家
-		pageParams.getFilters().put("pabo_enuu", SystemSession.getUser().getEnterprise().getUu());
-		// TODO 其他过滤条件
-		SearchFilter filter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		}
-		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-			List<Object> list = new ArrayList<>();
-			for (Object object : filter.getDistribute()) {
-				list.add(object);
-			}
-			pageParams.getFilters().put("pabo_custuu", new MultiValue(list, true));
-		}
-		// 排序条件
-		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
-		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
-	}
-
-	/**
-	 * 作为卖家，获取开票单（未开票）
-	 */
-	@RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
-	@ResponseBody
-	public SPage<PurchaseApBillOut> getTodoApBillOuts(PageParams params, String searchFilter) {
-		logger.log("开票单", "获取未开票的开票单据");
-		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-		String keyword = jsonObject.getString("keyword");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-		// 当前登录企业作为买家
-		pageParams.getFilters().put("pabo_enuu", SystemSession.getUser().getEnterprise().getUu());
-		// TODO 其他过滤条件
-		SearchFilter filter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		}
-		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-			List<Object> list = new ArrayList<>();
-			for (Object object : filter.getDistribute()) {
-				list.add(object);
-			}
-			pageParams.getFilters().put("pabo_custuu", new MultiValue(list, true));
-		}
-		pageParams.getFilters().put("pabo_checkstatus", "未开票");
-		// 排序条件
-		List<Sort> sortList = new ArrayList<>();
-		// 如果日期为空，设置的默认时间2000/1/1 1:1:1
-		sortList.add(new Sort("pabo_recorddate", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
-		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
-	}
-
-	/**
-	 * 作为卖家，获取开票单（已开票）
-	 */
-	@RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
-	@ResponseBody
-	public SPage<PurchaseApBillOut> getDoneApBillOuts(PageParams params, String searchFilter) {
-		logger.log("开票单", "获取已开票的开票单据");
-		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-		String keyword = jsonObject.getString("keyword");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-		// 当前登录企业作为买家
-		pageParams.getFilters().put("pabo_enuu", SystemSession.getUser().getEnterprise().getUu());
-		// TODO 其他过滤条件
-		SearchFilter filter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		}
-		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-			List<Object> list = new ArrayList<>();
-			for (Object object : filter.getDistribute()) {
-				list.add(object);
-			}
-			pageParams.getFilters().put("pabo_custuu", new MultiValue(list, true));
-		}
-		pageParams.getFilters().put("pabo_checkstatus", "已开票");
-		// 排序条件
-		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
-		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
-	}
-
-	/**
-	 * 作为卖家，获取开票单（已作废）
-	 */
-	@RequestMapping(params = RequestState.END, method = RequestMethod.GET)
-	@ResponseBody
-	public SPage<PurchaseApBillOut> getEndApBillOuts(PageParams params, String searchFilter) {
-		logger.log("开票单", "获取已作废开票单据");
-		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
-		String keyword = jsonObject.getString("keyword");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
-		// 当前登录企业作为买家
-		pageParams.getFilters().put("pabo_enuu", SystemSession.getUser().getEnterprise().getUu());
-		// TODO 其他过滤条件
-		SearchFilter filter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		}
-		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-			List<Object> list = new ArrayList<>();
-			for (Object object : filter.getDistribute()) {
-				list.add(object);
-			}
-			pageParams.getFilters().put("pabo_custuu", new MultiValue(list, true));
-		}
-		List<Object> list = new ArrayList<>();
-		//list.add("不同意");
-		list.add("已作废");
-		pageParams.getFilters().put("pabo_checkstatus", new MultiValue(list, true));
-		// 排序条件
-		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pabo_id", false, Type.LONG, new Long(1)));
-		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		return searchService.searchPurchaseApBillOutIds(keyword, pageParams);
-	}
-
-	/**
-	 * 导出 - 全部
-	 * 
-	 * @param searchFilter
-	 * @return
-	 */
-	@RequestMapping(value = "/allxls", method = RequestMethod.GET)
-	public ModelAndView exportApBillOut(String searchFilter) {
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-		pageInfo.sorting("recordDate", Direction.DESC);
-		pageInfo.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("state", "全部");
-		modelAndView.addObject("data",
-				purchaseApBillOutService.findAllByPageInfo(pageInfo, filter.getKeyword(), filter).getContent());
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApBillOut", "开票单列表_全部"));
-		logger.log("开票单", "导出Excel列表", "导出全部Excel列表");
-		return modelAndView;
-	}
-
-	/**
-	 * 导出 - 已开票
-	 * 
-	 * @param searchFilter
-	 * @return
-	 */
-	@RequestMapping(value = "/allxls", params = RequestState.DONE, method = RequestMethod.GET)
-	public ModelAndView exportApBillOutDone(String searchFilter) {
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-		pageInfo.sorting("recordDate", Direction.DESC);
-		pageInfo.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("state", "已开票");
-		modelAndView.addObject("data",
-				purchaseApBillOutService.findDoneByPageInfo(pageInfo, filter.getKeyword(), filter).getContent());
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApBillOut", "开票单列表_已开票"));
-		logger.log("开票单", "导出Excel列表", "导出已开票Excel列表");
-		return modelAndView;
-	}
-
-	/**
-	 * 导出 - 未开票
-	 * 
-	 * @param searchFilter
-	 * @return
-	 */
-	@RequestMapping(value = "/allxls", params = RequestState.TODO, method = RequestMethod.GET)
-	public ModelAndView exportApBillOutTodo(String searchFilter) {
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-		pageInfo.sorting("recordDate", Direction.DESC);
-		pageInfo.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("state", "未开票");
-		modelAndView.addObject("data",
-				purchaseApBillOutService.findTodoByPageInfo(pageInfo, filter.getKeyword(), filter).getContent());
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApBillOut", "开票单列表_未开票"));
-		logger.log("开票单", "导出Excel列表", "导出未开票Excel列表");
-		return modelAndView;
-	}
-
-	/**
-	 * 导出 - 已作废
-	 * 
-	 * @param searchFilter
-	 * @return
-	 */
-	@RequestMapping(value = "/allxls", params = RequestState.END, method = RequestMethod.GET)
-	public ModelAndView exportApBillOutEnd(String searchFilter) {
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
-		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
-		pageInfo.sorting("recordDate", Direction.DESC);
-		pageInfo.filter("enUu", SystemSession.getUser().getEnterprise().getUu());
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-		ModelAndView modelAndView = new ModelAndView();
-		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("state", "已作废");
-		modelAndView.addObject("data",
-				purchaseApBillOutService.findEndByPageInfo(pageInfo, filter.getKeyword(), filter).getContent());
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApBillOut", "开票单列表_已作废"));
-		logger.log("开票单", "导出Excel列表", "导出已作废Excel列表");
-		return modelAndView;
-	}
-
-	/**
-	 * 全部导出
-	 * 
-	 * @param keyword
-	 * @param fromDate
-	 * @param endDate
-	 * @return
-	 */
-	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView export(String keyword, Long fromDate, Long endDate) {
-		List<Long> distributes = null;
-		// 判断当前用户是否被客户分配
-		if (!SystemSession.getUser().isSys()) {
-			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
-			distributes = new ArrayList<Long>();
-			if (!CollectionUtils.isEmpty(vendors)) {
-				for (Vendor v : vendors) {
-					distributes.add(v.getMyEnUU());
-				}
-			} else {
-				return null;
-			}
-		}
-		ModelAndView modelAndView = new ModelAndView();
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
-		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("data", erpProdIODetailService.findXlsApChecks(distributes, keyword, fromDate, endDate));
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/faApCheck", "客户应收对账单"));
-		logger.log("客户应收对账单", "导出Excel列表", "导出全部Excel列表");
-		return modelAndView;
-	}
-
-    @RequestMapping(value = "/doExcel", method = RequestMethod.GET)
-    @ResponseBody
-	public void doTaxCodeExcel() {
-		Workbook workbook = null;
-		InputStream is = null;
-		try {
-			is = new FileInputStream("C:\\Users\\黄诚天\\Desktop\\税收分类编码.xlsx");
-			workbook = new XSSFWorkbook(is);
-		} catch (java.io.IOException e) {
-			e.printStackTrace();
-		}
-
-		Sheet sheet = workbook.getSheetAt(0);
-		int rowNum = sheet.getLastRowNum();
-		Row headerRow = sheet.getRow(0);
-        DecimalFormat df = new DecimalFormat("#.##");
-		if (headerRow != null) {
-			for (int r = 1; r <= rowNum; r++) {
-				Row row = sheet.getRow(r);
-				if (row != null && row.getCell(0) != null && row.getCell(0).getCellType() != Cell.CELL_TYPE_BLANK) {
-					String a = "",b,c,d,e,f,g,h = "";
-
-					if (row.getCell(0) != null) {
-						row.getCell(0).setCellType(Cell.CELL_TYPE_STRING);
-						a = row.getCell(0).getStringCellValue().trim();
-
-                        a = df.format(Double.parseDouble(a));
-					}
-
-					if (row.getCell(1) != null) {
-						row.getCell(1).setCellType(Cell.CELL_TYPE_STRING);
-						b = row.getCell(1).getStringCellValue().trim();
-					} else {
-						b = "";
-					}
-
-					if (row.getCell(2) != null) {
-						row.getCell(2).setCellType(Cell.CELL_TYPE_STRING);
-						c = row.getCell(2).getStringCellValue().trim();
-					} else {
-						c = "";
-					}
-
-					if (row.getCell(3) != null) {
-						row.getCell(3).setCellType(Cell.CELL_TYPE_STRING);
-						d = row.getCell(3).getStringCellValue().trim();
-					} else {
-						d = "";
-					}
-
-					if (row.getCell(4) != null) {
-						row.getCell(4).setCellType(Cell.CELL_TYPE_STRING);
-						e = row.getCell(4).getStringCellValue().trim();
-					} else {
-						e = "";
-					}
-
-					if (row.getCell(5) != null) {
-						row.getCell(5).setCellType(Cell.CELL_TYPE_STRING);
-						f = row.getCell(5).getStringCellValue().trim();
-					} else {
-						f = "";
-					}
-
-					if (row.getCell(6) != null) {
-						row.getCell(6).setCellType(Cell.CELL_TYPE_STRING);
-						g = row.getCell(6).getStringCellValue().trim();
-					} else {
-						g = "";
-					}
-
-					if (row.getCell(7) != null) {
-						row.getCell(7).setCellType(Cell.CELL_TYPE_STRING);
-						h = row.getCell(7).getStringCellValue().trim();
-
-						h = df.format(Double.parseDouble(a));
-					}
-
-					//purchaseApBillOutDao.saveData(a,b,c,d,e,f,g,h);
-
-				}
-			}
-		}
-
-	}
-
-	/**
-	 * 删除未开票单
-	 * @param id
-	 */
-	@RequestMapping(value = "/deleteApBillOut/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public void deleteApBillOut(@PathVariable("id") Long id){
-		purchaseApBillOutService.deleteApBillOut(id);
-		logger.log("开票单", "删除开票单", null, null, id);
-	}
-
-	/**
-	 * 开具发票
-	 * @return
-	 */
-	@RequestMapping(value = "/invoiceIssued/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap invoiceIssued(@PathVariable("id") Long id) {
-		ModelMap map = new ModelMap();
-		map = purchaseApBillOutService.doBillOut(id);
-		if (map.get("dbError") != null) {
-			logger.log("开票单", "开具发票", (String)map.get("dbError"), null, id);
-		}
-		return map;
-	}
-
-	/**
-	 * 启动开票服务
-	 * @return
-	 */
-	@RequestMapping(value = "/startBillOut", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap startBillOut() {
-		ModelMap map = new ModelMap();
-		map = sOAPConsoleService.startBillOut();
-		return map;
-	}
-
-	/**
-	 * 关闭开票服务
-	 * @return
-	 */
-	@RequestMapping(value = "/closeBillOut", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap closeBillOut() {
-		ModelMap map = new ModelMap();
-		map = sOAPConsoleService.closeBillOut();
-		return map;
-	}
-
-	/**
-	 * 获取每种发票的库存信息
-	 * @return
-	 */
-	@RequestMapping(value = "/getRepertoryMessage", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap getRepertoryMessage() {
-		ModelMap map = new ModelMap();
-		map = sOAPConsoleService.getRepertoryMessage();
-		return map;
-	}
-
-	/**
-	 * 发票打印
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/invoicePrint/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap invoicePrint(@PathVariable("id") Long id){
-		ModelMap map = new ModelMap();
-		PurchaseApBillOut apBillOut = purchaseApBillOutService.findById(id);
-		if (apBillOut == null) {
-			map.put("error", "不存在此开票单");
-			return map;
-		}
-		map = sOAPConsoleService.invoicePrint(apBillOut, 0);
-		return map;
-	}
-
-
-	/**
-	 * 清单打印
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/listPrint/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap listPrint(@PathVariable("id") Long id){
-		ModelMap map = new ModelMap();
-		PurchaseApBillOut apBillOut = purchaseApBillOutService.findById(id);
-		if (apBillOut == null) {
-			map.put("error", "不存在此开票单");
-			return map;
-		}
-		map = sOAPConsoleService.listPrint(apBillOut);
-		return map;
-	}
-
-	/**
-	 * 发票作废
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/InvoiceCancel/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap InvoiceCancel(@PathVariable("id") Long id){
-		ModelMap map = new ModelMap();
-		PurchaseApBillOut apBillOut = purchaseApBillOutService.findById(id);
-		if (apBillOut == null) {
-			map.put("error", "不存在此开票单");
-			return map;
-		}
-		map = purchaseApBillOutService.invoiceCancel(apBillOut);//sOAPConsoleService.InvoiceCancel(apBillOut);
-		if (map.get("dbError") != null) {
-			logger.log("开票单", "开具发票", (String)map.get("dbError"), null, id);
-			map.remove("dbError");
-			map.put("error","开票失败,系统错误，请联系管理员");
-		}
-		return map;
-	}
-
-	/**
-	 * 查询发票信息
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/queryInvoiceMessage/{id}/{qdbz}/{dybz}", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap queryInvoiceMessage(@PathVariable("id") Long id,
-										@PathVariable("qdbz") Integer qdbz,
-										@PathVariable("dybz") Integer dybz){
-		ModelMap map = new ModelMap();
-		PurchaseApBillOut apBillOut = purchaseApBillOutService.findById(id);
-		if (apBillOut == null) {
-			map.put("error", "不存在此开票单");
-			return map;
-		}
-		map = sOAPConsoleService.queryInvoiceMessage(apBillOut,qdbz,dybz);
-		return map;
-	}
-
-	/**
-	 * 查询库存信息
-	 * @return
-	 */
-	@RequestMapping(value = "/queryRepertyMessage", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap queryRepertyMessage() {
-		ModelMap map = new ModelMap();
-		map = sOAPConsoleService.queryRepertyMessage();
-		return map;
-	}
-
-	/**
-	 * 查询下一发票机库存信息
-	 * @return
-	 */
-	@RequestMapping(value = "/queryNextRepertyMessage", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap queryNextRepertyMessage() {
-		ModelMap map = new ModelMap();
-		map = sOAPConsoleService.queryNextRepertyMessage();
-		return map;
-	}
-
-	/**
-	 * 发票上传
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/invoiceUpload/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap invoiceUpload(@PathVariable("id") Long id){
-		ModelMap map = new ModelMap();
-		PurchaseApBillOut apBillOut = purchaseApBillOutService.findById(id);
-		if (apBillOut == null) {
-			map.put("error", "不存在此开票单");
-			return map;
-		}
-		map = sOAPConsoleService.invoiceUpload(apBillOut);
-		return map;
-	}
-
-	/**
-	 * 发票状态更新
-	 * @return
-	 */
-	@RequestMapping(value = "/invoiceStatusUpdate", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap invoiceStatusUpdate() {
-		ModelMap map = new ModelMap();
-		map = sOAPConsoleService.invoiceStatusUpdate();
-		return map;
-	}
-
-	/**
-	 * 单张发票查询
-	 * @param id
-	 * @return
-	 */
-	@RequestMapping(value = "/singleInvoiceQuery/{id}", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap singleInvoiceQuery(@PathVariable("id") Long id){
-		ModelMap map = new ModelMap();
-		PurchaseApBillOut apBillOut = purchaseApBillOutService.findById(id);
-		if (apBillOut == null) {
-			map.put("error", "不存在此开票单");
-			return map;
-		}
-		map = sOAPConsoleService.singleInvoiceQuery(apBillOut);
-		return map;
-	}
-
-	/**
-	 * 金税设备查询
-	 * @return
-	 */
-	@RequestMapping(value = "/taxEquipmentQuery", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap taxEquipmentQuery(){
-		ModelMap map = new ModelMap();
-		map = sOAPConsoleService.taxEquipmentQuery();
-		return map;
-	}
-
-	/**
-	 * 获取分类编码信息
-	 * @param spbm
-	 * @param version
-	 * @return
-	 */
-	@RequestMapping(value = "/taxCode/{spbm}/{version}", method = RequestMethod.GET)
-	@ResponseBody
-	public ModelMap taxCode(@PathVariable("spbm") String spbm,
-										@PathVariable("version") String version){
-		ModelMap map = new ModelMap();
-		PurchaseApBillOutTaxCode taxCode = purchaseApBillOutService.getTaxCode(spbm, version);
-		if (taxCode == null) {
-			map.put("error", "不存在此分类信息，请尽快联系管理员");
-			return map;
-		}
-
-		//科学计数转数字
-		String spbmStr = taxCode.getSpbm();
-		BigDecimal db = new BigDecimal(spbmStr);
-		String ii = db.toPlainString();
-		Long spbmLong = Long.parseLong(ii);
-
-		//数字转科学计数
-		String spbmBackStr = new BigDecimal(spbmLong).stripTrailingZeros().toString();
-
-		map.put("taxCode", taxCode);
-		map.put("spbmstr", spbmStr);
-		map.put("spbmLong", spbmLong);
-		map.put("spbmBackStr", spbmBackStr);
-
-		return map;
-	}
-}

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

@@ -29,7 +29,6 @@ import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -40,13 +39,14 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
- * 
  * 应收对账单
  *
+ * @author hejq
+ * @date 2018-07-26 10:48
  */
 
 @SuppressWarnings("deprecation")
-@Controller
+@RestController
 @RequestMapping("/sale/apCheck")
 public class SaleApCheckController {
 
@@ -73,7 +73,6 @@ public class SaleApCheckController {
 	 * @return
 	 */
 	@RequestMapping(value = "/printCount/permission", method = RequestMethod.POST)
-	@ResponseBody
 	public ModelMap printPermission() {
 		return new ModelMap("success", true);
 	}
@@ -85,7 +84,6 @@ public class SaleApCheckController {
 	 * @return
 	 */
 	@RequestMapping(value = "/printCount/{id}", method = RequestMethod.POST)
-	@ResponseBody
 	public ResponseEntity<String> printCount(@PathVariable("id") Long id) {
 		purchaseApCheckService.print(id);
 		logger.log("应付对账单", "打印应付对账单", id.toString());
@@ -97,7 +95,6 @@ public class SaleApCheckController {
 	 * 
 	 */
 	@RequestMapping("/operation/cancel")
-	@ResponseBody
 	public ModelMap cancelApcheck(Long id) {
 		boolean result = purchaseApCheckService.cancelApcheck(id);
 		ModelMap map = new ModelMap();
@@ -105,37 +102,12 @@ public class SaleApCheckController {
 		return map;
 	}
 
-	/**
-	 * 作为卖家，获取应收对账单（全部）
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/getAll", method = RequestMethod.GET)
-	@ResponseBody
-	public List<ErpProdIODetail> getAllApChecks() {
-		List<Long> distributes = null;
-		// 判断当前用户是否被客户分配
-		if (!SystemSession.getUser().isSys()) {
-			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
-			distributes = new ArrayList<Long>();
-			if (!CollectionUtils.isEmpty(vendors)) {
-				for (Vendor v : vendors) {
-					distributes.add(v.getMyEnUU());
-				}
-			} else {
-				return null;
-			}
-		}
-		return erpProdIODetailService.findAllApChecks(distributes);
-	}
-
 	/**
 	 * 得到所有的供应商信息便于筛选
 	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/getAllCustomers", method = RequestMethod.GET)
-	@ResponseBody
 	public Set<Object> getAllApChecksCustomers() {
 		Set<Object> set = new HashSet<>();
 		// 判断当前用户是否被客户分配
@@ -151,13 +123,16 @@ public class SaleApCheckController {
 				isSys = true;
 			}
 		}
-		if (!SystemSession.getUser().isSys() && !isSys) { // 不是管理员，被分配客户时
+		// 不是管理员，被分配客户时
+		if (!SystemSession.getUser().isSys() && !isSys) {
 			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
 			if (!CollectionUtils.isEmpty(vendors)) {
 				for (Vendor v : vendors) {
 					if (v.getApcheck() != null) {
-						if (v.getApcheck().equals(Constant.YES)) {// 只有开通了B2B对账的才筛选
-							set.add(v.getMyEnterprise().getEnName()); // 这里添加客户名称
+						// 只有开通了B2B对账的才筛选
+						if (v.getApcheck().equals(Constant.YES)) {
+							// 这里添加客户名称
+							set.add(v.getMyEnterprise().getEnName());
 						}
 					}
 				}
@@ -168,7 +143,8 @@ public class SaleApCheckController {
 			List<Vendor> vendors = vendorService.findMyCustomers();
 			for (Vendor vendor : vendors) {
 				if (vendor.getApcheck() != null) {
-					if (vendor.getApcheck().equals(Constant.YES)) {// 只有开通了B2B对账的才筛选
+					// 只有开通了B2B对账的才筛选
+					if (vendor.getApcheck().equals(Constant.YES)) {
 						set.add(vendor.getMyEnterprise().getEnName());
 					}
 				}
@@ -180,18 +156,17 @@ public class SaleApCheckController {
 	/**
 	 * 通过日期筛选，筛选出超出默认日期的单据
 	 * 
-	 * @param fromDate
-	 * @param endDate
+	 * @param fromDate 开始时间
+	 * @param endDate 截止时间
 	 * @return
 	 */
 	@RequestMapping(value = "/getAllByKeywords", method = RequestMethod.GET)
-	@ResponseBody
-	public List<ErpProdIODetail> getAllApchecksByDate(Long fromDate, Long endDate, String keyword) {
+	public List<ErpProdIODetail> getAllApchecksByDate(Long fromDate, Long endDate, ApcheckKeyWord searchKeyWord) {
 		List<Long> distributes = null;
 		// 判断当前用户是否被客户分配
 		if (!SystemSession.getUser().isSys()) {
 			List<Vendor> vendors = userService.findChooseVendor(SystemSession.getUser().getUserUU());
-			distributes = new ArrayList<Long>();
+			distributes = new ArrayList<>();
 			if (!CollectionUtils.isEmpty(vendors)) {
 				for (Vendor v : vendors) {
 					distributes.add(v.getMyEnUU());
@@ -200,13 +175,12 @@ public class SaleApCheckController {
 				return null;
 			}
 		}
-		return erpProdIODetailService.findXlsApChecks(distributes, keyword, fromDate, endDate);
+		return erpProdIODetailService.findXlsApChecks(distributes, searchKeyWord, fromDate, endDate);
 	}
 	/**
 	 * 保存生成的应收对账单主记录
 	 */
 	@RequestMapping(value = "/operation/save", method = RequestMethod.POST)
-	@ResponseBody
 	public ModelMap saveApCheck(@RequestBody String json) {
 		ModelMap map = new ModelMap();
 		List<String> alters = new ArrayList<String>();
@@ -240,7 +214,6 @@ public class SaleApCheckController {
 	 * 
 	 */
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
-	@ResponseBody
 	public void updateYCheckQty(@RequestBody String json) {
 		List<HashMap<String, Object>> list = FlexJsonUtils.fromJsonArray(json, HashMap.class);
 		purchaseApCheckService.updateYCheckQty(list);
@@ -253,7 +226,6 @@ public class SaleApCheckController {
 	 * @return
 	 */
 	@RequestMapping(value = "/{id}/info", method = RequestMethod.GET)
-	@ResponseBody
 	public PurchaseApCheck getCreatedPurchaseApCheckById(@PathVariable("id") Long id) {
 		logger.log("应收对账单", "查看单个应收对账单", null, null, id);
 		return purchaseApCheckService.findById(id);
@@ -263,7 +235,6 @@ public class SaleApCheckController {
 	 * 删除最新生成未提交的应收对账单
 	 */
 	@RequestMapping(value = "/operation/deleteApCheck", method = RequestMethod.POST)
-	@ResponseBody
 	public void deleteApCheck(Long id) {
 		purchaseApCheckService.deleteApCheck(id);
 	}
@@ -272,7 +243,6 @@ public class SaleApCheckController {
 	 * 提交生成的应收对账单
 	 */
 	@RequestMapping(value = "/operation/updateStatus", method = RequestMethod.POST)
-	@ResponseBody
 	public ModelMap updateApCheckStatus(Long id) {
 		ModelMap map = new ModelMap();
 		map.put("result", purchaseApCheckService.updateApCheckStatus(id));
@@ -287,7 +257,6 @@ public class SaleApCheckController {
 	 * @return
 	 */
 	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<PurchaseApCheck> getPurchaseApChecks(PageParams params, String searchFilter) {
 		logger.log("应收对账单", "作为买家，获取全部应收对账单");
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -311,7 +280,6 @@ public class SaleApCheckController {
 	 * 作为卖家，获取应收对账单（未对账）
 	 */
 	@RequestMapping(value = "/info/search", params = RequestState.TODO, method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<PurchaseApCheck> getTodoApChecks(PageParams params, String searchFilter) {
 		logger.log("应收对账单", "获取未对账应收对账单");
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -337,7 +305,6 @@ public class SaleApCheckController {
 	 * 作为卖家，获取应收对账单（已确认）
 	 */
 	@RequestMapping(value = "/info/search", params = RequestState.DONE, method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<PurchaseApCheck> getDoneApChecks(PageParams params, String searchFilter) {
 		logger.log("应收对账单", "获取已确认应收对账单");
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -363,7 +330,6 @@ public class SaleApCheckController {
 	 * 作为卖家，获取应收对账单（不同意）
 	 */
 	@RequestMapping(value = "/info/search", params = RequestState.END, method = RequestMethod.GET)
-	@ResponseBody
 	public SPage<PurchaseApCheck> getEndApChecks(PageParams params, String searchFilter) {
 		logger.log("应收对账单", "获取不同意，已作废应收对账单");
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -417,8 +383,8 @@ public class SaleApCheckController {
         // 排序条件
         List<Sort> sortList = new ArrayList<>();
         // 如果日期为空，设置的默认时间2000/1/1 1:1:1
-        sortList.add(new Sort("pa_recorddate", false, Type.LONG, new Long(946659661)));
-        sortList.add(new Sort("pa_id", false, Type.LONG, new Long(1)));
+        sortList.add(new Sort("pa_recorddate", false, Type.INT, new Long(946659661)));
+        sortList.add(new Sort("pa_id", false, Type.INT, new Long(1)));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return pageParams;
     }
@@ -431,7 +397,6 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(value = "/xls/list", method = RequestMethod.GET)
 	public ModelAndView exportApCheck(String searchFilter) {
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
 		PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
@@ -473,7 +438,6 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(value = "/xls/list", params = RequestState.TODO, method = RequestMethod.GET)
 	public ModelAndView exportApCheckTodo(String searchFilter) {
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
         PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
@@ -494,7 +458,6 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(value = "/xls/list", params = RequestState.END, method = RequestMethod.GET)
 	public ModelAndView exportApChecks(String searchFilter) {
-		SearchFilter filter = FlexJsonUtils.fromJson(searchFilter, SearchFilter.class);
 		PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
         PageParams params = new PageParams(pageInfo);
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
@@ -513,7 +476,6 @@ public class SaleApCheckController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
-	@ResponseBody
 	public ModelMap exportPermission() {
 		return new ModelMap("success", true);
 	}
@@ -527,7 +489,7 @@ public class SaleApCheckController {
 	 * @return
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
-	public ModelAndView export(String keyword, Long fromDate, Long endDate) {
+	public ModelAndView export(ApcheckKeyWord keyword, Long fromDate, Long endDate) {
 		List<Long> distributes = null;
 		// 判断当前用户是否被客户分配
 		if (!SystemSession.getUser().isSys()) {
@@ -555,7 +517,6 @@ public class SaleApCheckController {
 	 * @author wangmh
 	 */
 	@RequestMapping(value = "/setRead", method = RequestMethod.POST)
-	@ResponseBody
 	public void setReadByOrder(@RequestBody Long... sourceId) {
 		purchaseApCheckService.setReadByOrder("purc", sourceId);
 	}
@@ -565,7 +526,6 @@ public class SaleApCheckController {
 	 * @author wangmh
 	 */
 	@RequestMapping(value = "/getUnreadIds", method = RequestMethod.GET)
-	@ResponseBody
 	public ModelMap getUnreadIds() {
 		List<Long> list = purchaseApCheckService.getUnreadIds("purc");
 		return new ModelMap("content", list);
@@ -578,7 +538,6 @@ public class SaleApCheckController {
 	 * @author wangmh
 	 */
 	@RequestMapping(value = "/unread", method = RequestMethod.GET, headers = "Accept=application/json")
-	@ResponseBody
 	@ResponseStatus(value = HttpStatus.OK)
 	public ModelMap getOrderUnreadCount() {
 		final ModelMap modelMap = new ModelMap();
@@ -605,7 +564,6 @@ public class SaleApCheckController {
 	}
 
 	@RequestMapping(value = "/getBilled", method = RequestMethod.GET)
-	@ResponseBody
 	public Double getBilled(Long id) {
 		return purchaseApCheckService.getBilledByItemId(id);
 	}

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

@@ -84,7 +84,7 @@ public class SaleBadInController {
 			pageParams.getFilters().put("pb_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pb_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pb_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseBadInIds(keyword, pageParams);
 	}

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

@@ -84,7 +84,7 @@ public class SaleBadOutController {
 			pageParams.getFilters().put("po_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("po_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("po_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseBadOutIds(keyword, pageParams);
 	}

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

@@ -78,7 +78,7 @@ public class SaleCustomerForecastController {
 			pageParams.getFilters().put("pfd_venduu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pfd_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pfd_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseForecastAllIds(keyword, pageParams);
 	}

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

@@ -103,7 +103,7 @@ public class SaleInquiryController {
 			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -137,7 +137,7 @@ public class SaleInquiryController {
 		pageParams.getFilters().put("id_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("id_overdue", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -173,7 +173,7 @@ public class SaleInquiryController {
 		map.put("id_invalid", Constant.NO);
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -208,7 +208,7 @@ public class SaleInquiryController {
 		map.put("id_invalid", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -237,7 +237,7 @@ public class SaleInquiryController {
 			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, 1L));
+		sortList.add(new Sort("id_id", false, Type.INT, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("id_overdue", Constant.YES); // 已失效
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
@@ -275,7 +275,7 @@ public class SaleInquiryController {
 		map.put("id_invalid", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -309,7 +309,7 @@ public class SaleInquiryController {
 		pageParams.getFilters().put("id_agreed", Constant.NO);
 		pageParams.getFilters().put("id_status", Status.REPLIED.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}
@@ -342,7 +342,7 @@ public class SaleInquiryController {
 			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("id_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseInquiryDetailIds(keyword, pageParams);
 	}

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

@@ -88,7 +88,7 @@ public class SaleInquiryMouldController {
 			pageParams.getFilters().put("im_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("im_id", false, Type.LONG, 1L));
+		sortList.add(new Sort("im_id", false, Type.INT, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}
@@ -123,7 +123,7 @@ public class SaleInquiryMouldController {
 		pageParams.getFilters().put("im_overdue", Constant.NO);
 		pageParams.getFilters().put("im_valid", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("im_id", false, Type.LONG, 1L));
+		sortList.add(new Sort("im_id", false, Type.INT, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}
@@ -157,7 +157,7 @@ public class SaleInquiryMouldController {
 		pageParams.getFilters().put("im_status", Status.REPLIED.value());
 		pageParams.getFilters().put("im_valid", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("im_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}
@@ -190,7 +190,7 @@ public class SaleInquiryMouldController {
 		}
 		pageParams.getFilters().put("im_valid", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("im_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurcInquiryMouldIds(keyword, pageParams);
 	}
@@ -211,8 +211,6 @@ public class SaleInquiryMouldController {
 			return null;
 		}
 		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			list.addAll(filter.getDistribute());
 			search.setDistribute(filter.getDistribute());
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -237,8 +235,6 @@ public class SaleInquiryMouldController {
 			return null;
 		}
 		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			list.addAll(filter.getDistribute());
 			search.setDistribute(filter.getDistribute());
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -265,8 +261,6 @@ public class SaleInquiryMouldController {
 			return null;
 		}
 		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			list.addAll(filter.getDistribute());
 			search.setDistribute(filter.getDistribute());
 		}
 		PageInfo pageInfo = new PageInfo(params);
@@ -295,8 +289,6 @@ public class SaleInquiryMouldController {
 			return null;
 		}
 		if (filter != null && !CollectionUtils.isEmpty(filter.getDistribute())) {
-//			List<Object> list = new ArrayList<>();
-//			list.addAll(filter.getDistribute());
 			search.setDistribute(filter.getDistribute());
 		}
 		PageInfo pageInfo = new PageInfo(params);

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

@@ -87,7 +87,7 @@ public class SaleMRBController {
 			pageParams.getFilters().put("pm_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pm_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pm_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseMRBIds(keyword, pageParams);
 	}

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

@@ -98,7 +98,7 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -137,8 +137,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -176,8 +176,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -215,8 +215,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -253,8 +253,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pn_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("pn_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pn_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("pn_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseNoticeIds(keyword, pageParams);
 	}
@@ -429,8 +429,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ss_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ss_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("ss_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}
@@ -467,8 +467,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ss_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ss_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("ss_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}
@@ -504,8 +504,8 @@ public class SaleNoticeController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ss_date", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("ss_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ss_date", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("ss_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleSendIds(keyword, pageParams);
 	}

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

@@ -87,7 +87,7 @@ public class SaleOrderChangeController {
 			pageParams.getFilters().put("pc_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}
@@ -121,7 +121,7 @@ public class SaleOrderChangeController {
 		pageParams.getFilters().put("pc_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("pc_unneedreply", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}
@@ -155,7 +155,7 @@ public class SaleOrderChangeController {
 		pageParams.getFilters().put("pc_status", Status.REPLIED.value());
 		pageParams.getFilters().put("pc_unneedreply", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}
@@ -188,7 +188,7 @@ public class SaleOrderChangeController {
 		}
 		pageParams.getFilters().put("pc_unneedreply", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pc_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pc_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}

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

@@ -194,7 +194,7 @@ public class SaleOrderController {
 		}
 		// TODO 其他过滤条件
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, 1L));
+		sortList.add(new Sort("pu_id", false, Type.INT, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("pu_status", (short) Status.UNAUDIT.value());
@@ -228,7 +228,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_status", Status.NOT_REPLY.value());
@@ -261,7 +261,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_reply", Constant.YES);
@@ -299,7 +299,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_status", Status.WAITSELLERCOMFIRM.value());
@@ -334,7 +334,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_end", Constant.YES);
@@ -366,7 +366,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_end", Constant.NO);
@@ -398,7 +398,7 @@ public class SaleOrderController {
 		}
 		// 当前登录企业作为供应商
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		List<Object> list = new ArrayList<>();
@@ -958,9 +958,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderDone> getDonePurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（已回复）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
-//		purchaseOrderDoneDao.updateStatusForPurcDone(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -977,9 +974,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderAll> getToAgreePurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（全部）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
-//		purchaseOrderWaitingDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("status", Status.WAITSELLERCOMFIRM.value());
@@ -997,8 +991,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderEnd> getEndPurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（已结案）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("end", Constant.YES);
@@ -1015,9 +1007,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderWaiting> getWaitingPurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（待交货）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
-//		purchaseOrderWaitingDao.updateStatusForPurc(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -1038,7 +1027,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		Map<String, Object> map = new HashMap<String, Object>();
@@ -1061,7 +1050,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_status", Status.NOT_REPLY);
@@ -1082,7 +1071,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_reply", Constant.YES);
@@ -1103,7 +1092,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_end", Constant.YES);
@@ -1123,7 +1112,7 @@ public class SaleOrderController {
 		String keyword = jsonObject.getString("keyword");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		List<Object> list = new ArrayList<>();
 		list.add(Constant.YES);
 		// 建索引时，将不处于已结案状态，但是货物全部交接完毕的单，end值设为了2

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

@@ -87,7 +87,7 @@ public class SaleQuotationController {
 			pageParams.getFilters().put("qu_custuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -126,7 +126,7 @@ public class SaleQuotationController {
 		// 待审批或已提交状态
 		pageParams.getFilters().put("qu_status", new MultiValue(status, true));
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationDoneIds(keyword, pageParams);
 	}
@@ -161,7 +161,7 @@ public class SaleQuotationController {
 		pageParams.setNotEqualFilters(map);
 		pageParams.getFilters().put("qu_agreed", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -196,7 +196,7 @@ public class SaleQuotationController {
 		pageParams.setNotEqualFilters(map);
 		pageParams.getFilters().put("qu_agreed", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -227,7 +227,7 @@ public class SaleQuotationController {
 		}
 		pageParams.getFilters().put("qu_status", Status.INPUTTING.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}
@@ -261,7 +261,7 @@ public class SaleQuotationController {
         // 已失效
 		pageParams.getFilters().put("qu_overdue", Constant.YES); // 已失效
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("qu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchSaleQuotationIds(keyword, pageParams);
 	}

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

@@ -89,7 +89,7 @@ public class SaleReturnController {
 			pageParams.getFilters().put("pr_enuu", new MultiValue(list, true));
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("pr_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseReturnIds(keyword, pageParams);
 	}

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

@@ -95,7 +95,7 @@ public class SaleSampleController {
 		    return purchaseProofingService.findByPageInfo(pageInfo, null, filter);
         }
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(filter.getKeyword(), pageParams);
 	}
@@ -130,7 +130,7 @@ public class SaleSampleController {
 		}
 		pageParams.getFilters().put("ppi_status", Status.UNSEND.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
@@ -165,7 +165,7 @@ public class SaleSampleController {
 		}
 		pageParams.getFilters().put("ppi_status", Status.SEND.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
@@ -200,7 +200,7 @@ public class SaleSampleController {
 		}
 		pageParams.getFilters().put("ppi_status", Status.CANCELLED.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ppi_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ppi_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingItemIds(keyword, pageParams);
 	}
@@ -414,8 +414,8 @@ public class SaleSampleController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
 	}
@@ -459,8 +459,8 @@ public class SaleSampleController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
 	}
@@ -501,8 +501,8 @@ public class SaleSampleController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
-		sortList.add(new Sort("psa_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
+		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
 	}

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

@@ -129,7 +129,7 @@ public class SaleTenderQuestionController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_venduu", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchSaleTenderQuestion(filter.getKeyword(), pageParams);
@@ -161,7 +161,7 @@ public class SaleTenderQuestionController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("stq_status", Status.REPLIED.value());
@@ -194,7 +194,7 @@ public class SaleTenderQuestionController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("stq_status", Status.NOT_REPLY.value());
@@ -226,7 +226,7 @@ public class SaleTenderQuestionController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_ptaid", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchSaleTenderQuestion(filter.getKeyword(), pageParams);
@@ -258,7 +258,7 @@ public class SaleTenderQuestionController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_ptaid", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchSaleTenderQuestion(filter.getKeyword(), pageParams);
@@ -290,7 +290,7 @@ public class SaleTenderQuestionController {
         }
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("stq_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("stq_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("stq_ptaid", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchSaleTenderQuestion(filter.getKeyword(), pageParams);

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

@@ -1,193 +0,0 @@
-package com.uas.platform.b2b.controller;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.uas.platform.b2b.manage.service.LogService;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.RegisterRecord;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.service.EnterpriseService;
-import com.uas.platform.b2b.service.RegisterLogService;
-import com.uas.platform.b2b.service.UserService;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.TokenService;
-import com.uas.platform.b2b.support.UsageBufferedLogger;
-import com.uas.platform.core.concurrent.Callback;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-import com.uas.platform.core.util.AgentUtils;
-import com.uas.platform.core.util.StringUtil;
-import com.uas.platform.core.util.mq.MessageLog;
-import com.uas.platform.core.util.mq.MessageType;
-import com.uas.platform.core.util.mq.SendMessageUtil;
-
-/**
- * 优软B2B平台 -- 自助服务功能
- * 
- * @author aof
- * 
- */
-/**
- * @since 2016-9-26 21:18:35 账户中心统一管理、客服中心提供服务
- *
- */
-@Deprecated
-@Controller
-@RequestMapping(value = "/serve")
-public class ServeController {
-
-	@Autowired
-	private EnterpriseService enterpriseService;
-	@Autowired
-	private UserService userService;
-	@Autowired
-	private RegisterLogService registerLogService;
-	@Autowired
-	private TokenService tokenService;
-	@Autowired
-	private LogService logService;
-
-	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
-
-	/**
-	 * 根据用户输入的营业执照号查询用户信息
-	 * 
-	 * @param enName
-	 * @return
-	 */
-	@RequestMapping(value = "/search/info")
-	@ResponseBody
-	public List<ModelMap> getUserInfoByBussinessCode(String bussinessCode) {
-		String realName = StringUtil.getWord(bussinessCode);
-		Enterprise en = enterpriseService.findByenBussinessCode(realName);
-		List<User> users = userService.findUsersByEnUU(en.getUu());
-		List<ModelMap> listMap = new ArrayList<ModelMap>();
-		if (users != null) {
-			for (User user : users) {
-				ModelMap map = new ModelMap();
-				map.put("userNames", user.getUserName());
-				map.put("userName", StringUtil.getSheildString(user.getUserName(), 1, 1));
-				map.put("userUu", user.getUserUU());
-				map.put("userMail", StringUtil.getSheildString(user.getUserEmail(), 3, 3));
-				listMap.add(map);
-			}
-		} else {
-			listMap = null;
-		}
-		return listMap;
-	}
-
-	/**
-	 * 根据用户的手机号或邮箱关联企业信息
-	 * 
-	 * @param userTel
-	 * @return
-	 */
-	@RequestMapping(value = "/schedule/info")
-	@ResponseBody
-	public List<ModelMap> getEnterpriseInfoByUsertel(String userTel) {
-		User user = null;
-		if (userTel.contains("@")) {
-			user = userService.findUserByUserEmail(userTel);
-		} else {
-			user = userService.findUserByUserTel(userTel);
-		}
-		List<RegisterRecord> register = null;
-		String adminPassword = user.getUserPwd();
-		Set<Enterprise> ens = user.getEnterprises();
-		List<ModelMap> listMap = new ArrayList<ModelMap>();
-		if (ens.size() > 0) {
-			for (Enterprise e : ens) {
-				ModelMap map = new ModelMap();
-				map.put("enName", StringUtil.getSheildString(e.getEnName(), 3, 2));
-				long enUu = e.getUu();
-				map.put("enUu", enUu);
-				if (e != null && e.getEnStatus() != null) {
-					int status = e.getEnStatus();
-					register = registerLogService.getRegisterLog(enUu);
-					map.put("register", register);
-					map.put("adminPassword", adminPassword);
-					map.put("status", status);
-				} else {
-					map.put("status", "");
-				}
-				listMap.add(map);
-			}
-		} else {
-			listMap = null;
-		}
-		return listMap;
-	}
-
-	/**
-	 * 发送手机验证码找回密码
-	 * 
-	 * @param userTel
-	 * @return
-	 */
-	@RequestMapping(value = "/send/msg")
-	@ResponseBody
-	public ModelMap sendMsg(String userPhone) {
-		ModelMap map = new ModelMap();
-		Long userUu = userService.findUserByUserTel(userPhone).getUserUU();
-		if (userUu != null) {
-			String code = tokenService.getEncodeToken("mobile", userUu);
-			String userName = (SystemSession.getUser() == null) ? "游客" : SystemSession.getUser().getUserName();
-			try {
-				SendMessageUtil.sendMessage("验证码：" + code + "，优软商务平台找回密码。", userPhone, userName, MessageType.auth,
-						new Callback<MessageLog>() {
-
-							@Override
-							public void call(MessageLog param) throws Exception {
-								logService.saveMessageLog(param);
-							}
-
-						});
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			map.put("userUu", userUu);
-			return map;
-		} else {
-			return map;
-		}
-	}
-
-	/**
-	 * 
-	 * @param phoneCode
-	 * @param userUu
-	 * @return
-	 */
-	@RequestMapping(value = "/send/msgCheck")
-	@ResponseBody
-	public ModelMap sendMsgResult(String phoneCode, Long userUu) {
-		boolean result = tokenService.isCertified("mobile", userUu, phoneCode);
-		ModelMap map = new ModelMap();
-		map.put("result", result);
-		if (result) {
-			String checkCode = tokenService.getEncodeToken("user", userUu);
-			map.put("checkCode", checkCode);
-			map.put("userUu", userUu);
-			return map;
-		} else {
-			return map;
-		}
-	}
-
-	@RequestMapping(value = "/forget/resetPwd")
-	@ResponseBody
-	public void setNewPwd(Long userUU, String newPwd, String checkCode, HttpServletRequest request) {
-		userService.resetPwdByCheckcode(userUU, newPwd, checkCode);
-		logger.log("用户信息", "手机验证码找回修改用户密码", userUU, AgentUtils.getIp(request));
-	}
-}

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

@@ -12,9 +12,9 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 平台消息、任务快照
@@ -98,8 +98,15 @@ public class SnapshotController {
 	@ResponseBody
 	@ResponseStatus(value = HttpStatus.OK)
 	public ModelMap getUnreadCount() {
-		// Hashtable 防止HashMap的put方法在多线程并发的情况下数据丢失
-		final Hashtable<String, Integer> hashtable = new Hashtable<>();
+
+		/**
+		 * Hashtable 防止HashMap的put方法在多线程并发的情况下数据丢失
+		 *
+		 * @modify-author hejq
+		 * @modify-date 2018-07-28 10:26
+		 * @modify-desc Hashtable 已过时，不需要要再使用，采用ConcurrentHashMap编写
+		 */
+		final ConcurrentHashMap<String, Integer> hashMap = new ConcurrentHashMap<>();
 		final User user = SystemSession.getUser();
 		ModelMap modelMap = new ModelMap();
 		//并行处理
@@ -114,7 +121,7 @@ public class SnapshotController {
 				for (Object[] objects : list){
 					count = count + Integer.valueOf(objects[0].toString());
 				}
-				hashtable.put("customer", count);
+				hashMap.put("customer", count);
 				SystemSession.clear();
 			}
 		}).task(new Runnable() {
@@ -128,7 +135,7 @@ public class SnapshotController {
 				for (Object[] objects : list){
 					count = count + Integer.valueOf(objects[0].toString());
 				}
-				hashtable.put("vendorPerformanceAssess", count);
+				hashMap.put("vendorPerformanceAssess", count);
 				SystemSession.clear();
 			}
 		}).task(new Runnable() {
@@ -138,7 +145,7 @@ public class SnapshotController {
 				//客户采购询价
 				SystemSession.setUser(user);
 				Map<String, Integer> map = purchaseInquiryService.getInquiryCount("sale");
-				hashtable.put("inquiry", map.containsKey("all")?map.get("all"):0);
+				hashMap.put("inquiry", map.containsKey("all") ? map.get("all") : 0);
 				SystemSession.clear();
 			}
 		}).task(new Runnable() {
@@ -148,18 +155,9 @@ public class SnapshotController {
 				//客户模具询价
 				SystemSession.setUser(user);
 				Map<String, Integer> count = purchaseInquiryMouldService.getInquiryMouldCount("sale");
-				hashtable.put("mould", count.containsKey("all")?count.get("all"):0);
+				hashMap.put("mould", count.containsKey("all") ? count.get("all") : 0);
 				SystemSession.clear();
 			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//主动报价
-//				SystemSession.setUser(user);
-//				hashtable.put("quotation", saleQuotationService.getQuotationUnreadCount());
-//				SystemSession.clear();
-//			}
 		}).task(new Runnable() {
 
 			@Override
@@ -167,7 +165,7 @@ public class SnapshotController {
 				//客户招标
 				SystemSession.setUser(user);
 				Map<String, Integer> count = tenderService.getTenderCount("sale");
-				hashtable.put("tender", count.containsKey("all")?count.get("all"):0);
+				hashMap.put("tender", count.containsKey("all") ? count.get("all") : 0);
 				SystemSession.clear();
 			}
 		}).task(new Runnable() {
@@ -177,7 +175,7 @@ public class SnapshotController {
 				//客户采购订单
 				SystemSession.setUser(user);
 				Map<String, Integer> count = purchaseOrderService.getOrderCount("sale");
-				hashtable.put("order", count.containsKey("all")?count.get("all"):0);
+				hashMap.put("order", count.containsKey("all") ? count.get("all") : 0);
 				SystemSession.clear();
 			}
 		}).task(new Runnable() {
@@ -187,7 +185,7 @@ public class SnapshotController {
 				//客户采购变更单
 				SystemSession.setUser(user);
 				Map<String, Integer> map = purchaseOrderChangeService.getChangeCount("sale");
-				hashtable.put("change", map.containsKey("all")?map.get("all"):0);
+				hashMap.put("change", map.containsKey("all") ? map.get("all") : 0);
 				SystemSession.clear();
 			}
 		}).task(new Runnable() {
@@ -197,24 +195,9 @@ public class SnapshotController {
 				//客户委外单
 				SystemSession.setUser(user);
 				Map<String, Integer> count = makeOrderService.getMakeOrderCount("sale");
-				hashtable.put("makeOrder", count.containsKey("all")?count.get("all"):0);
+				hashMap.put("makeOrder", count.containsKey("all") ? count.get("all") : 0);
 				SystemSession.clear();
 			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//委外变更单
-//				SystemSession.setUser(user);
-//				int count = 0;
-//				List<Object[]> list = makeOrderChangeService.getMakeChangeCount();
-//				for (Object[] objects : list){
-//					count = count + Integer.valueOf(objects[0].toString());
-//				}
-//				System.out.println(count);
-//				hashtable.put("makeChange", count);
-//				SystemSession.clear();
-//			}
 		}).task(new Runnable() {
 
 			@Override
@@ -222,18 +205,9 @@ public class SnapshotController {
 				//客户发货提醒
 				SystemSession.setUser(user);
 				Map<String, Integer> count = purchaseNoticeService.getNoticeCount("sale");
-				hashtable.put("notice", count.containsKey("all")?count.get("all"):0);
+				hashMap.put("notice", count.containsKey("all") ? count.get("all") : 0);
 				SystemSession.clear();
 			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//发货单
-//				SystemSession.setUser(user);
-//				hashtable.put("send", purchaseNoticeService.getSendUnreadCount());
-//				SystemSession.clear();
-//			}
 		}).task(new Runnable() {
 
 			@Override
@@ -241,81 +215,9 @@ public class SnapshotController {
 				//客户打样申请
 				SystemSession.setUser(user);
 				Map<String, Integer> count = purchaseProofingService.getProofingCount("sale");
-				hashtable.put("sample", count.containsKey("all")?count.get("all"):0);
+				hashMap.put("sample", count.containsKey("all") ? count.get("all") : 0);
 				SystemSession.clear();
 			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//客户认定单
-//				SystemSession.setUser(user);
-//				hashtable.put("approval", purchaseProofingService.getApprovalUnreadCount());
-//				SystemSession.clear();
-//			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//MRB单
-//				SystemSession.setUser(user);
-//				hashtable.put("MRB", purchaseMRBService.getMRBUnreadCount());
-//				SystemSession.clear();
-//			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//不良品出库单
-//				SystemSession.setUser(user);
-//				hashtable.put("badOut", purchaseBadOutService.getBadOutUnreadCount());
-//				SystemSession.clear();
-//			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//不良品入库单
-//				SystemSession.setUser(user);
-//				hashtable.put("badIn", purchaseBadInService.getBadInUnreadCount());
-//				SystemSession.clear();
-//			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//客户采购验收单
-//				SystemSession.setUser(user);
-//				hashtable.put("accept", purchaseAcceptService.getAcceptUnreadCount());
-//				SystemSession.clear();
-//			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//客户采购验退单
-//				SystemSession.setUser(user);
-//				hashtable.put("returns", purchaseReturnService.getReturnUnreadCount());
-//				SystemSession.clear();
-//			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//客户委外验收单
-//				SystemSession.setUser(user);
-//				hashtable.put("makeAccept", makeAcceptService.getAcceptUnreadCount());
-//				SystemSession.clear();
-//			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//客户委外验退单
-//				SystemSession.setUser(user);
-//				hashtable.put("makeReturns", makeReturnService.getReturnUnreadCount());
-//				SystemSession.clear();
-//			}
 		}).task(new Runnable() {
 
 			@Override
@@ -327,7 +229,7 @@ public class SnapshotController {
 				for(Object[] objects : list){
 						count = count + Integer.valueOf(objects[0].toString());
 				}
-				hashtable.put("purcVendor", count);
+				hashMap.put("purcVendor", count);
 				SystemSession.clear();
 			}
 		}).task(new Runnable() {
@@ -337,7 +239,7 @@ public class SnapshotController {
 				//采购招标
 				SystemSession.setUser(user);
                 Map<String, Integer> count = tenderService.getTenderCount("purc");
-                hashtable.put("tender", count.containsKey("all")?count.get("all"):0);
+				hashMap.put("tender", count.containsKey("all") ? count.get("all") : 0);
 				SystemSession.clear();
 			}
 		}).task(new Runnable() {
@@ -347,7 +249,7 @@ public class SnapshotController {
 				//采购询价
 				SystemSession.setUser(user);
 				Map<String, Integer> map = purchaseInquiryService.getInquiryCount("purc");
-				hashtable.put("purcInquiry", map.containsKey("all")?map.get("all"):0);
+				hashMap.put("purcInquiry", map.containsKey("all") ? map.get("all") : 0);
 				SystemSession.clear();
 			}
 		}).task(new Runnable() {
@@ -357,36 +259,9 @@ public class SnapshotController {
 				//采购订单
 				SystemSession.setUser(user);
 				Map<String, Integer> count = purchaseOrderService.getOrderCount("purc");
-				hashtable.put("purcOrder", count.containsKey("all")?count.get("all"):0);
+				hashMap.put("purcOrder", count.containsKey("all") ? count.get("all") : 0);
 				SystemSession.clear();
 			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//代采订单
-//				SystemSession.setUser(user);
-//				hashtable.put("purcDeputy", deputyOrderService.getPurchaseDeputyUnreadCount());
-//				SystemSession.clear();
-//			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//委外订单
-//				SystemSession.setUser(user);
-//				hashtable.put("purcMakeOrder", makeOrderService.getPurchaseOrderUnreadCount());
-//				SystemSession.clear();
-//			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//发票
-//				SystemSession.setUser(user);
-//				hashtable.put("apBill", purchaseApBillService.getApBillUnreadCount());
-//				SystemSession.clear();
-//			}
 		}).task(new Runnable() {
 
 			@Override
@@ -401,20 +276,11 @@ public class SnapshotController {
 						break;
 					}
 				}
-				hashtable.put("apCheck", count);
+				hashMap.put("apCheck", count);
 				SystemSession.clear();
 			}
-//		}).task(new Runnable() {
-//
-//			@Override
-//			public void run() {
-//				//应付对账单
-//				SystemSession.setUser(user);
-//				hashtable.put("arCheck", saleARCheckService.getArCheckUnreadCount());
-//				SystemSession.clear();
-//			}
 		}).run();
-		modelMap.addAllAttributes(hashtable);
+		modelMap.addAllAttributes(hashMap);
 		return modelMap;
 	}
 

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

@@ -57,7 +57,7 @@ public class VendorController {
 		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getEnBussinessCode());
 		pageParams.getFilters().put("ve_vendswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchVendorCheckIds(keyword, pageParams);
 	}
@@ -72,7 +72,7 @@ public class VendorController {
 		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("ve_servicerswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchVendorCheckIds(keyword, pageParams);
 	}
@@ -113,7 +113,7 @@ public class VendorController {
 			}
 			pageParams.getFilters().put("ve_myenuu", new MultiValue(list, true));
 		}
-		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ve_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchCustCheckIds(keyword, pageParams);
 	}

src/main/java/com/uas/platform/b2b/dao/AddPartnerDao.java

@@ -3,47 +3,15 @@ package com.uas.platform.b2b.dao;
 import com.uas.platform.b2b.model.AddPartner;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
+/**
+ * 添加合作伙伴
+ * 
+ * @author hejq
+ * @date 2018-07-28 10:53
+ */
 @Repository
 public interface AddPartnerDao extends JpaRepository<AddPartner, Long>, JpaSpecificationExecutor<AddPartner> {
 
-	/**
-	 * 通过申请人的uu号查询已发出的请求
-	 * 
-	 * @param applicantuu
-	 * @return
-	 */
-	public List<AddPartner> findByApplicantuu(Long applicantuu);
-
-	/**
-	 * 通过供应商uu查询待处理的请求
-	 * 
-	 * @param supplieruu
-	 * @return
-	 */
-	public List<AddPartner> findBySupplieruu(Long supplieruu);
-
-	/**
-	 * 通过企业与客户uu关系找出记录
-	 * 
-	 * @param clientuu
-	 * @param supplieruu
-	 * @return
-	 */
-	public AddPartner findByClientuuAndSupplieruu(Long clientuu, Long supplieruu);
-
-	/**
-	 * 查询未处理的请求
-	 * 
-	 * @param supplieruu
-	 * @param applyStatuscode
-	 * @return
-	 */
-	@Query("select count(o) from AddPartner o where o.supplieruu = :supplieruu and o.applyStatuscode = :applyStatuscode")
-	public int getTodoCountBySupplieruuAndApplyStatuscode(@Param("supplieruu") long supplieruu, @Param("applyStatuscode") int applyStatuscode);
 }

src/main/java/com/uas/platform/b2b/dao/ChangeAdminDao.java

@@ -1,19 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.ChangeAdmin;
-
-@Repository
-public interface ChangeAdminDao extends JpaSpecificationExecutor<ChangeAdmin>,JpaRepository<ChangeAdmin, Long>{
-	
-	public ChangeAdmin findChangeAdminByEnBussinessCode(String enBussinessCode);
-	
-	public ChangeAdmin findChangeAdminByEnBussinessCodeAndUuAndEnStatus(String enBussinessCode,Long Uu,Short enStatus);
-	
-	public List<ChangeAdmin> findByEnStatusAndEnSendStatus(Short enStatus, Short enSendStatus);
-}

src/main/java/com/uas/platform/b2b/dao/CommonDao.java

@@ -1,8 +1,5 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -12,6 +9,14 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用JdbcTemplate重新编写数据库操作相关方法
+ * 
+ * @author US50
+ */
 @Repository
 public class CommonDao {
 

src/main/java/com/uas/platform/b2b/dao/DistributeDao.java

@@ -29,8 +29,6 @@ public interface DistributeDao extends JpaSpecificationExecutor<Distribute>, Gen
 
 	List<Distribute> findByVendorId(Long vendorId);
 
-    Distribute findByVendorIdAndIsTransfer(Long vendorId, short yes);
-
 	/**
 	 * 查找被当前用户绑定当前客户权限的记录
 	 * @param id
@@ -39,12 +37,4 @@ public interface DistributeDao extends JpaSpecificationExecutor<Distribute>, Gen
 	 */
 	List<Distribute> findByVendorIdAndLeaderUU(Long id, Long userUU);
 
-	/**
-	 * 根据用户uu和供应商关系id查找转移权限记录
-	 * @param userUU
-	 * @param id
-	 * @param yes
-	 * @return
-	 */
-	Distribute findByUserUUAndVendorIdAndIsTransfer(Long userUU, Long id, short yes);
 }

src/main/java/com/uas/platform/b2b/dao/EnterpriseDao.java

@@ -86,14 +86,6 @@ public interface EnterpriseDao extends JpaSpecificationExecutor<Enterprise>,JpaR
 	 */
 	public EnterpriseInfo findEnterpriseInfoByUu(Long uu);
 
-	/**
-	 * 通过营业执照和名称找企业
-	 * @param enBussinessCode
-	 * @param enName
-	 * @return
-	 */
-	List<Enterprise> findByEnBussinessCodeAndEnName(String enBussinessCode, String enName);
-
 	/**
 	 * 按企业名称精确查询企业信息
 	 *

src/main/java/com/uas/platform/b2b/dao/MakeOrderItemDao.java

@@ -1,30 +1,11 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.MakeOrderItem;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.MakeOrderItem;
-
 @Repository
 public interface MakeOrderItemDao extends JpaSpecificationExecutor<MakeOrderItem>,
 		JpaRepository<MakeOrderItem, Long> {
-	/**
-	 * 按订单单号和序号查找订单明细
-	 * 
-	 * @param enUU
-	 * @param orderCode
-	 * @param number
-	 * @return
-	 */
-	@Query("from MakeOrderItem d where d.make.enUU = :enUU and d.make.code = :orderCode and d.number = :number")
-	public List<MakeOrderItem> findByEnUUAndOrderCodeAndNumber(@Param("enUU") long enUU, @Param("orderCode") String orderCode,
-			@Param("number") Short number);
-	
-	@Query("from MakeOrderItem d where d.make.enUU = :enUU and d.make.code = :orderCode")
-	public List<MakeOrderItem> findByEnUUAndOrderCode(@Param("enUU") long enUU, @Param("orderCode") String orderCode);
 }

src/main/java/com/uas/platform/b2b/dao/NotExistOrdersDao.java

@@ -9,6 +9,7 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import javax.transaction.Transactional;
+import java.sql.SQLException;
 import java.util.List;
 
 /**
@@ -35,7 +36,7 @@ public interface NotExistOrdersDao extends JpaRepository<NotExistOrders, Long>,
      * @param id id
      */
     @Modifying
-    @Transactional
+    @Transactional(rollbackOn = SQLException.class)
     @Query("update NotExistOrders set status = 203 where id = :id")
     void updateStatus(@Param("id") Long id);
 }

src/main/java/com/uas/platform/b2b/dao/NotExistProductDao.java

@@ -9,6 +9,7 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import javax.transaction.Transactional;
+import java.sql.SQLException;
 import java.util.List;
 
 /**
@@ -34,7 +35,7 @@ public interface NotExistProductDao extends JpaSpecificationExecutor<NotExistPro
      * @param id id
      */
     @Modifying
-    @Transactional
+    @Transactional(rollbackOn = SQLException.class)
     @Query("update NotExistProduct set status = 203 where id = :id")
     void updateStatus(@Param("id") Long id);
 

src/main/java/com/uas/platform/b2b/dao/NoticeDao.java

@@ -12,23 +12,37 @@ import org.springframework.stereotype.Repository;
 
 import javax.persistence.QueryHint;
 
+/**
+ * 系统公共
+ * 
+ * @author hejq
+ * @date 2018-07-28 10:56
+ */
 @Repository
 public interface NoticeDao extends JpaSpecificationExecutor<Notice>, JpaRepository<Notice, Long> {
 
+	/**
+	 * 采用分页参数分页查询公共信息
+	 * 
+	 * @param spec 条件
+	 * @param pageable 分页参数
+	 * @return
+	 */
+	@Override
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	Page<Notice> findAll(Specification<Notice> spec, Pageable pageable);
 
 	/**
 	 * 在log$erp表中加入日志
-	 * @param username
-	 * @param userip
-	 * @param enuu
-	 * @param useruu
-	 * @param title
-	 * @param message
+	 * @param username 用户姓名
+	 * @param userip ip
+	 * @param enuu 企业UU
+	 * @param useruu 用户UU
+	 * @param title 标题
+	 * @param message 消息
 	 */
 	@Procedure(procedureName = "PURC$ERP_SEND_EMAIL")
-	void saveErpLog(String username,String userip, Long enuu, Long useruu, String title, String message);
+	void saveErpLog(String username, String userip, Long enuu, Long useruu, String title, String message);
 
     /**
      * 通过公告id和个人uu设置公告的阅读状态

src/main/java/com/uas/platform/b2b/dao/OfficeTaskDao.java

@@ -1,39 +1,17 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
 
+import com.uas.platform.b2b.model.OfficeTask;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.OfficeTask;
-
+/**
+ * 系统任务
+ *
+ * @author hejq
+ * @date 2018-07-28 10:57
+ */
 @Repository
 public interface OfficeTaskDao extends JpaRepository<OfficeTask, Long>, JpaSpecificationExecutor<OfficeTask> {
-
-	/**
-	 * 通过企业查找任务日志
-	 * 
-	 * @param uu
-	 * @return
-	 */
-	List<OfficeTask> findByUu(Long uu);
-
-	/**
-	 * 通过企业和记录人uu查询任务
-	 * 
-	 * @param uu
-	 * @param recordercode
-	 * @return
-	 */
-	List<OfficeTask> findByUuAndRecordercode(Long uu, Long recordercode);
-
-	/**
-	 * 通过执行人和企业uu查询当前的任务
-	 * 
-	 * @param uu
-	 * @param domancode
-	 * @return
-	 */
-	List<OfficeTask> findByUuAndDomancode(Long uu, Long domancode);
 }

src/main/java/com/uas/platform/b2b/dao/PagingReleaseCountDao.java

@@ -1,14 +1,12 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
 
+import com.uas.platform.b2b.model.PagingReleaseCount;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import com.uas.platform.b2b.model.PagingReleaseCount;
-
 /**
  * Created by wangmh on 2017/7/10.
  */
@@ -26,20 +24,4 @@ public interface PagingReleaseCountDao extends JpaSpecificationExecutor<PagingRe
     @Query("select o.count from PagingReleaseCount o where o.enUU = :enUU and o.userUU = :userUU and o.category = :category and o.table = :table and o.orderStatus = -1")
     public Integer getUnreadCount(@Param("enUU") long enUU, @Param("userUU") long userUU, @Param("category") String category, @Param("table") String table);
 
-    @Query(value = "select v.PRC_COUNT, v.PRC_ORDERSTATUS from V$PURC$PAGINGRELEASECOUNT v where v.PRC_ENUU = :enUU and v.PRC_USERUU = :userUU and v.PRC_CATEGORY = :category and v.PRC_TABLE = :table", nativeQuery = true)
-    public List<Object[]> getUnreadCount2(@Param("enUU") long enUU, @Param("userUU") long userUU, @Param("category") String category, @Param("table") String table);
-
-    /**
-     * 根据单据状态获得消息数量
-     *
-     * @param enUU
-     * @param userUU
-     * @param category
-     * @param table
-     * @param orderStatus
-     * @return
-     */
-    @Query("select o.count from PagingReleaseCount o where o.enUU = :enUU and o.userUU = :userUU and o.category = :category and o.table = :table and o.orderStatus = :orderStatus")
-    public Integer getUnreadCountByStatus(@Param("enUU") long enUU, @Param("userUU") long userUU, @Param("category") String category, @Param("table") String table, @Param("orderStatus") Integer orderStatus);
-
 }

src/main/java/com/uas/platform/b2b/dao/PagingReleaseDao.java

@@ -5,17 +5,10 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import javax.persistence.OrderBy;
-import java.util.List;
-
 /**
  * Created by dongbw on 17/03/23 9:37.
  */
 @Repository
 public interface PagingReleaseDao extends JpaSpecificationExecutor<PagingRelease>,JpaRepository<PagingRelease, Long> {
 
-    @OrderBy("date desc")
-    List<PagingRelease> findByEnUUAndEmUU(Long enuu, Long emuu);
-
-    List<PagingRelease> findByTableAndSourceId(String table, Long id);
 }

src/main/java/com/uas/platform/b2b/dao/PagingReleaseDetailDao.java

@@ -5,11 +5,11 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.SQLException;
 import java.util.List;
 
 /**
@@ -18,28 +18,6 @@ import java.util.List;
  */
 @Repository
 public interface PagingReleaseDetailDao extends JpaRepository<PagingReleaseDetail, Long>,JpaSpecificationExecutor<PagingReleaseDetail> {
-    List<PagingReleaseDetail> findByVendUserUUAndVendUU(Long vendUseruu, Long venduu);
-
-    /**
-     * 返回消息详情的所有id
-     * @param prId
-     * @param vendUU
-     * @param userUU
-     * @return
-     */
-    @Procedure(procedureName = "PAGINGRELEASE_SAVE")
-    void saveDetails(Long prId, Long vendUU, Long userUU, Long orderStatus);
-
-    /**
-     * 将消息设置成已读
-     *
-     * @param vendUseruu
-     * @param venduu
-     * @param sourceId
-     */
-    @Modifying
-    @Query("update PagingReleaseDetail o set o.readStatus = 1 where o.vendUserUU = :vendUseruu and o.vendUU = :venduu and o.pagingRelease in (select p from PagingRelease p where p.sourceId in :sourceId)")
-    void setReadByVendUserUUAndVendUUAndSourceId(@Param("vendUseruu") Long vendUseruu, @Param("venduu") Long venduu, @Param("sourceId") Long[] sourceId);
 
     /**
      * 获得未读消息的单据id
@@ -51,30 +29,13 @@ public interface PagingReleaseDetailDao extends JpaRepository<PagingReleaseDetai
     @Query("select p.sourceId from PagingRelease p, PagingReleaseDetail d where p.id = d.pagingRelease.id and d.vendUserUU = :vendUseruu and d.vendUU = :venduu and d.readStatus = 0 and p.table = :table and p.category = :category")
     List<Long> getUnreadIds(@Param("vendUseruu") Long vendUseruu, @Param("venduu") Long venduu, @Param("table") String table, @Param("category") String category);
 
-    /**
-     * 查找当前用户未读消息
-     * @param userUU
-     * @param uu
-     * @param no
-     * @return
-     */
-    List<PagingReleaseDetail> findByVendUserUUAndVendUUAndReadStatus(Long userUU, Long uu, Short no);
-
-    /**
-     *  获取未读消息数量
-     * @param userUU
-     * @param vendUU
-     * @return
-     */
-    @Query("select count(*) from PagingReleaseDetail o where o.vendUU = :vendUU and o.vendUserUU = :userUU and o.readStatus = 0")
-    Integer GetToReadCountByVendUserUUAndVendUU(Long userUU, Long vendUU);
-
     /**
      * 将消息设置成已推送
      *
      * @param ids
      */
-    @Modifying@Transactional
+    @Modifying
+    @Transactional(rollbackFor = SQLException.class)
     @Query("update PagingReleaseDetail o set o.pushStatus = 1 where o.id in :ids")
     void setPushedByIds(@Param("ids") Object[] ids);
 }

src/main/java/com/uas/platform/b2b/dao/ProductDao.java

@@ -3,177 +3,29 @@ package com.uas.platform.b2b.dao;
 import com.uas.platform.b2b.model.Product;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.QueryHints;
-import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.stereotype.Repository;
 
-import javax.persistence.QueryHint;
 import java.util.List;
 
+/**
+ * 物料
+ * 
+ * @author hejq
+ * @date 2018-07-24 17:05
+ */
 @Repository
 public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaRepository<Product, Long> {
 
 	/**
-	 * 按所属企业的ID和产品的编号查找产品
-	 * 
-	 * @param enUU
-	 * @param code
-	 * @return
-	 */
-	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	public List<Product> findByEnUUAndCode(long enUU, String code);
-
-	/**
-	 * 通过uu和器件型号判断是否存在
-	 * 
-	 * @param enuu
-	 * @param cmpUuId
-	 * @return
-	 */
-	public Product findByEnUUAndCmpUuId(Long enUU, String cmpUuId);
-
-	/**
-	 * 通过uu,code,brand查询物料是否存在
-	 * 
-	 * @param enUU
-	 * @param code
-	 * @param brand
-	 * @return
-	 */
-	public Product findByEnUUAndCodeAndBrand(Long enUU, String code, String brand);
-
-	/**
-	 * 通过uu和名称判断物料是否存在（新增采购导入时需用到）
-	 * 
-	 * @param enUU
-	 * @param title
-	 * @return
-	 */
-	public List<Product> findByEnUUAndTitle(Long enUU, String title);
-
-	/**
-	 * 通过销售状态查询物料
-	 * 
-	 * @param enUU
-	 * @param issale
-	 * @return
-	 */
-	public List<Product> findByEnUUAndIsSale(Long enUU, Short issale);
-
-	/**
-	 * 通过采购状态查询物料
-	 * 
-	 * @param enUU
-	 * @param isPurc
-	 * @return
-	 */
-	public List<Product> findByEnUUAndIsPurchase(Long enUU, Short isPurc);
-
-	/**
-	 * 查询企业的所有物料
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	public List<Product> findByEnUU(Long enuu);
-
-	/**
-	 * 通过品牌和enuu查询所有信息
-	 * 
-	 * @param enuu
-	 * @param brand
-	 * @return
-	 */
-	public List<Product> findByEnUUAndBrandAndIsSale(Long enuu, String brand, Short isSale);
-
-	/**
-	 * 通过品牌和enuu查询所有信息
-	 * 
-	 * @param enuu
-	 * @param brand
-	 * @return
-	 */
-	public List<Product> findByEnUUAndBrand(Long enuu, String brand);
-	/**
-	 * 通过品牌和enuu查询所有信息
-	 * 
-	 * @param enuu
-	 * @param brand
-	 * @param isPurc
-	 * @return
-	 */
-	public List<Product> findByEnUUAndBrandAndIsPurchase(Long enuu, String brand, Short isPurc);
-
-	/**
-	 * 通过名称查询物料信息
-	 * 
-	 * @param enUU
-	 * @param title
-	 * @param isSale
-	 * @return
-	 */
-	public List<Product> findByEnUUAndTitleAndIsSale(Long enUU, String title, Short isSale);
-
-	/**
-	 * 通过名称查询物料信息
-	 * 
-	 * @param enUU
-	 * @param title
-	 * @param isPurc
-	 * @return
-	 */
-	public List<Product> findByEnUUAndTitleAndIsPurchase(Long enUU, String title, Short isPurc);
-
-	/**
-	 * 通过uu和标准状态判断是否存在物料
-	 * 
-	 * @param enuu
-	 * @param standard
-	 * @return
-	 */
-	public List<Product> findByEnUUAndStandard(Long enuu, Short standard);
-
-	/**
-	 * 根据状态更新数据
-	 * 
-	 * @param uu
-	 * @param status
-	 * @return
-	 */
-	public List<Product> findByEnUUAndMatchstatus(Long uu, Integer status);
-
-	/**
-	 * 通过应用来源和下载状态查询物料信息
-	 * 
-	 * @param enuu
-	 * @param app
-	 * @param status
-	 * @return
-	 */
-	public List<Product> findByEnUUAndSourceAppAndDownloadstatus(Long enuu, String app, Integer status);
-
-    /**
-     * 通过企业UU，物料名称、规格、品牌（非标准）
-     *
-     * @param enUU
-     * @param titile
-     * @param spec
-     * @param brand
-     * @return
-     */
-    public List<Product> findByTitleAndCmpCodeAndBrandAndEnUU(String title, String cmpcode, String brand, Long enUU);
-
-	/**
-	 * 通过企业UU，物料名称、规格、品牌（非标准）、型号
+	 * 通过企业UU，物料名称、规格、品牌（非标准）查询物料信息
 	 *
-	 * @param enUU 企业uu
-	 * @param title  名称
-	 * @param spec 规格
-	 * @param cmpcode 型号
+	 * @param title 物料名称
+	 * @param cmpCode 型号
 	 * @param brand 品牌
+	 * @param enUU 企业UU
 	 * @return
 	 */
-	public List<Product> findByTitleAndSpecAndCmpCodeAndBrandAndEnUU(String title, String spec, String cmpcode, String brand, Long enUU);
+    List<Product> findByTitleAndCmpCodeAndBrandAndEnUU(String title, String cmpCode, String brand, Long enUU);
 
     /**
      * 通过企业UU，物料名称、规格、品牌（标准）
@@ -184,60 +36,5 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      * @param enUU
      * @return
      */
-    public List<Product> findByTitleAndPcmpcodeAndPbrandAndEnUU(String title, String cmpcode, String brand, Long enUU);
-
-	/**
-	 * 通过uu查询非标准器件进行存储 -- B2B不在使用一键匹配，所以更新方法也弃用
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	@Procedure(procedureName = "PRODUCT$UPDATE")
-	public String upateProductByEnuuAndType(Long enuu, String updatetype);
-
-	/**
-	 * 一键开启（关闭）销售（采购）  --公共服务调试ok之后会弃用
-	 *
-	 * @param enuu
-	 * @param switchtype
-	 * @param status
-	 * @return
-	 */
-	@Procedure(procedureName = "PRODUCT$SWITCH")
-	public void switchProductByEnuuAndTypeAndStatus(Long enuu, String switchtype, Integer switchstatus);
-
-	/**
-	 * 通过id判断是否有业务关系
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@Procedure(procedureName = "PRODUCT$BUSINESSSTATUS")
-	public Integer findProductBusinessStatusById(Long id);
-
-	/**
-	 * 通过型号和品牌查询物料是否存在
-	 * 
-	 * @param enuu
-	 * @param pcmpcoe
-	 * @param brand
-	 * @return
-	 */
-	List<Product> findByEnUUAndPcmpcodeAndPbrand(Long enuu, String pcmpcoe, String brand);
-
-	/**
-	 * 通过企业UU号查询物料上传数量
-	 *
-	 * @param enUU 企业UU
-	 * @return
-	 */
-	Long countByEnUU(Long enUU);
-
-	/**
-	 * 通过
-	 * @param enUU
-	 * @param cmpCode
-	 * @return
-	 */
-	List<Product> findByEnUUAndCmpCode(Long enUU, String cmpCode);
+    List<Product> findByTitleAndPcmpcodeAndPbrandAndEnUU(String title, String cmpcode, String brand, Long enUU);
 }

src/main/java/com/uas/platform/b2b/dao/ProductMatchResultDao.java

@@ -1,21 +1,12 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.ProductMatchResult;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.ProductMatchResult;
-
 @Repository
 public interface ProductMatchResultDao
 		extends JpaRepository<ProductMatchResult, Long>, JpaSpecificationExecutor<ProductMatchResult> {
 
-	/**
-	 * 
-	 * @param prid
-	 * @return
-	 */
-	List<ProductMatchResult> findByPrid(Long prid);
 }

src/main/java/com/uas/platform/b2b/dao/ProductStatusDao.java

@@ -22,12 +22,4 @@ public interface ProductStatusDao extends JpaSpecificationExecutor<ProductStatus
     @OrderBy("id desc")
     List<ProductStatus> findByPrId(Long id);
 
-    /**
-     * 根据物料id和禁用状态查找物料状态
-     * @param id 物料id
-     * @param b2bDisabled 禁用状态 1禁用  非1未禁用
-     * @return
-     */
-    @OrderBy("id desc")
-    List<ProductStatus> findByPrIdAndB2bDisabled(Long id, Short b2bDisabled);
 }

src/main/java/com/uas/platform/b2b/dao/ProductUsersDao.java

@@ -37,13 +37,4 @@ public interface ProductUsersDao extends JpaSpecificationExecutor<ProductUsers>,
      * @return
      */
     ProductUsers findByEnuuAndUseruuAndPrid(Long enuu, Long useruu, Long prid);
-
-    /**
-     * 通过ERPid查询个人物料信息
-     *
-     * @param enuu 企业UU
-     * @param em_uu 个人uu
-     * @param ps_id erpid
-     */
-    ProductUsers findByEnuuAndUseruuAndErpid(Long enuu, Long em_uu, Long ps_id);
 }

src/main/java/com/uas/platform/b2b/dao/PublicInquiryDao.java

@@ -1,35 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PublicInquiry;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 公共询价
- *
- * Created by hejq on 2018-01-06.
- */
-@Repository
-public interface PublicInquiryDao extends JpaSpecificationExecutor<PublicInquiry>, JpaRepository<PublicInquiry, Long> {
-
-    /**
-     * 通过来源id和应用来源查询单据
-     *
-     * @param id 公共询价的主表id
-     * @param sourcerapp 应用来源
-     * @return
-     */
-    PublicInquiry findBySourceIdAndSourceApp(Long id, String sourcerapp);
-
-    /**
-     * 通过企业UU和询价单号查询询价信息
-     *
-     * @param enuu 企业UU号
-     * @param code 询价编号
-     * @return
-     */
-    List<PublicInquiry> findByEnUUAndCode(Long enuu, String code);
-}

src/main/java/com/uas/platform/b2b/dao/PublicInquiryInfoDao.java

@@ -1,16 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PublicInquiryInfo;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-/**
- * 公共询价
- *
- * Created by hejq on 2018-01-06.
- */
-@Repository
-public interface PublicInquiryInfoDao extends JpaSpecificationExecutor<PublicInquiryInfo>, JpaRepository<PublicInquiryInfo, Long> {
-
-}

src/main/java/com/uas/platform/b2b/dao/PublicInquiryItemDao.java

@@ -1,54 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PublicInquiryItem;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import javax.transaction.Transactional;
-import java.util.Set;
-
-
-/**
- *  公共询价明细
- *
- * Created by hejq on 2018-01-06.
- */
-@Repository
-public interface PublicInquiryItemDao extends JpaRepository<PublicInquiryItem, Long>, JpaSpecificationExecutor<PublicInquiryItem> {
-
-    /**
-     * 通过供应商UU号和来源id查询单据明细
-     *
-     * @param uu 供应商UU号
-     * @param id 来源id
-     * @return
-     */
-    PublicInquiryItem findByVendUUAndSourceId(Long uu, Long id);
-
-    /**
-     * 根据传回的id更新下载状态
-     *
-     * @param ids 询价明细idList
-     */
-    @Modifying
-    @Transactional
-    @Query("update PublicInquiryItem i set i.backStatus = 351 where i.id in (:ids)")
-    void updateBackStatus(@Param("ids") Set<Long> ids);
-
-    /**
-     * 按询价单明细ID更新采纳结果
-     *
-     * @author hejq
-     * @date 2018-01-14 15:03
-     * @param agreed 采纳结果
-     * @param decideStatus 采纳状态
-     * @param id 询价id
-     */
-    @Modifying(clearAutomatically = true)
-    @Query("update PublicInquiryItem p set p.agreed = :agreed, p.decideStatus = :decideStatus where p.id = :id")
-    void updateDecideStatusByID(@Param("agreed")Short agreed, @Param("decideStatus") Short decideStatus, @Param("id") Long id);
-}

src/main/java/com/uas/platform/b2b/dao/PublicInquiryItemInfoDao.java

@@ -1,39 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PublicInquiryItemInfo;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- *  公共询价明细Dao
- *
- * Created by hejq on 2018-01-06.
- */
-@Repository
-public interface PublicInquiryItemInfoDao extends JpaRepository<PublicInquiryItemInfo, Long>, JpaSpecificationExecutor<PublicInquiryItemInfo> {
-
-    /**
-     * 按卖家企业ID和询价主记录ID查找
-     *
-     * @param vendUU 卖家的企业UU号
-     * @param inquiryId 询价单主表id
-     * @return
-     */
-    @Query("from PublicInquiryItemInfo d where d.vendUU = :vendUU and d.inquiry.id = :inquiryId")
-    List<PublicInquiryItemInfo> findByVendUUAndInquiry(@Param("vendUU") Long vendUU, @Param("inquiryId") Long inquiryId);
-
-    /**
-     * 按买家企业ID和明细传报价状态查找询价明细
-     *
-     * @param enUU 客户UU号
-     * @param backStatus 下载状态：202未下载；203已下载；351下载中
-     * @return
-     */
-    @Query("from PublicInquiryItemInfo d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus and ifnull(d.sourceApp, ' ') <> 'B2B'")
-    List<PublicInquiryItemInfo> findByEnUUAndBackStatus(@Param("enUU") Long enUU, @Param("backStatus") short backStatus);
-}

src/main/java/com/uas/platform/b2b/dao/PublicInquiryReplyDao.java

@@ -1,15 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PublicInquiryReply;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-/**
- * 公共询价报价信息
- *
- * Created by hejq on 2018-01-06.
- */
-@Repository
-public interface PublicInquiryReplyDao extends JpaRepository<PublicInquiryReply, Long>, JpaSpecificationExecutor<PublicInquiryReply> {
-}

src/main/java/com/uas/platform/b2b/dao/PurcInquiryDao.java

@@ -1,11 +1,10 @@
 package com.uas.platform.b2b.dao;
 
+import com.uas.platform.b2b.model.PurcInquiry;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurcInquiry;
-
 @Repository
 public interface PurcInquiryDao extends JpaRepository<PurcInquiry, Long>, JpaSpecificationExecutor<PurcInquiry> {
 
@@ -17,11 +16,4 @@ public interface PurcInquiryDao extends JpaRepository<PurcInquiry, Long>, JpaSpe
 	 */
 	PurcInquiry findByCode(String code);
 
-	/**
-	 * 通过询价单单号和企业uu查找询价单
-	 * @param bi_code
-	 * @param enuu
-	 * @return
-	 */
-	PurcInquiry findByCodeAndEnUU(String bi_code, Long enuu);
 }

src/main/java/com/uas/platform/b2b/dao/PurchaseApBillOutDao.java

@@ -1,18 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PurchaseApBillOut;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.query.Procedure;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PurchaseApBillOutDao extends JpaSpecificationExecutor<PurchaseApBillOut>, JpaRepository<PurchaseApBillOut, Long> {
-
-    @Procedure(procedureName = "TAXCODE_INSERT")
-    public void  saveData(String a,String b,String c,String d,String e,String f,String g,String h,String i,String j,String k,String l,String m,String n,String o,String p,String q,String s);
-
-    public List<PurchaseApBillOut> findByEnUuAndCode(long enUU, String bi_code);
-}

src/main/java/com/uas/platform/b2b/dao/PurchaseApBillOutDoneDao.java

@@ -1,13 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PurchaseApBillOut;
-import com.uas.platform.b2b.model.PurchaseApBillOutDone;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface PurchaseApBillOutDoneDao extends JpaSpecificationExecutor<PurchaseApBillOutDone>, JpaRepository<PurchaseApBillOutDone, Long> {
-
-
-}

src/main/java/com/uas/platform/b2b/dao/PurchaseApBillOutEndDao.java

@@ -1,13 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PurchaseApBillOutDone;
-import com.uas.platform.b2b.model.PurchaseApBillOutEnd;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface PurchaseApBillOutEndDao extends JpaSpecificationExecutor<PurchaseApBillOutEnd>, JpaRepository<PurchaseApBillOutEnd, Long> {
-
-
-}

src/main/java/com/uas/platform/b2b/dao/PurchaseApBillOutInfoDao.java

@@ -1,20 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PurchaseApBillOutInfo;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-/**
- * 企业开票信息
- */
-@Repository
-public interface PurchaseApBillOutInfoDao extends JpaSpecificationExecutor<PurchaseApBillOutInfo>, JpaRepository<PurchaseApBillOutInfo, Long> {
-    /**
-     * 按所属企业及编号查找企业开票信息
-     *
-     * @param Uu
-     * @return
-     */
-    public PurchaseApBillOutInfo findByUu(Long Uu);
-}

src/main/java/com/uas/platform/b2b/dao/PurchaseApBillOutItemDao.java

@@ -1,26 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PurchaseApBillOutItem;
-import com.uas.platform.b2b.model.PurchaseApCheckItem;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PurchaseApBillOutItemDao
-		extends JpaSpecificationExecutor<PurchaseApBillOutItem>, JpaRepository<PurchaseApBillOutItem, Long> {
-
-	/**
-	 * 通过sourceTable、sourceId判断是否已提交未对账
-	 *
-	 * @param sourceTable
-	 * @param sourceId
-	 * @return
-	 */
-	public List<PurchaseApBillOutItem> findBySourceTableAndSourceId(String sourceTable, Long sourceId);
-
-}

src/main/java/com/uas/platform/b2b/dao/PurchaseApBillOutTodoDao.java

@@ -1,9 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-import com.uas.platform.b2b.model.PurchaseApBillOutTodo;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-public interface PurchaseApBillOutTodoDao extends JpaSpecificationExecutor<PurchaseApBillOutTodo>, JpaRepository<PurchaseApBillOutTodo, Long> {
-
-}

src/main/java/com/uas/platform/b2b/dao/PurchaseApCheckDao.java

@@ -19,31 +19,6 @@ public interface PurchaseApCheckDao extends JpaSpecificationExecutor<PurchaseApC
 	 */
 	public List<PurchaseApCheck> findByCustUuAndStatusAndCheckStatus(Long enUu, Short status, String checkStatus);
 
-	/**
-	 * 卖家根据客户UU号和下载状态获取需要下载的应收对账单
-	 * 
-	 * @return
-	 */
-	public List<PurchaseApCheck> findByCustUuAndStatus(Long custUu, Short status);
-
-	/**
-	 * 按所属卖方企业及编号查找应收对账单
-	 * 
-	 * @param vendUU
-	 * @param code
-	 * @return
-	 */
-	public List<PurchaseApCheck> findByEnUuAndCode(Long enUu, String code);
-
-	/**
-	 * 按所属卖方企业及编号查找应收对账单
-	 * 
-	 * @param custUu
-	 * @param code
-	 * @return
-	 */
-	public List<PurchaseApCheck> findByCustUuAndCode(Long custUu, String code);
-
 	/**
 	 * 查询待处理的对账单
 	 * 

src/main/java/com/uas/platform/b2b/dao/PurchaseApCheckItemDao.java

@@ -1,29 +1,18 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseApCheckItem;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseApCheckItem;
+import java.util.List;
 
 @Repository
 public interface PurchaseApCheckItemDao
 		extends JpaSpecificationExecutor<PurchaseApCheckItem>, JpaRepository<PurchaseApCheckItem, Long> {
 
-	/**
-	 * 按所属卖方企业及编号查找应收对账单
-	 * 
-	 * @param id
-	 * @param number
-	 * @return
-	 */
-	@Query("from PurchaseApCheckItem p where p.apCheck.id= :id and p.number = :number")
-	public List<PurchaseApCheckItem> findByIdAndNumber(@Param("id") Long id, @Param("number") Integer number);
-
 	/**
 	 * 通过sourceTable、sourceId判断是否已提交未对账
 	 * 

src/main/java/com/uas/platform/b2b/dao/PurchaseApCheckItemInfoDao.java

@@ -1,23 +1,14 @@
 package com.uas.platform.b2b.dao;
 
 import com.uas.platform.b2b.model.PurchaseApCheckItemInfo;
-import com.uas.platform.b2b.model.PurchaseApCheckTodo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 /**
  * Created by 黄诚天 on 2017/7/4.
  */
 @Repository
 public interface PurchaseApCheckItemInfoDao extends JpaSpecificationExecutor<PurchaseApCheckItemInfo>, JpaRepository<PurchaseApCheckItemInfo, Long> {
 
-    /**
-     * 通过主表id查询详情
-     * @param paid
-     * @return
-     */
-    List<PurchaseApCheckItemInfo> findByPaid(Long paid);
 }

src/main/java/com/uas/platform/b2b/dao/PurchaseInquiryDao.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseInquiry;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -10,7 +9,7 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.uas.platform.b2b.model.PurchaseInquiry;
+import java.util.List;
 
 @Repository
 @Transactional
@@ -34,16 +33,6 @@ public interface PurchaseInquiryDao extends JpaSpecificationExecutor<PurchaseInq
 	 */
 	public List<PurchaseInquiry> findByEnUUAndSourceId(long enUU, long sourceId);
 
-	/**
-	 * 按询价单ID和明细供应商UU查找
-	 * 
-	 * @param vendUU
-	 * @param id
-	 * @return
-	 */
-	@Query("select p from PurchaseInquiry p inner join p.inquiryItems as i where i.vendUU = :vendUU and p.id = :id")
-	public List<PurchaseInquiry> findByVendUUAndId(@Param("vendUU") long vendUU, @Param("id") long id);
-
 	/**
 	 * 按询价单来源ID更新是否提交状态
 	 * 
@@ -52,8 +41,4 @@ public interface PurchaseInquiryDao extends JpaSpecificationExecutor<PurchaseInq
 	@Query("update PurchaseInquiry p set p.check = :check where p.enUU = :enUU and p.sourceId IN (:sourceIds)")
 	public void updateByCheck(@Param("check") short check, @Param("enUU") long enUU, @Param("sourceIds") Long[] sourceIds);
 
-	@Query("select p from PurchaseInquiry p where p.sourceId = :sourceId and p.sourceApp = :sourceApp")
-	public PurchaseInquiry findBySourceIdAndSourceApp(@Param("sourceId") Long sourceId,
-			@Param("sourceApp") String sourceApp);
-
 }

src/main/java/com/uas/platform/b2b/dao/PurchaseInquiryItemDao.java

@@ -10,11 +10,11 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import javax.transaction.Transactional;
+import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
 
 @Repository
-@Transactional
 public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<PurchaseInquiryItem>, JpaRepository<PurchaseInquiryItem, Long> {
 
 	/**
@@ -57,13 +57,17 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.inquiry.code = :code and d.number = :number")
 	List<PurchaseInquiryItem> findByEnUUAndCodeAndNumber(@Param("enUU") long enUU, @Param("code") String code, @Param("number") short number);
 
-	/**
-	 * 按询价单明细ID更新采纳结果
-	 * 
-	 */
+    /**
+     * 按询价单明细ID更新采纳结果
+     *
+     * @param agreed 采纳结果
+     * @param decideStatus 采纳状态
+     * @param id 明细id
+     */
 	@Modifying(clearAutomatically = true)
+	@Transactional(rollbackOn = SQLException.class)
 	@Query("update PurchaseInquiryItem p set p.agreed = :agreed,p.decideStatus = :decideStatus where p.id = :id")
-	public void updateDecideStatusByID(@Param("agreed") short agreed, @Param("decideStatus") short decideStatus, @Param("id") Long id);
+	void updateDecideStatusByID(@Param("agreed") short agreed, @Param("decideStatus") short decideStatus, @Param("id") Long id);
 
 	/**
 	 * 按卖家企业ID和询价明细的报价信息传到卖家ERP的状态查找询价明细
@@ -83,16 +87,6 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	 */
 	List<PurchaseInquiryItem> findByVendUUAndDecideStatus(long vendUU, short decideStatus);
 
-	/**
-	 * 按询价单的供应商企业ID和询价单状态来统计条数
-	 * 
-	 * @param vendUU
-	 * @param status
-	 * @return
-	 */
-	@Query("select count(i) from PurchaseInquiryItem i where i.vendUU = :vendUU and i.status = :status")
-	public int getCountByVendUUAndStatus(@Param("vendUU") long vendUU, @Param("status") short status);
-
 	/**
 	 * 按询价单供应商企业ID和状态来查询详情 （后面再在视图中查询数目进行统计）
 	 * 
@@ -105,11 +99,11 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	/**
 	 * 根据企业UU号查询询价单（明细）总数量
 	 * 
-	 * @param enUU
+	 * @param enUU 企业UU
 	 * @return
 	 */
 	@Query("select count(*) from PurchaseInquiryItem i where i.inquiry.enUU = :enUU")
-	public Long getCountByEnUU(@Param("enUU") long enUU);
+	Long getCountByEnUU(@Param("enUU") long enUU);
 
 	/**
 	 * 根据企业UU号查询询价单（明细）总数量
@@ -118,7 +112,7 @@ public interface PurchaseInquiryItemDao extends JpaSpecificationExecutor<Purchas
 	 * @return
 	 */
 	@Query("select count(*) from PurchaseInquiryItem i where i.inquiry.enUU = :enUU and i.vendToDate is not null and  i.vendToDate <= :date")
-	public Long getOverdueCountByEnUU(@Param("enUU") long enUU, @Param("date") Date date);
+	Long getOverdueCountByEnUU(@Param("enUU") long enUU, @Param("date") Date date);
 
 	/**
 	 * 根据企业UU昊查询已报价询价单数量

src/main/java/com/uas/platform/b2b/dao/PurchaseInquiryMouldDao.java

@@ -1,17 +1,14 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.Date;
-import java.util.List;
-
-import org.apache.log4j.lf5.viewer.configure.MRUFileManager;
+import com.uas.platform.b2b.model.PurchaseInquiryMould;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseInquiryMould;
+import java.util.Date;
+import java.util.List;
 
 @Repository
 public interface PurchaseInquiryMouldDao
@@ -35,16 +32,6 @@ public interface PurchaseInquiryMouldDao
 	 */
 	public List<PurchaseInquiryMould> findByEnuuAndSourceId(long enuu, long sourceId);
 
-	/**
-	 * 按询价单ID和明细供应商UU查找
-	 * 
-	 * @param vendUU
-	 * @param id
-	 * @return
-	 */
-	@Query("select p from PurchaseInquiryMould p where p.venduu = :venduu and p.id = :id")
-	public PurchaseInquiryMould findByVenduuAndId(@Param("venduu") long vendUU, @Param("id") long id);
-
 	/**
 	 * 根据供应商企业UU号查询已报价模具询价单数量
 	 * 
@@ -82,16 +69,6 @@ public interface PurchaseInquiryMouldDao
 	@Query("select i from PurchaseInquiryMould i where i.venduu = :venduu and i.status = :status")
 	List<PurchaseInquiryMould> findByVenduuAndStatus(long venduu, short status);
 
-	/**
-	 * 按询价单的供应商企业ID和询价单状态来统计条数
-	 * 
-	 * @param vendUU
-	 * @param status
-	 * @return
-	 */
-	@Query("select count(i) from PurchaseInquiryMould i where i.venduu = :venduu and i.status = :status")
-	public int getCountByVenduuAndStatus(@Param("venduu") long vendUU, @Param("status") short status);
-
 	/**
 	 * 根据企业UU号查询询价单（明细）总数量
 	 * 
@@ -129,14 +106,6 @@ public interface PurchaseInquiryMouldDao
 	 */
 	public List<PurchaseInquiryMould> findByVenduuAndAdoptStatus(Long uu, short value);
 
-	/**
-	 * 按询价单来源ID更新是否提交状态
-	 * 
-	 */
-	@Modifying(clearAutomatically = true)
-	@Query("update PurchaseInquiryMould p set p.check = :check where p.id IN (:ids)")
-	public void updateByCheck(@Param("check") short check, @Param("ids") Long[] ids);
-
 	/**
 	 * 根据enuu和erpSourceId获取单据
 	 * 

src/main/java/com/uas/platform/b2b/dao/PurchaseInquiryMouldInfoDao.java

@@ -8,160 +8,4 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface PurchaseInquiryMouldInfoDao
 		extends JpaSpecificationExecutor<PurchaseInquiryMouldInfo>, JpaRepository<PurchaseInquiryMouldInfo, Long> {
-//
-//	/**
-//	 * @param enUU
-//	 *            询价方企业ID
-//	 * @param code
-//	 *            流水号
-//	 * @return
-//	 */
-//	public List<PurchaseInquiryMould> findByEnuuAndCode(long enuu, String code);
-//
-//	/**
-//	 * @param enUU
-//	 *            询价方企业ID
-//	 * @param sourceId
-//	 *            来源系统的单据ID
-//	 * @return
-//	 */
-//	public List<PurchaseInquiryMould> findByEnuuAndSourceId(long enuu, long sourceId);
-//
-//	/**
-//	 * 按询价单ID和明细供应商UU查找
-//	 *
-//	 * @param vendUU
-//	 * @param id
-//	 * @return
-//	 */
-//	@Query("select p from PurchaseInquiryMould p where p.venduu = :venduu and p.id = :id")
-//	public PurchaseInquiryMould findByVenduuAndId(@Param("venduu") long vendUU, @Param("id") long id);
-//
-//	/**
-//	 * 根据供应商企业UU号查询已报价模具询价单数量
-//	 *
-//	 * @param venduu
-//	 * @return
-//	 */
-//	@Query("select count(i) from PurchaseInquiryMould i where i.venduu = :venduu and i.status = 201 and i.valid = 1")
-//	public Long getOfferCountByEnUU(@Param("venduu") long venduu);
-//
-//	/**
-//	 * 根据供应商UU查询未报价模具询价单数量
-//	 *
-//	 * @param venduu
-//	 * @return
-//	 */
-//	@Query("select count(i) from PurchaseInquiryMould i where i.venduu = :venduu and i.status = 200 and i.valid = 1 and i.overdue = 0")
-//	public Long getNotOfferCountByEnUU(@Param("venduu") long venduu);
-//
-//	/**
-//	 * 根据供应商UU号获取客户模具询价单数量
-//	 *
-//	 * @param venduu
-//	 * @return
-//	 */
-//	@Query("select count(p) from PurchaseInquiryMould p where p.venduu = :venduu")
-//	public long countByVendUU(@Param("venduu") Long venduu);
-//
-//	/**
-//	 * 按询价单供应商企业ID和状态来查询详情 （后面再在视图中查询数目进行统计）
-//	 *
-//	 * @param vendUU
-//	 * @param status
-//	 * @return
-//	 */
-//	@Query("select i from PurchaseInquiryMould i where i.venduu = :venduu and i.status = :status")
-//	List<PurchaseInquiryMould> findByVenduuAndStatus(long venduu, short status);
-//
-//	/**
-//	 * 按询价单的供应商企业ID和询价单状态来统计条数
-//	 *
-//	 * @param vendUU
-//	 * @param status
-//	 * @return
-//	 */
-//	@Query("select count(i) from PurchaseInquiryMould i where i.venduu = :venduu and i.status = :status")
-//	public int getCountByVenduuAndStatus(@Param("venduu") long vendUU, @Param("status") short status);
-//
-//	/**
-//	 * 根据企业UU号查询询价单（明细）总数量
-//	 *
-//	 * @param enUU
-//	 * @return
-//	 */
-//	@Query("select count(*) from PurchaseInquiryMould i where i.enuu = :enuu")
-//	public Long getCountByEnuu(@Param("enuu") long enuu);
-//
-//	/**
-//	 * 根据企业UU号查询询价单（明细）总数量
-//	 *
-//	 * @param enUU
-//	 * @return
-//	 */
-//	@Query("select count(*) from PurchaseInquiryMould i where i.enuu = :enuu and i.endDate is not null and  i.endDate <= :date")
-//	public Long getOverdueCountByEnuuAndDate(@Param("enuu") long enuu, @Param("date") Date date);
-//
-//	/**
-//	 * 通过UU和sendStatus找出PurchaseInquiryMould
-//	 *
-//	 * @param uu
-//	 * @param status
-//	 * @return
-//	 */
-//	public List<PurchaseInquiryMould> findByEnuuAndSendStatus(Long uu, short status);
-//	List<PurchaseInquiryMould> findByEnuuAndBackStatus(Long uu, short value);
-//
-//	/**
-//	 * 通过uu和adoptstatus查找purchaseInquiryMould
-//	 *
-//	 * @param uu
-//	 * @param value
-//	 * @return
-//	 */
-//	public List<PurchaseInquiryMould> findByVenduuAndAdoptStatus(Long uu, short value);
-//
-//	/**
-//	 * 按询价单来源ID更新是否提交状态
-//	 *
-//	 */
-//	@Modifying(clearAutomatically = true)
-//	@Query("update PurchaseInquiryMould p set p.check = :check where p.id IN (:ids)")
-//	public void updateByCheck(@Param("check") short check, @Param("ids") Long[] ids);
-//
-//	/**
-//	 * 根据enuu和erpSourceId获取单据
-//	 *
-//	 * @param venduu
-//	 * @param erpSourceId
-//	 * @return
-//	 */
-//	public PurchaseInquiryMould findByEnuuAndErpSourceId(Long enuu, Long erpSourceId);
-//
-//	/**
-//	 * 获得每种单据状态的未读数量
-//	 *
-//	 * @Param ids 未读单据id
-//	 * @return
-//	 */
-//	@Query("select count(p), p.status from PurchaseInquiryMould p where p.id in :ids and (p.overdue is null or p.overdue = 0) and p.valid = 1 group by p.status")
-//	List<Object[]> getUnreadCountEveryStatus(@Param("ids") List<Long> ids);
-//
-//	/**
-//	 * 筛选出已报价单据的id号
-//	 *
-//	 * @param ids
-//	 * @return
-//	 */
-//	@Query("select p.id from PurchaseInquiryMould p where p.id in :ids and p.status=201 and p.adoptStatus is null and p.valid <> 0")
-//	List<Long> findRepliedId(@Param("ids") List<Long> ids);
-//
-//	/**
-//	 * 筛选出待报价单据的id号
-//	 *
-//	 * @param ids
-//	 * @return
-//	 */
-//	@Query("select p.id from PurchaseInquiryMould p where p.id in :ids and p.status=200 and p.adoptStatus is null and p.valid <> 0")
-//	List<Long> findNotReplyId(@Param("ids") List<Long> ids);
 }

src/main/java/com/uas/platform/b2b/dao/PurchaseInquiryMouldItemDao.java

@@ -3,54 +3,8 @@ package com.uas.platform.b2b.dao;
 import com.uas.platform.b2b.model.PurchaseInquiryMouldItem;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
 
 public interface PurchaseInquiryMouldItemDao
 		extends JpaSpecificationExecutor<PurchaseInquiryMouldItem>, JpaRepository<PurchaseInquiryMouldItem, Long> {
 
-	/**
-	 * 按卖家企业ID和询价主记录ID查找
-	 * 
-	 * @param venduu
-	 * @param inquiryMouldId
-	 * @return
-	 */
-	@Query("from PurchaseInquiryMouldItem d where d.inquiryMould.venduu = :venduu and d.inquiryMould.id = :inquiryMouldId")
-	List<PurchaseInquiryMouldItem> findByVenduuAndinquiryMould(@Param("venduu") long venduu,
-			@Param("inquiryMouldId") long inquiryMouldId);
-
-	/**
-	 * 按买家企业ID和明细传报价状态查找询价明细
-	 * 
-	 * @param enuu
-	 * @param backStatus
-	 * @return
-	 */
-	@Query("from PurchaseInquiryMouldItem d where d.inquiryMould.enuu = :enuu and d.inquiryMould.sendStatus = :sendStatus")
-	List<PurchaseInquiryMouldItem> findByEnuuAndSendStatus(@Param("enuu") long enuu,
-			@Param("sendStatus") short sendStatus);
-
-	/**
-	 * 按卖家企业ID和询价明细的报价信息传到卖家ERP的状态查找询价明细
-	 * 
-	 * @param vendUU
-	 * @param replySendStatus
-	 * @return
-	 */
-	@Query("from PurchaseInquiryMouldItem d where d.inquiryMould.venduu = :venduu and d.inquiryMould.replySendStatus = :replySendStatus")
-	List<PurchaseInquiryMouldItem> findByVendUUAndReplySendStatus(long venduu, short replySendStatus);
-
-	/**
-	 * 按卖家企业ID和询价明细的报价信息的采纳结果传到卖家ERP的状态查找询价明细
-	 * 
-	 * @param vendUU
-	 * @param decideStatus
-	 * @return
-	 */
-	@Query("from PurchaseInquiryMouldItem d where d.inquiryMould.venduu = :venduu and d.inquiryMould.adoptStatus = :adoptStatus")
-	List<PurchaseInquiryMouldItem> findByVenduuAndAdoptStatus(long venduu, short adoptStatus);
-
 }

src/main/java/com/uas/platform/b2b/dao/PurchaseNoticeDao.java

@@ -9,37 +9,50 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 发货提醒
+ * 
+ * @author hejq
+ * @date 2018-07-19 11:12
+ */
 @Repository
-@Transactional
 public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNotice>, JpaRepository<PurchaseNotice, Long> {
 
 	/**
-	 * 按买家企业ID和送货提醒来源ID查找送货提醒单
-	 * 
+	 * 通过enUU和来源id查询发货提醒
+	 *
+	 * @param enUU 企业UU
+	 * @param sourceId 来源id
 	 * @return
 	 */
 	List<PurchaseNotice> findByEnUUAndSourceId(long enUU, long sourceId);
 
-	/**
-	 * 按供应商企业ID和传输状态查找送货提醒单
-	 * 
-	 * @return
-	 */
+    /**
+     * 按供应商企业ID和传输状态查找送货提醒单
+     *
+     * @param vendUU 供应商UU
+     * @param sendStatus 发货状态
+     * @return
+     */
 	List<PurchaseNotice> findByVendUUAndSendStatus(long vendUU, Short sendStatus);
 
-	/**
-	 * 按供应商企业ID、是否结案和结案状态查找送货提醒
-	 * 
-	 * @return
-	 */
+    /**
+     * 按供应商企业ID、是否结案和结案状态查找送货提醒
+     *
+     * @param vendUU 供应商UU
+     * @param endStatus 结案状态
+     * @return
+     */
 	List<PurchaseNotice> findByVendUUAndEndStatus(long vendUU, Short endStatus);
 
 	/**
 	 * 按ID集合查找送货提醒
-	 * 
+	 *
+     * @param ids 发货提醒ID
 	 * @return
 	 */
 	@Query("select n from PurchaseNotice n where n.id IN (:ids) and (n.endQty is null or n.endQty < n.qty)")
@@ -48,78 +61,69 @@ public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNoti
 	/**
 	 * 按送货提醒单的供应商企业ID和送货提醒单状态来统计条数
 	 * 
-	 * @param vendUU
-	 * @param status
+	 * @param vendUU 企业UU
+	 * @param status 发货提醒状态
 	 * @return
 	 */
 	@Query("select count(n) from PurchaseNotice n where n.vendUU = :vendUU and n.status = :status and n.waiting = 0")
-	public int getCountByVendUUAndStatus(@Param("vendUU") long vendUU, @Param("status") short status);
+	int getCountByVendUUAndStatus(@Param("vendUU") long vendUU, @Param("status") short status);
 
 	/**
 	 * 按发货单更新通知单的发货数
-	 * 
+	 * @param id 发货单id
 	 */
 	@Modifying(clearAutomatically = true)
+    @Transactional(rollbackFor = SQLException.class)
 	@Query("update PurchaseNotice n set n.endQty=(select sum(s.qty) from SaleSendItem s where s.notice=n) where n.id= :id")
-	public void updateBySend(@Param("id") long id);
+	void updateBySend(@Param("id") long id);
 	
 	/**
 	 * 根据截止日期获取（交货日期）
-	 * @param formDate
-	 * @param endDate
+     *
+	 * @param vendUU 供应商UU
+	 * @param endDate 截止日期
 	 * @return
 	 */
 	@Query("select p.id from PurchaseNotice p where p.vendUU=:vendUU and p.delivery <= :endDate")
-	public List<Long> findByEndDate(@Param("vendUU")Long vendUU, @Param("endDate")Date endDate);
+	List<Long> findByEndDate(@Param("vendUU") Long vendUU, @Param("endDate") Date endDate);
 	
 	/**
 	 * 根据起始日期获取（交货日期）
-	 * @param formDate
-	 * @param endDate
+     *
+	 * @param formDate 起始日期
+	 * @param vendUU 供应商UU
 	 * @return
 	 */
 	@Query("select p.id from PurchaseNotice p where p.vendUU=:vendUU and p.delivery >= :fromDate")
-	public List<Long> findByFromDate(@Param("vendUU")Long vendUU, @Param("fromDate")Date formDate);
+	List<Long> findByFromDate(@Param("vendUU") Long vendUU, @Param("fromDate") Date formDate);
 	
 	/**
 	 * 按送货提醒单的企业UU和送货提醒单状态来统计已发货条数
 	 * 
-	 * @param vendUU
-	 * @param status
-	 * @return
-	 */
-	@Query("select count(n) from PurchaseNotice n where n.enUU = :enUU and n.status = :status and n.waiting = 0")
-	public Long getCountByEnUUAndStatus(@Param("enUU") long enUU, @Param("status") short status);
-	
-	/**
-	 * 按送货提醒单的企业UU和送货提醒单状态来统计未发货条数
-	 * 
-	 * @param vendUU
-	 * @param status
+	 * @param enUU 企业UU
+	 * @param status 发货状态
 	 * @return
 	 */
 	@Query("select count(n) from PurchaseNotice n where n.enUU = :enUU and n.status = :status and n.waiting = 0")
-	public Long getTodoCountByEnUUAndStatus(@Param("enUU") long enUU, @Param("status") short status);
-	
-	/**
-	 * 按送货提醒单的企业UU来统计备货条数
-	 * 
-	 * @param vendUU
-	 * @param status
-	 * @return
-	 */
+	Long getCountByEnUUAndStatus(@Param("enUU") long enUU, @Param("status") short status);
+
+    /**
+     * 按送货提醒单的企业UU来统计备货条数
+     *
+     * @param enUU 企业UU
+     * @return
+     */
 	@Query("select count(n) from PurchaseNotice n where n.enUU = :enUU and n.waiting = 1")
-	public Long getWatingCountByEnUUAndStatus(@Param("enUU") long enUU);
-	
-	/**
-	 * 按送货提醒单的企业UU来统计已取消条数
-	 * 
-	 * @param vendUU
-	 * @param status
-	 * @return
-	 */
+	Long getWatingCountByEnUUAndStatus(@Param("enUU") long enUU);
+
+    /**
+     * 按送货提醒单的企业UU来统计已取消条数
+     *
+     * @param enUU 企业UU
+     * @return
+     */
 	@Query("select count(n) from PurchaseNotice n where n.enUU = :enUU and n.end = 1")
-	public Long getEndCountByEnUUAndStatus(@Param("enUU") long enUU);
+	Long getEndCountByEnUUAndStatus(@Param("enUU") long enUU);
 
 	/**
 	 * 根据供应商UU号获取客户发发货提醒数量
@@ -127,14 +131,14 @@ public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNoti
 	 * @return
 	 */
 	@Query("select count(p) from PurchaseNotice p where p.vendUU = :vendUU")
-	public long countByVendUU(@Param("vendUU")Long vendUU);
+	Long countByVendUU(@Param("vendUU")Long vendUU);
 
-	/**
-	 * 获得每种单据状态的未读数量
-	 *
-	 * @Param ids 未读单据id
-	 * @return
-	 */
+    /**
+     * 获得每种单据状态的未读数量
+     *
+     * @Param ids 未读单据id
+     * @return
+     */
 	@Query("select count(p), p.status from PurchaseNotice p where p.id in :ids and (p.end is null or p.end = 0) and p.waiting=0 group by p.status")
 	List<Object[]> getUnreadCountEveryStatus(@Param("ids") List<Long> ids);
 
@@ -167,11 +171,4 @@ public interface PurchaseNoticeDao extends JpaSpecificationExecutor<PurchaseNoti
 	@Query("update PurchaseNotice set status = :status where id = :noticeId")
 	void updateStatus(@Param("noticeId") Long noticeId, @Param("status") short status);
 
-	/**
-	 * 通过采购单明细id查询对应的所有的发货提醒
-	 *
-	 * @param orderItemId 采购单明细id
-	 * @return
-	 */
-    List<PurchaseNotice> findByOrderItemId(Long orderItemId);
 }

src/main/java/com/uas/platform/b2b/dao/PurchaseNoticeEndDao.java

@@ -0,0 +1,30 @@
+package com.uas.platform.b2b.dao;
+
+import com.uas.platform.b2b.model.PurchaseNoticeEnd;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 发货提醒结案状态
+ *
+ * @author hejq
+ * @date 2018-07-20 9:16
+ */
+@Repository
+public interface PurchaseNoticeEndDao extends JpaRepository<PurchaseNoticeEnd, Long>, JpaSpecificationExecutor<PurchaseNoticeEnd> {
+
+    /**
+     * 通过企业UU和来源id查询发货提醒
+     *
+     * @param enUU 企业UU
+     * @param sourceIdList 来源ID
+     * @return
+     */
+    @Query("select n from PurchaseNoticeEnd n where n.enUU = :enUU and n.sourceId in (:sourceIdList)")
+    List<PurchaseNoticeEnd> findByEnUUAndSourceIdList(@Param("enUU") Long enUU, @Param("sourceIdList") List<Long> sourceIdList);
+}

src/main/java/com/uas/platform/b2b/dao/PurchaseOrderAllDao.java

@@ -1,19 +1,14 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.Date;
-import java.util.List;
-
+import com.uas.platform.b2b.model.PurchaseOrderAll;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-
-import javax.transaction.Transactional;
+import java.util.List;
 
 @Repository
 public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOrderAll>, JpaRepository<PurchaseOrderAll, Long> {
@@ -46,24 +41,6 @@ public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOr
 	@Query("from PurchaseOrderAll where vendUU = :vendUU and sendStatus = :sendStatus and status <> 311")
 	public List<PurchaseOrderAll> findByVendUUAndSendStatus(@Param("vendUU") long vendUU, @Param("sendStatus") short sendStatus);
 
-	/**
-	 * 根据截止日期获取
-	 * @param formDate
-	 * @param endDate
-	 * @return
-	 */
-	@Query("select p.id from PurchaseOrderAll p where p.vendUU=:vendUU and p.date <= :endDate")
-	public List<Long> findByEndDate(@Param("vendUU")Long vendUU, @Param("endDate")Date endDate);
-	
-	/**
-	 * 根据起始日期获取
-	 * @param formDate
-	 * @param endDate
-	 * @return
-	 */
-	@Query("select p.id from PurchaseOrderAll p where p.vendUU=:vendUU and p.date >= :fromDate")
-	public List<Long> findByFromDate(@Param("vendUU")Long vendUU, @Param("fromDate")Date formDate);
-	
 	/**
 	 * 根据企业UU查询采购订单数量（主记录）
 	 * @param enUU
@@ -80,15 +57,6 @@ public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOr
 	@Query("select count(p) from PurchaseOrderAll p where p.vendUU = :vendUU")
 	public long countByVendUU(@Param("vendUU")Long vendUU);
 
-	/**
-	 * 查询购物车信息
-	 * 
-	 * @param uu
-	 * @param value
-	 * @return
-	 */
-	public List<PurchaseOrderAll> findByEnUUAndStatus(Long uu, Short value);
-
 	/**
 	 * 查询购物车数量
 	 * 

src/main/java/com/uas/platform/b2b/dao/PurchaseOrderDao.java

@@ -38,25 +38,6 @@ public interface PurchaseOrderDao extends JpaSpecificationExecutor<PurchaseOrder
 	@Query("select count(o) from PurchaseOrder o where o.vendUU = :vendUU and o.status = :status")
 	public int getCountByVendUUAndStatus(@Param("vendUU") long vendUU, @Param("status") short status);
 
-	/**
-	 * 作为客户，按企业UU和状态统计条数
-	 * 
-	 * @param enUU
-	 * @param status
-	 * @return
-	 */
-	@Query("select count(o) from PurchaseOrder o where o.enUU = :enUU and o.status = :status")
-	public int getPurcCountByEnUUAndStatus(@Param("enUU") long enUU, @Param("status") short status);
-
-	/**
-	 * 按采购单的供应商企业UU来统计条数
-	 * 
-	 * @param enUU
-	 * @return
-	 */
-	@Query("select count(o) from PurchaseOrder o where o.enUU = :enUU")
-	public long getPurcCounByEnUU(@Param("enUU") long enUU);
-
 	/**
 	 * 获得每种单据状态的未读数量
 	 *

src/main/java/com/uas/platform/b2b/dao/PurchaseProofingItemTodoDao.java

@@ -1,13 +1,11 @@
 package com.uas.platform.b2b.dao;
 
+import com.uas.platform.b2b.model.PurchaseProofingItemTodo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.PurchaseProofingItemTodo;
-
 @Repository
 public interface PurchaseProofingItemTodoDao extends JpaSpecificationExecutor<PurchaseProofingItemTodo>, JpaRepository<PurchaseProofingItemTodo, Long> {
 
-
 }

src/main/java/com/uas/platform/b2b/dao/SaleOrderItemDao.java

@@ -5,8 +5,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 /**
  * 只保存明细
  * Created by hejq on 2018-06-19.
@@ -14,12 +12,4 @@ import java.util.List;
 @Repository
 public interface SaleOrderItemDao extends JpaSpecificationExecutor<SaleOrderItem>, JpaRepository<SaleOrderItem, Long> {
 
-    /**
-     * 通过主表id和明细序号查询单据是否存在
-     *
-     * @param puId 主表id
-     * @param number 明细序号
-     * @return
-     */
-    List<SaleOrderItem> findByPuIdAndNumber(Long puId, Short number);
 }

src/main/java/com/uas/platform/b2b/dao/SaleSendAllDao.java

@@ -1,51 +1,12 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.Date;
-import java.util.List;
 
+import com.uas.platform.b2b.model.SaleSendAll;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.SaleSendAll;
-
 @Repository
 public interface SaleSendAllDao extends JpaSpecificationExecutor<SaleSendAll>, JpaRepository<SaleSendAll, Long> {
 	
-	/**
-	 * 根据截止日期获取（发货日期）
-	 * @param formDate
-	 * @param endDate
-	 * @return
-	 */
-	@Query("select s.id from SaleSendAll s where s.enUU=:enUU and s.date <= :endDate")
-	public List<Long> findByEndDate(@Param("enUU")Long enUU, @Param("endDate")Date endDate);
-	
-	/**
-	 * 根据起始日期获取（发货日期）
-	 * @param formDate
-	 * @param endDate
-	 * @return
-	 */
-	@Query("select s.id from SaleSendAll s where s.enUU=:enUU and s.date >= :fromDate")
-	public List<Long> findByFromDate(@Param("enUU")Long enUU, @Param("fromDate")Date formDate);
-	
-	/**
-	 * 根据企业UU查询所有发货单数量
-	 * @param enUU
-	 * @return
-	 */
-	@Query("select count(s) from SaleSendAll s where s.enUU=:enUU")
-	public Long findByVendUU(@Param("enUU")Long enUU);
-	
-	/**
-	 * 根据企业UU和收料状态查询发货单数量(已收料)
-	 * @param custUU
-	 * @param verifyStatus
-	 * @return
-	 */
-	@Query("select count(s) from SaleSendAll s where s.enUU=:enUU and s.verifystatus = :verifyStatus")
-	public Long findByVendUUAndVerifystatus(@Param("enUU")Long enUU,@Param("verifyStatus")Short verifyStatus);
 }

src/main/java/com/uas/platform/b2b/dao/SaleSendDao.java

@@ -1,14 +1,11 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.SaleSend;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.SaleSend;
+import java.util.List;
 
 @Repository
 public interface SaleSendDao extends JpaSpecificationExecutor<SaleSend>, JpaRepository<SaleSend, Long> {
@@ -31,14 +28,6 @@ public interface SaleSendDao extends JpaSpecificationExecutor<SaleSend>, JpaRepo
 	 */
 	List<SaleSend> findByCustUUAndSendStatus(long custUU, Short sendStatus);
 
-	/**
-	 * 计算出货总额
-	 * 
-	 * @return
-	 */
-	@Query("select sum(i.price*i.qty) from SaleSend s inner join s.sendItems as i where s.enUU = :enUU")
-	Double summaryByPriceAndQty(@Param("enUU") long enUU);
-	
 	/**
 	 * 根究卖家UU号和发货单号获取发货单
 	 * @param enUU
@@ -47,8 +36,6 @@ public interface SaleSendDao extends JpaSpecificationExecutor<SaleSend>, JpaRepo
 	 */
 	List<SaleSend> findByEnUUAndCode(Long enUU, String code);
 
-    List<SaleSend> findByEnUUAndCustUUAndCode(Long uu, Long custUU, String code);
-
 	/**
 	 * 通过UUID查询单据是否已存在
 	 *

src/main/java/com/uas/platform/b2b/dao/SaleTenderDao.java

@@ -25,8 +25,6 @@ public interface SaleTenderDao extends JpaSpecificationExecutor<SaleTender>,JpaR
 	@Query("select t from SaleTender t where t.ptId = :tenderId and t.vendUU = :vendUU")
     SaleTender findByPtId(@Param("tenderId")Long tenderId, @Param("vendUU")Long vendUU);
 
-    List<SaleTender> findByEnUUAndCodeAndStatus(Long enUU, String code, String status);
-
     @Query(value = "select count(*) from sale$tender t where t.st_enuu = :enUU and t.st_code = :code and t.st_status <> :status", nativeQuery = true)
     Integer findNumOfBIdEn(@Param("enUU")Long enUU, @Param("code")String code, @Param("status")String status);
 }

src/main/java/com/uas/platform/b2b/dao/ShipAddressDao.java

@@ -1,12 +1,11 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.ShipAddress;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.ShipAddress;
+import java.util.List;
 
 @Repository
 public interface ShipAddressDao extends JpaRepository<ShipAddress, Long>, JpaSpecificationExecutor<ShipAddress> {
@@ -18,13 +17,4 @@ public interface ShipAddressDao extends JpaRepository<ShipAddress, Long>, JpaSpe
 	 * @return
 	 */
 	List<ShipAddress> findByEnuu(Long enuu);
-
-	/**
-	 * 查询默认的收货地址
-	 * 
-	 * @param enuu
-	 * @param isdefault
-	 * @return
-	 */
-	ShipAddress findByEnuuAndIsdefault(Long enuu, Short isdefault);
 }

src/main/java/com/uas/platform/b2b/dao/UserDao.java

@@ -127,18 +127,6 @@ public interface UserDao extends JpaSpecificationExecutor<User>, JpaRepository<U
 			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and u.userEmail = :userEmail")
 	public Page<User> findUserByUserEmailAndEnUU(@Param("userEmail") String userEmail, @Param("enUU") Long enUU, Pageable page);
 
-	/**
-	 * 按电话查询当前企业用户信息
-	 *
-	 * @param userTel
-	 * @param enUU
-	 * @return
-	 */
-	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
-	@Query(value = "select u from User u inner join u.enterprises as e where e.uu = :enUU and u.userTel = :userTel",
-			countQuery = "select count(1) from User u inner join u.enterprises as e where e.uu = :enUU and u.userTel = :userTel")
-	public Page<User> findUserByUserTelAndEnUU(@Param("userTel") String userTel, @Param("enUU") Long enUU, Pageable page);
-
 	/**
 	 * 按企业ID和个人ID查找个人
 	 *

src/main/java/com/uas/platform/b2b/dao/UserPositionDao.java

@@ -1,12 +1,11 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+import com.uas.platform.b2b.model.UserPosition;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.UserPosition;
+import java.util.List;
 
 @Repository
 public interface UserPositionDao extends JpaRepository<UserPosition, Long>, JpaSpecificationExecutor<UserPosition> {
@@ -20,14 +19,6 @@ public interface UserPositionDao extends JpaRepository<UserPosition, Long>, JpaS
 	 */
 	List<UserPosition> getUserByEnuuAndDepartment(Long enuu, String department);
 
-	/**
-	 * 通过企业uu查询所有职位
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	List<UserPosition> getPositonByEnuu(Long enuu);
-
 	/**
 	 * 通过企业uu和职位查询员信息
 	 * 

src/main/java/com/uas/platform/b2b/dao/VendorDao.java

@@ -3,10 +3,8 @@ package com.uas.platform.b2b.dao;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.core.data.repository.GenericRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.QueryHints;
-import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
@@ -44,18 +42,6 @@ public interface VendorDao extends JpaSpecificationExecutor<Vendor>, GenericRepo
 	@Query("from Vendor v where v.vendEnUU = :vendUU and v.custswitch = 1")
 	public List<Vendor> findByVendEnUU(@Param("vendUU") Long vendUU);
 
-	@Query("select v.myEnUU from Vendor v where v.vendEnUU = :vendEnUU")
-	public List<Long> findCustUUByVendEnUU(@Param("vendEnUU") long vendEnUU);
-
-	/**
-	 * 查找我的供应商UU
-	 * 
-	 * @param myEnUU
-	 * @return
-	 */
-	@Query("select v.vendEnUU from Vendor v where v.myEnUU = :myEnUU order by v.vendEnUU")
-	public List<Long> findVendUU(@Param("myEnUU") long myEnUU);
-
 	/**
 	 * 按类型查找供应商
 	 * 
@@ -139,14 +125,4 @@ public interface VendorDao extends JpaSpecificationExecutor<Vendor>, GenericRepo
 	 */
     List<Vendor> findByMyEnUUAndErpstatus(Long myEnuu, Integer status);
 
-    /**
-     * 新增单据时判断客户是否存在以及自动分配客户关系
-     *
-     * @param myenuu
-     * @param myuseruu
-     * @param venduu
-     * @param useruu
-     */
-    @Procedure(procedureName = "INIT_VENDORANDDISTRIBUTE")
-    void initVendorAndDistribute(Long myenuu, Long myuseruu, Long enuu, Long useruu);
 }

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

@@ -1,39 +0,0 @@
-package com.uas.platform.b2b.erp.controller;
-
-import com.uas.platform.b2b.erp.model.AutOrder;
-import com.uas.platform.b2b.erp.service.AutOrderService;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-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.RestController;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.List;
-
-/**
- * 自动生成订单接口
- *
- * Created by hejq on 2018-05-04.
- */
-@RestController
-@RequestMapping("/erp/saleOrder")
-public class AutOrderController {
-
-    @Autowired
-    private AutOrderService orderService;
-    /**
-     * 保存数据
-     *
-     * @param data
-     * @throws UnsupportedEncodingException
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public void saveOrders(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
-        List<AutOrder> orderList = FlexJsonUtils.fromJsonArray(jsonStr, AutOrder.class);
-        orderService.saveOrder(orderList);
-    }
-}

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

@@ -1,53 +0,0 @@
-package com.uas.platform.b2b.erp.controller;
-
-import com.uas.platform.b2b.erp.model.BillOut;
-import com.uas.platform.b2b.erp.service.impl.BillOutService;
-import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
-import com.uas.platform.b2b.service.PurchaseApBillOutService;
-import com.uas.platform.core.logging.BufferedLoggerManager;
-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;
-
-/**
- * 应收开票数据接口
- *
- * @author huangct
- * 
- */
-@Controller
-@RequestMapping("/erp/purchase/BillOut")
-public class BillOutController {
-
-	@Autowired
-	private PurchaseApBillOutService purchaseApBillOutService;
-	
-	@Autowired
-	private BillOutService billOutService;
-
-	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
-
-	/**
-	 * 将ERP的应收开票写到平台
-	 * 
-	 * @param data
-	 * @return
-	 * @throws UnsupportedEncodingException
-	 */
-	@RequestMapping(method = RequestMethod.POST)
-	@ResponseBody
-	public void saveApBills(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
-		List<BillOut> billOuts = FlexJsonUtils.fromJsonArray(jsonStr, BillOut.class);
-		purchaseApBillOutService.saveByItem(billOutService.convertBillOuts(billOuts));
-		logger.log("应收开票单", "上传应收开票单", billOuts.size());
-	}
-}

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

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.erp.controller;
 
-import com.uas.platform.b2b.erp.model.APCheck;
 import com.uas.platform.b2b.erp.model.OrderSendStatusColumn;
 import com.uas.platform.b2b.erp.service.OrderSendStatusService;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;

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

@@ -84,7 +84,7 @@ public class PurchaseAPBillController {
 	 */
 	@RequestMapping(value = "/APBillAdjustment", method = RequestMethod.POST)
 	@ResponseBody
-	public void APBillAdjustment(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public void APBillAdjustment(@RequestParam("data") String data) throws Exception {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<PurchaseAPBill> apBills = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseAPBill.class);
 		List<ApbillAdjustment> adjusts = purchaseAPBillService.convertApbillAdjustment(apBills);

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

@@ -21,6 +21,12 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.List;
 
+/**
+ * 采购预测
+ * 
+ * @author hejq
+ * @date 2018-07-23 11:07
+ */
 @Controller
 @RequestMapping("/erp/purchase/forecast")
 public class PurchaseForecastController {