账户中心切换成新版，分支合并

pom.xml

@@ -9,6 +9,7 @@
         <groupId>com.uas.platform</groupId>
         <artifactId>platform</artifactId>
         <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../platform</relativePath>
     </parent>
     <profiles>
         <profile>
@@ -29,6 +30,8 @@
                 <!-- static plugin -->
                 <static-path>static</static-path>
             </properties>
+
+
         </profile>
         <profile>
             <!-- 生产环境 -->
@@ -172,10 +175,17 @@
             <artifactId>hibernate-ehcache</artifactId>
         </dependency>
         <!-- jdbc -->
+        <!--oracle-->
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc6</artifactId>
         </dependency>
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.21</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-orm</artifactId>
@@ -289,6 +299,12 @@
             </exclusions>
         </dependency>
 
+        <!--<dependency>-->
+            <!--<groupId>com.uas.sso</groupId>-->
+            <!--<artifactId>sso-common</artifactId>-->
+            <!--<version>0.0.1-SNAPSHOT</version>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>com.uas.ps</groupId>
             <artifactId>ps-core</artifactId>
@@ -353,7 +369,7 @@
         </resources>
         <!-- 在maven生命周期validate阶段生成timestamp -->
         <plugins>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
                 <version>1.3</version>
@@ -366,10 +382,12 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
-                    <items>
-                        <item>timestamp</item>
-                    </items>
+                    <configuration>
+                        <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
+                        <items>
+                            <item>timestamp</item>
+                        </items>
+                    </configuration>
                 </configuration>
             </plugin>
             <plugin>
@@ -384,7 +402,7 @@
                 <groupId>com.samaxes.maven</groupId>
                 <artifactId>minify-maven-plugin</artifactId>
                 <version>1.7.4</version>
-                <!-- 静态文件压缩  -->
+                &lt;!&ndash; 静态文件压缩  &ndash;&gt;
                 <executions>
                     <execution>
                         <id>default-minify</id>
@@ -445,7 +463,7 @@
                 <groupId>com.uas.plugins</groupId>
                 <artifactId>static-maven-plugin</artifactId>
                 <version>0.0.2-SNAPSHOT</version>
-                <!-- 静态资源分离  -->
+                &lt;!&ndash; 静态资源分离  &ndash;&gt;
                 <executions>
                     <execution>
                         <id>default-static</id>
@@ -463,6 +481,7 @@
                                 <sourceInclude>resources/tpl/**/*.html</sourceInclude>
                                 <sourceInclude>WEB-INF/views/**/*.html</sourceInclude>
                             </sourceIncludes>
+                            http://static.ubtob.com/css/index.css?_v=1450321871828
                             <versionSuffix>
                                 <suffix>?_v=${timestamp}</suffix>
                                 <exclude>*/require.js,*.min.js,*.min.css</exclude>
@@ -488,7 +507,7 @@
                         </resource>
                     </webResources>
                 </configuration>
-            </plugin>
+            </plugin>-->
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat7-maven-plugin</artifactId>
@@ -500,7 +519,7 @@
                 </configuration>
             </plugin>
         </plugins>
-        <pluginManagement>
+        <!--<pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
@@ -535,7 +554,7 @@
                     </configuration>
                 </plugin>
             </plugins>
-        </pluginManagement>
+        </pluginManagement>-->
     </build>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -377,20 +377,16 @@ public class BaseInfoController {
 		String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
 		InputStream is = null;
 		Workbook workbook = null;
-//		try {
-			is = uploadItem.getFile().getInputStream();
-			if ("xls".equals(suffix)) {
-				workbook = new HSSFWorkbook(is);
-			} else if ("xlsx".equals(suffix)) {
-				workbook = new XSSFWorkbook(is);
-			} else {
-				throw new IllegalOperatorException("文件格不正确，请上传.xls或.xlsx的文件");
-			}
-			map = baseInfoService.releaseByWorkbook(workbook);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
-		logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了物料，数量为" + map.size());
+		is = uploadItem.getFile().getInputStream();
+		if ("xls".equals(suffix)) {
+			workbook = new HSSFWorkbook(is);
+		} else if ("xlsx".equals(suffix)) {
+			workbook = new XSSFWorkbook(is);
+		} else {
+			throw new IllegalOperatorException("文件格不正确，请上传.xls或.xlsx的文件");
+		}
+		map = baseInfoService.releaseByWorkbook(workbook);
+		logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了物料，数量为" + map.get("success"));
 		return map;
 	}
 	
@@ -485,7 +481,37 @@ public class BaseInfoController {
 	@ResponseBody
 	public SPage<UserSpaceDetail> getUserSpaceDetails(PageParams params, String keyword)
 			throws Exception {
-		return baseInfoService.getUserSpaceDetails(params, keyword);
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		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)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
+	}
+
+	/**
+	 * 顶部通过关键词查询账户中心的相关的企业信息
+	 *
+	 * @param keyword
+	 * @param params
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/getUserSpaceDetails/done", method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<UserSpaceDetail> getUserSpaceDetailsDone(PageParams params, String keyword)
+			throws Exception {
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		pageParams.getFilters().put("searchstatus", Constant.YES);
+		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)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return baseInfoService.getUserSpaceDetails(pageParams, keyword);
 	}
 	
 	/**

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

@@ -129,4 +129,14 @@ public class CustomerController {
 		return customerService.findAllByCustUU(user.getEnterprise().getUu(), custUU);
 	}
 
+    /**
+     * 获取分配的客户信息
+     *
+     * @return
+     */
+	@RequestMapping(value = "/distribute", method = RequestMethod.GET)
+    @ResponseBody
+    public List<Long> getCustomerDistribute() {
+	    return customerService.getCustomerDistribute();
+    }
 }

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

@@ -1,76 +0,0 @@
-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.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.uas.platform.b2b.model.EnterpriseTogs;
-import com.uas.platform.b2b.service.EnterTogsService;
-
-@Controller
-@RequestMapping(value = "/entogs")
-public class EnterTogsController {
-	
-	@Autowired
-	private EnterTogsService enterTogsService;
-	
-	/**
-	 * 编辑企业标签
-	 */
-	@RequestMapping(value = "/edit", method = RequestMethod.POST)
-	@ResponseBody
-	private EnterpriseTogs EditTogs(@RequestBody Long id) {
-		return enterTogsService.findById(id);
-	}
-
-	/**
-	 * 删除企业标签
-	 * 
-	 * @param id
-	 */
-	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-	@ResponseBody
-	private void DeleteTogs(@RequestBody Long id) {
-		enterTogsService.deleteById(id);
-	}
-
-	/**
-	 * 查看默系统认标签列表
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/getTogsList", method = RequestMethod.GET)
-	private List<EnterpriseTogs> getAllDefalutTogs() {
-		return enterTogsService.getAllDefalutTogs();
-	}
-
-	/**
-	 * 通过营业执照查询该企业的标签
-	 * 
-	 * @param businessCode
-	 * @return
-	 */
-	@RequestMapping(value = "/getTogsByBusCode", method = RequestMethod.GET)
-	@ResponseBody
-	private List<EnterpriseTogs> getTogsByBusCode(@RequestBody String businessCode) {
-		return enterTogsService.findByBusCode(businessCode);
-	}
-
-	/**
-	 * 当前企业增加标签
-	 * 
-	 * @param name
-	 * @param paraphrase
-	 * @return
-	 */
-	@RequestMapping(value = "/createNewTog", method = RequestMethod.POST)
-	@ResponseBody
-	private EnterpriseTogs createNewTog(@RequestBody String name, String paraphrase) {
-		return enterTogsService.createNewTogByNameAndParaphrase(name, paraphrase);
-	}
-}

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

@@ -1,88 +0,0 @@
-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.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.uas.platform.b2b.model.EnterpriseNews;
-import com.uas.platform.b2b.service.BaseInfoService;
-import com.uas.platform.b2b.service.EnterpriseNewsService;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
-import com.uas.search.b2b.model.SPage;
-
-/**
- * 企业发布动态Controller
- * 
- * @author hejq
- * @time 创建时间：2017年2月13日
- */
-@Controller
-@RequestMapping(value = "/enterpriseNews")
-public class EnterpriseNewsController {
-
-	@Autowired
-	private EnterpriseNewsService enterpriseNewsService;
-
-	@Autowired
-	private BaseInfoService baseInfoService;
-
-	/**
-	 * 写一条新的动态
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value="/createNews",method = RequestMethod.POST)
-	@ResponseBody
-	private EnterpriseNews CreateNews(@RequestBody String json) {
-		EnterpriseNews news = FlexJsonUtils.fromJson(json, EnterpriseNews.class);
-		return enterpriseNewsService.save(news);
-	}
-	
-	/**
-	 * 查询单个企业的所有动态
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/singleEnterNews", method = RequestMethod.GET)
-	@ResponseBody
-	private SPage<EnterpriseNews> getSingleEnterNews(@RequestBody String businessCode) {
-		if (businessCode == null) {
-			businessCode = SystemSession.getUser().getEnterprise().getEnBussinessCode();
-		}
-		return enterpriseNewsService.findByBusinessCode(businessCode);
-	}
-
-	/**
-	 * 查询所有
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/multipleEnterNews", method = RequestMethod.GET)
-	@ResponseBody
-	private SPage<EnterpriseNews> getmultipleEnterNews() {
-		try {
-			List<BasePartnersInfo> parters = baseInfoService
-					.getPartnersInfosByBusinessCode(SystemSession.getUser().getEnterprise().getEnBussinessCode());
-			for (BasePartnersInfo parter : parters) {
-				return enterpriseNewsService.findByBusinessCode(parter.getVendUID());
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	@RequestMapping(value = "/reprinted",method = RequestMethod.POST)
-	@ResponseBody
-	private EnterpriseNews reprintedTip(@RequestBody Long id) {
-		return enterpriseNewsService.reprintedTip(id);
-	}
-}

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

@@ -1,11 +1,17 @@
 package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.InvitationRecordService;
+import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.b2b.v2.service.InviteRecordService;
+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.PageParams;
 import com.uas.search.b2b.model.SPage;
@@ -19,7 +25,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -32,6 +40,11 @@ public class InvitationRecordController {
 	@Autowired
 	private SearchService searchService;
 
+    private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    @Autowired
+    private InviteRecordService inviteRecordService;
+
 	/**
 	 * 邀请开通平台
 	 * 
@@ -41,6 +54,7 @@ public class InvitationRecordController {
 	@RequestMapping(value = "/invite", method = RequestMethod.POST)
 	private ModelMap invite(String formStore) {
 		InvitationRecord record = JSONObject.parseObject(formStore, InvitationRecord.class);
+		logger.log("邀请注册", "增加邀请注册信息", record.getVendname());
 		return invitationRecordService.invite(record);
 	}
 
@@ -52,6 +66,7 @@ public class InvitationRecordController {
 	 */
 	@RequestMapping(value = "/reInvite/{id}", method = RequestMethod.POST)
 	private ModelMap reInvite(@PathVariable Long id) {
+        logger.log("邀请注册", "再次邀请", "关联id:" + id);
 		return invitationRecordService.reInvite(id);
 	}
 
@@ -63,6 +78,7 @@ public class InvitationRecordController {
 	 */
 	@RequestMapping(value = "/record/{id}", method = RequestMethod.GET)
 	private InvitationRecord getRecordById(@PathVariable Long id) {
+        logger.log("邀请注册", "查询邀请记录", "关联id:" + id);
 		return invitationRecordService.getRecordById(id);
 	}
 
@@ -74,11 +90,12 @@ public class InvitationRecordController {
 	@RequestMapping(value = "/records", method = RequestMethod.GET)
 	private SPage<InvitationRecord> getRecords(PageParams params, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
-		pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
+//		pageParams.getFilters().put("in_enuu", SystemSession.getUser().getEnterprise().getUu());
 		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)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+        logger.log("邀请注册", "查询邀请记录（个人）");
 		return invitationRecordService.getRecords(pageParams, keyword);
 	}
 
@@ -94,6 +111,7 @@ public class InvitationRecordController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+        logger.log("邀请注册", "查询邀请记录（企业）");
 		return invitationRecordService.getRecords(pageParams, keyword);
 	}
 
@@ -114,6 +132,7 @@ public class InvitationRecordController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+        logger.log("邀请注册", "查询邀请记录（企业）--已激活");
 		return invitationRecordService.getRecords(pageParams, keyword);
 	}
 
@@ -124,13 +143,43 @@ public class InvitationRecordController {
 	 * @return
 	 */
 	@RequestMapping(value = "/enterpriseList/{name}", method = RequestMethod.GET)
-	private List<Enterprise> getEnterpriseListByName(@PathVariable String name) {
+	private List<EnterpriseBaseInfo> getEnterpriseListByName(@PathVariable String name) {
 		return invitationRecordService.findByName(name);
 	}
 
-	@RequestMapping(value = "/setenterprise/{uu}", method = RequestMethod.POST)
-	private ModelMap setenterprise(@PathVariable Long uu) {
-		return null;
-
+	/**
+	 * 获取邀请链接接口
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/inviteUrl", method = RequestMethod.GET)
+	private ModelMap setenterprise() {
+        String url = ContextUtils.getBean(SysConf.class).getRegisterUrl();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        url = url + "?inviteUserCode=" + SystemSession.getUser().getUserUU() + "&inviteuid="
+                + SystemSession.getUser().getEnterprise().getEnBussinessCode() + "&invitationTime=" + sdf.format(new Date()) + "&source=B2B";
+        logger.log("邀请注册", "获取邀请链接", url);
+		return new ModelMap("url", url);
 	}
+
+    /**
+     * 邀请注册如果已注册增加添加合作伙伴接口
+     *
+     * @param inviteEnUU 被邀请的企业UU
+     * @param inviteUserName 被邀请的用户姓名
+     * @param inviteUserTel 被邀请的用户联系方式
+     * @return
+     * @throws Exception
+     */
+	@RequestMapping(value = "/addPart", method = RequestMethod.POST)
+    private ModelMap addPartner(Long inviteEnUU, String inviteUserName, String inviteUserTel) throws Exception {
+        Long enUU = SystemSession.getUser().getEnterprise().getUu();
+        Long userUU = SystemSession.getUser().getUserUU();
+        String app = "B2B";
+        if (enUU.equals(inviteEnUU)) {
+            throw new IllegalOperatorException("不能添加自己企业为合作伙伴");
+        }
+        logger.log("邀请注册", "添加合作伙伴", "添加企业UU：" + inviteEnUU + ",用户:" + inviteUserName);
+        return inviteRecordService.addPartner(userUU, enUU, inviteEnUU, inviteUserName, inviteUserTel, app);
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.model.PurchaseApBillOut;
 import com.uas.platform.b2b.service.PurchaseApBillOutService;
 import com.uas.platform.b2b.service.PurchaseApCheckService;
 import org.apache.commons.io.IOUtils;
@@ -86,16 +85,20 @@ public class PiaoPlusNoticeController {
 		String data = IOUtils.toString(request.getInputStream(), request.getCharacterEncoding());
 		JSONObject jsonObject = new JSONObject();
 		JSONObject noticeData = JSONObject.parseObject(data);
-		String taxpayerId = noticeData.getString("taxpayerId");
+		String sysOrderNo = noticeData.getString("sysOrderNo");
+		String orderNo = noticeData.getString("orderNo");
 		String fpdm = noticeData.getString("fpdm");//发票代码
-		String fphm = noticeData.getString("fphm");//发票号码
+		String code = noticeData.getString("code");//0000 成功
+		String fplx = noticeData.getString("fplx");
 		String billRequestNum = noticeData.getString("billRequestNum");//请求流水号
-		String orderNo = noticeData.getString("orderNo");
+		String totalMoney = noticeData.getString("totalMoney");
 		String reIssue = noticeData.getString("reIssue");//是否允许重开 0允许，1不允许
-		String code = noticeData.getString("code");//0000 成功
 		String resMsg = noticeData.getString("resMsg");
+		String taxpayerId = noticeData.getString("taxpayerId");
+		String fphm = noticeData.getString("fphm");//发票号码
 
-		PurchaseApBillOut apBillOut = purchaseApBillOutService.findByCode(orderNo);
+		//TODO 查询出错
+		/*PurchaseApBillOut apBillOut = purchaseApBillOutService.findByCode(sysOrderNo);
 
 		apBillOut.setNsrsbh(taxpayerId);
 		apBillOut.setInfoTypeCode(fpdm);
@@ -107,7 +110,7 @@ public class PiaoPlusNoticeController {
 		//修改开票单状态
 		apBillOut.setCheckStatus("已开票");
 
-		purchaseApBillOutService.save(apBillOut);
+		purchaseApBillOutService.save(apBillOut);*/
 
 		jsonObject.put("code", "0000");
 		jsonObject.put("resMsg", "开票成功！");

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

@@ -0,0 +1,45 @@
+package com.uas.platform.b2b.controller;
+
+import com.uas.platform.b2b.service.PurchaseInquiryService;
+import com.uas.platform.b2b.service.PurchaseOrderService;
+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.RestController;
+
+/**
+ * Created by dongbw
+ * 18/03/18 11:34.
+ */
+@RestController
+@RequestMapping("/batch/covertouser")
+public class ProductUserBatchController {
+
+    @Autowired
+    private PurchaseInquiryService purchaseInquiryService;
+
+    @Autowired
+    private PurchaseOrderService purchaseOrderService;
+
+    /**
+     * 根据企业UU批量处理询价单明细中的物料转入供应商报价人个人物料
+     * @param enUU 采购方企业UU
+     */
+    @RequestMapping(value = "/inquiryItem", method = RequestMethod.GET)
+    public void coverInquiryItemProdToUser (Long enUU) throws Exception {
+        //TODO 添加不需要enUU的处理
+        System.out.println("进入接口");
+        purchaseInquiryService.coverInquiryItemProdToUser(enUU);
+    }
+
+    /**
+     * 根据企业UU批量处理采购单中的物料转入供应商报价人个人物料
+     * @param enUU 采购方企业UU
+     */
+    @RequestMapping(value = "/purchaseOrder", method = RequestMethod.GET)
+    public void coverPurchaseOrderItemProdToUser (Long enUU) throws Exception {
+        //TODO 添加不需要enUU的处理
+        System.out.println("进入接口");
+        purchaseOrderService.coverPurchaseOrderItemProdToUser(enUU);
+    }
+}

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

@@ -112,13 +112,13 @@ public class ProductUsersController {
             } else if ("xlsx".equals(suffix)) {
                 workbook = new XSSFWorkbook(is);
             } else {
-                throw new IllegalOperatorException("文件格不正确，请上传.xls或.xlsx的文件");
+                throw new IllegalOperatorException("文件格式不正确，请上传.xls或.xlsx的文件");
             }
             map = productUsersService.releaseByWorkbook(workbook);
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //        }
-        logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了个人物料，数量为" + map.size());
+        logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了个人物料，数量为" + map.get("success"));
         return map;
     }
 

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

@@ -4,18 +4,29 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.ps.InquiryUtils;
+import com.uas.platform.b2b.service.CustomerService;
 import com.uas.platform.b2b.service.DefaultValueService;
 import com.uas.platform.b2b.service.EnquiryService;
+import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SysConf;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import com.uas.ps.core.util.CollectionUtils;
+import com.uas.ps.core.util.StringUtils;
 import com.uas.search.b2b.model.SPage;
 import org.springframework.beans.factory.annotation.Autowired;
 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.RestController;
+import org.springframework.web.servlet.ModelAndView;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 /**
@@ -35,6 +46,9 @@ public class PubInquiryListController {
     @Autowired
     private DefaultValueService defaultValueService;
 
+    @Autowired
+    private CustomerService customerService;
+
     /**
      * 获取所有企业发布的公共询价列表信息
      *
@@ -49,7 +63,7 @@ public class PubInquiryListController {
         logger.log("公共询价单", "查看公共询价单列表");
         PageInfo pageInfo = new PageInfo(params);
         SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        return enquiryService.fingByPageInfo(pageInfo, filter);
+        return enquiryService.fingByPageInfo(pageInfo, filter, null);
     }
 
     /**
@@ -127,4 +141,49 @@ public class PubInquiryListController {
         String key = "currency";
         return defaultValueService.findByKindAndKey(kind, key);
     }
+
+    /**
+     * 导出公共询价信息
+     *
+     * @param keyword 关键字
+     * @param fromDate 开始日期
+     * @param endDate 截止日期
+     * @param state 状态
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/xls", method = RequestMethod.GET)
+    public ModelAndView exportInquiries(String keyword, Long fromDate, Long endDate, String state) throws Exception {
+        PageInfo pageInfo = new PageInfo(1, JxlsExcelView.MAX_SIZE, 0);
+        SearchFilter filter = new SearchFilter();
+        filter.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+        filter.setFromDate(fromDate);
+        filter.setEndDate(endDate);
+        filter.setKeyword(keyword);
+        filter.setUserUU(SystemSession.getUser().getUserUU());
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.addObject("dateFormat", dateFormat);
+        if (StringUtils.isEmpty(state) || state.equals("all")) {
+            modelAndView.addObject("state", "全部");
+            modelAndView.addObject("data", enquiryService.fingByPageInfo(pageInfo, filter, null).getContent());
+            modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/publicInquiry", "公共询价单列表"));
+            logger.log("公共询价单", "导出Excel列表", "导出公共询价列表（全部）");
+        } else if (state.equals("customer")) {// 导出客户询价列表
+            modelAndView.addObject("state", "我的客户询价");
+            List<Long> uuList = customerService.getCustomerDistribute();
+            if (CollectionUtils.isEmpty(uuList)) {
+                uuList.add(0l);
+            }
+            modelAndView.addObject("data", enquiryService.fingByPageInfo(pageInfo, filter, uuList).getContent());
+            modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/publicInquiry", "客户公共询价列表"));
+            logger.log("公共询价单", "导出Excel列表", "导出我的客户询价列表");
+        } else if (state.equals("remind")){
+            modelAndView.addObject("state", "推荐报价列表");
+            modelAndView.addObject("data", InquiryUtils.getRemind(pageInfo, filter, SystemSession.getUser().getUserUU(), SystemSession.getUser().getEnterprise().getUu()).getContent());
+            modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/public/inquiryRemind", "推荐报价列表"));
+            logger.log("公共询价单", "导出Excel列表", "导出推荐报价列表");
+        }
+        return modelAndView;
+    }
 }

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

@@ -189,7 +189,7 @@ public class PurcOrderController {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		logger.log("新增采购导入物料", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了物料，数量为" + map.size());
+		logger.log("新增采购导入物料", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了物料，数量为" + map.get("success"));
 		return map;
 	}
 	

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

@@ -178,7 +178,7 @@ public class PurcProductController {
 //		} catch (Exception e) {
 //			e.printStackTrace();
 //		}
-		logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了物料，数量为" + map.size());
+		logger.log("商品批次", "[" + SystemSession.getUser().getUserName() + "]通过excel导入了物料，数量为" +  map.get("success"));
 		return map;
 	}
 

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

@@ -1,30 +1,5 @@
 package com.uas.platform.b2b.controller;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import com.uas.sso.entity.UserAccount;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.mobile.device.Device;
-import org.springframework.mobile.device.DeviceResolver;
-import org.springframework.mobile.device.LiteDeviceResolver;
-import org.springframework.mobile.device.site.SitePreference;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
-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.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.SigninLog;
 import com.uas.platform.b2b.model.User;
@@ -38,6 +13,24 @@ import com.uas.sso.AuthToken;
 import com.uas.sso.SSOConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.mobile.device.Device;
+import org.springframework.mobile.device.DeviceResolver;
+import org.springframework.mobile.device.LiteDeviceResolver;
+import org.springframework.mobile.device.site.SitePreference;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 @SuppressWarnings("deprecation")
 @RestController
@@ -55,6 +48,7 @@ public class SecurityController {
 	@ResponseStatus(value = HttpStatus.OK)
 	@ResponseBody
 	public ModelMap logout(HttpServletRequest request, HttpServletResponse response, HttpSession session) throws IOException {
+		response.setContentType("text/html;charset=UTF-8");
 		session.invalidate();
 		SSOHelper.clearLogin(request, response);
 		SystemSession.clear();

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

@@ -1,43 +0,0 @@
-package com.uas.platform.b2b.controller;
-
-import org.springframework.stereotype.Controller;
-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.uas.platform.b2b.model.TipReprintedLog;
-import com.uas.search.b2b.model.SPage;
-
-@Controller
-@RequestMapping(value = "/tipReprintedLog")
-public class TipReprintedLogController {
-
-	/**
-	 * 新增一条转载记录
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/newrecord", method = RequestMethod.POST)
-	@ResponseBody
-	private TipReprintedLog AddNewRecord(@RequestBody Long originaluu, Long originalenuu) {
-		return null;
-	}
-
-	/**
-	 * 转载记录
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = "/reprintedRecords", method = RequestMethod.GET)
-	@ResponseBody
-	private SPage<TipReprintedLog> getReprintedRecords(@RequestBody Long useruu) {
-		return null;
-	}
-	
-	@RequestMapping(value = "/beReprintedRecords", method = RequestMethod.GET)
-	@ResponseBody
-	private SPage<TipReprintedLog> getBeReprintedRecords(@RequestBody Long originaluu) {
-		return null;
-	}
-}

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

@@ -1,43 +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.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.Cart;
-
-@Repository
-public interface CartDao extends JpaSpecificationExecutor<Cart>, JpaRepository<Cart, Long> {
-
-	/**
-	 * 通过当前企业uu查询所有未提交的购物车信息
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	List<Cart> findByEnUUAndStatus(Long enuu, Integer status);
-
-	/**
-	 * 查询当前企业待处理的购物车数量
-	 * 
-	 * @param enuu
-	 * @param status
-	 * @return
-	 */
-	@Query("select count(o) from Cart o where o.enUU = :enUU and o.status = :status")
-	public int getTodoCountByEnUUAndStatus(@Param("enUU") long enUU, @Param("status") int status);
-
-	/**
-	 *  查询当前用户在当前企业中待处理的购物车数量
-	 * @param uu
-	 * @param userUU
-	 * @param value
-	 * @return
-	 */
-	@Query("select count(o) from Cart o where o.enUU = :enUU and o.userUU = :userUU and o.status = :status")
-	int getTodoCountByEnUUAndUserUUAndStatus(@Param("enUU") long enUU, @Param("userUU") long userUU, @Param("status") int status);
-}

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

@@ -1,12 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-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.CartDetail;
-
-@Repository
-public interface CartDetailDao extends JpaRepository<CartDetail, Long>, JpaSpecificationExecutor<CartDetail> {
-
-}

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

@@ -1,14 +1,12 @@
 package com.uas.platform.b2b.dao;
 
+import com.uas.platform.b2b.model.Customer;
+import com.uas.platform.core.data.repository.GenericRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 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.Customer;
-import com.uas.platform.core.data.repository.GenericRepository;
-
 import java.util.List;
 
 @Repository
@@ -22,19 +20,4 @@ public interface CustomerDao extends JpaSpecificationExecutor<Customer>, Generic
      */
     @Query("select count(p), p.status from Customer p where p.id in :ids group by p.status")
     List<Object[]> getUnreadCountEveryStatus(@Param("ids") List<Long> ids);
-
-    /**
-     * 初始化客户分配
-     *
-     * @param enuu 企业uu号
-     * @param useruu 个人uu号
-     */
-    @Procedure(procedureName = "init_customer")
-    void initCustomer(Long enuu, Long useruu);
-
-    /**
-     * 初始化客户分配，自动寻找符合条件的企业、用户进行分配
-     */
-    @Procedure(procedureName = "init_customer_all")
-    void initCustomerAll();
 }

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

@@ -1,38 +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.EnterpriseTogs;
-
-@Repository
-public interface EnterTogsDao extends JpaRepository<EnterpriseTogs, Long>, JpaSpecificationExecutor<EnterpriseTogs> {
-
-	/**
-	 * 通过businessCode查询该企业所有的标签
-	 * 
-	 * @param businessCode
-	 * @return
-	 */
-	public List<EnterpriseTogs> findByEnbusinesscode(String businessCode);
-
-	/**
-	 * 通过营业执照和标签名称查询信息
-	 * 
-	 * @param businessCode
-	 * @param name
-	 * @return
-	 */
-	public EnterpriseTogs findByEnbusinesscodeAndName(String businessCode, String name);
-
-	/**
-	 * 查询默认标签
-	 * 
-	 * @param isdefault
-	 * @return
-	 */
-	public List<EnterpriseTogs> findByIsdefault(Short isdefault);
-}

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

@@ -1,9 +1,7 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
-import javax.persistence.QueryHint;
-
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.EnterpriseInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -12,8 +10,8 @@ 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.Enterprise;
-import com.uas.platform.b2b.model.EnterpriseInfo;
+import javax.persistence.QueryHint;
+import java.util.List;
 
 @Repository
 public interface EnterpriseDao extends JpaSpecificationExecutor<Enterprise>,JpaRepository<Enterprise, Long> {
@@ -96,4 +94,12 @@ public interface EnterpriseDao extends JpaSpecificationExecutor<Enterprise>,JpaR
 	 */
 	List<Enterprise> findByEnBussinessCodeAndEnName(String enBussinessCode, String enName);
 
+	/**
+	 * 按企业名称精确查询企业信息
+	 *
+	 * @param name 企业名称
+	 * @return
+	 */
+	@Query("from Enterprise e where e.enName = :name")
+	List<Enterprise> findByName(@Param("name") String name);
 }

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

@@ -1,21 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-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.EnterpriseNews;
-import com.uas.search.b2b.model.SPage;
-
-@Repository
-public interface EnterpriseNewsDao
-		extends JpaRepository<EnterpriseNews, Long>, JpaSpecificationExecutor<EnterpriseNewsDao> {
-
-	/**
-	 * 通过BusinessCode查询所有动态
-	 * 
-	 * @param businessCode
-	 * @return
-	 */
-	SPage<EnterpriseNews> findByBusinessCode(String businessCode);
-}

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

@@ -37,4 +37,12 @@ public interface InvitationRecordDao
 	 * @return
 	 */
 	public InvitationRecord findByEnuuAndVendname(Long enuu, String vendname);
+
+	/**
+	 * 通过被邀请企业的名称查询邀请记录
+	 *
+	 * @param vednName 被邀请的企业名称
+	 * @return
+	 */
+	List<InvitationRecord> findByVendname(String vednName);
 }

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.MakeAcceptIndex;
-
-@Repository
-public interface MakeAcceptIndexDao extends JpaRepository<MakeAcceptIndex, Long> {
-
-	@Query("select i.key from MakeAcceptIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.MakeOrderChangeIndex;
-
-@Repository
-public interface MakeOrderChangeIndexDao extends JpaRepository<MakeOrderChangeIndex, Long> {
-
-	@Query("select i.key from MakeOrderChangeIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.MakeOrderIndex;
-
-@Repository
-public interface MakeOrderIndexDao extends JpaRepository<MakeOrderIndex, Long> {
-
-	@Query("select i.key from MakeOrderIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,14 +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.Query;
-import org.springframework.data.repository.query.Param;
-
-import com.uas.platform.b2b.model.MakeReturnIndex;
-
-public interface MakeReturnIndexDao extends JpaRepository<MakeReturnIndex, Long>{
-	@Query("select i.key from MakeReturnIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-}

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

@@ -0,0 +1,49 @@
+package com.uas.platform.b2b.dao;
+
+import com.uas.platform.b2b.model.NotExistProduct;
+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.List;
+
+/**
+ * 平台不存在的ERP物料编号数据库操作
+ *
+ * Created by hejq on 2018-03-14.
+ */
+@Repository
+public interface NotExistProductDao extends JpaSpecificationExecutor<NotExistProduct>, JpaRepository<NotExistProduct, Long> {
+
+    /**
+     * 通过企业UU和下载状态查询平台不存在的物料信息
+     *
+     * @param enuu 企业UU
+     * @param status 下载状态
+     * @return
+     */
+    List<NotExistProduct> findByEnuuAndStatus(Long enuu, Integer status);
+
+    /**
+     * 更新下载状态
+     *
+     * @param id id
+     */
+    @Modifying
+    @Transactional
+    @Query("update NotExistProduct set status = 203 where id = :id")
+    void updateStatus(@Param("id") Long id);
+
+    /**
+     * 通过企业和物料编号查询是否存在该条记录
+     *
+     * @param enuu 企业UU
+     * @param code 物料编号
+     * @return
+     */
+    List<NotExistProduct> findByEnuuAndCode(Long enuu, String code);
+}

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

@@ -1,13 +1,13 @@
 package com.uas.platform.b2b.dao;
 
 import com.uas.platform.b2b.model.Product;
-import org.springframework.data.jpa.repository.*;
+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.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import javax.persistence.QueryHint;
-import javax.transaction.Transactional;
 import java.util.List;
 
 @Repository
@@ -133,33 +133,6 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
 	 */
 	public List<Product> findByEnUUAndStandard(Long enuu, Short standard);
 
-	/**
-	 * 通过uu查询非标准器件进行存储
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	@Procedure(procedureName = "PRODUCT$MATCHES")
-	public String upateResultByEnuu(Long enuu);
-
-	/**
-	 * 通过uu查询非标准器件进行存储
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	@Procedure(procedureName = "PRODUCT$MATCHES_SALE")
-	public String upateResultByEnuuForSale(Long enuu);
-
-	/**
-	 * 通过uu查询非标准器件进行存储
-	 * 
-	 * @param enuu
-	 * @return
-	 */
-	@Procedure(procedureName = "PRODUCT$MATCHES_PURC")
-	public String upateResultByEnuuForPurc(Long enuu);
-
 	/**
 	 * 根据状态更新数据
 	 * 
@@ -190,6 +163,18 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      */
     public List<Product> findByTitleAndCmpCodeAndBrandAndEnUU(String title, String cmpcode, String brand, Long enUU);
 
+	/**
+	 * 通过企业UU，物料名称、规格、品牌（非标准）、型号
+	 *
+	 * @param enUU 企业uu
+	 * @param title  名称
+	 * @param spec 规格
+	 * @param cmpcode 型号
+	 * @param brand 品牌
+	 * @return
+	 */
+	public List<Product> findByTitleAndSpecAndCmpCodeAndBrandAndEnUU(String title, String spec, String cmpcode, String brand, Long enUU);
+
     /**
      * 通过企业UU，物料名称、规格、品牌（标准）
      * 
@@ -230,15 +215,6 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
 	@Procedure(procedureName = "PRODUCT$BUSINESSSTATUS")
 	public Integer findProductBusinessStatusById(Long id);
 
-//	/**
-//	 * 获得每种单据状态的数量
-//	 *
-//	 * @param ids 单据id
-//	 * @return
-//	 */
-//	@Query("select count(p), p.status from Product p where p.id in :ids group by p.status")
-//	public List<Object[]> getUnreadCountEveryStatus(@Param("ids") List<Long> ids);
-
 	/**
 	 * 通过型号和品牌查询物料是否存在
 	 * 
@@ -249,15 +225,11 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
 	 */
 	List<Product> findByEnUUAndPcmpcodeAndPbrand(Long enuu, String pcmpcoe, String brand);
 
-//	/**  // 此方法已弃用
-//	 * 通过企业uu和物料编号禁用物料
-//	 *
-//	 * @param enUU 物料所属企业UU
-//	 * @param code 物料号
-//	 * @param b2bDisabled 是否禁用  1为禁用  其他为未禁用
-//	 */
-//	@Transactional
-//	@Modifying
-//	@Query("update Product p set p.productStatus.b2bDisabled = :b2bDisabled where p.enUU = :enUU and p.code = :code")
-//	int updateB2bEnabled(@Param("enUU") Long enUU, @Param("code") String code, @Param("b2bDisabled") Short b2bDisabled);
+	/**
+	 * 通过企业UU号查询物料上传数量
+	 *
+	 * @param enUU 企业UU
+	 * @return
+	 */
+	Long countByEnUU(Long enUU);
 }

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

@@ -1,21 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.ProductIndex;
-
-@Repository
-public interface ProductIndexDao extends JpaRepository<ProductIndex, Long> {
-
-	@Query("select i.key from ProductIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-	
-	@Query("select i.key from ProductIndex i where i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("keyword") String keyword);
-
-}

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

@@ -56,8 +56,8 @@ public class ProductTempDao {
 
     public void matchExists(String importId) {
         jdbcTemplate.update("Merge Into (Select * From Products_Temp Where Pr_Import_Id=? And Pr_Exist_Id Is Null) T " +
-                "Using Products P On ((T.pr_code = P.pr_code Or (T.Pr_Title=P.Pr_Title And T.Pr_Cmpcode=P.Pr_Cmpcode And T.Pr_Brand=P.Pr_Brand) " +
-                "Or (T.Pr_Title=P.Pr_Title And T.Pr_Cmpcode=P.Pr_Pcmpcode And T.Pr_Brand=P.Pr_Pbrand)) " +
+                "Using Products P On ((T.pr_code = P.pr_code Or (T.Pr_Title=P.Pr_Title And T.Pr_Cmpcode=P.Pr_Cmpcode And T.Pr_Brand=P.Pr_Brand And T.Pr_Spec=P.Pr_Spec And nvl(P.pr_standard, 0) <> 1) " +
+                "Or (T.Pr_Title=P.Pr_Kind And T.Pr_Cmpcode=P.Pr_Pcmpcode And T.Pr_Brand=P.Pr_Pbrand  And P.pr_standard = 1)) " +
                 "and t.pr_enuu=p.pr_enuu) when matched then update set t.pr_exist_id=p.pr_id", importId);
     }
 

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

@@ -4,7 +4,6 @@ import com.uas.platform.b2b.model.ProductUsers;
 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.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
@@ -29,14 +28,6 @@ public interface ProductUsersDao extends JpaSpecificationExecutor<ProductUsers>,
     @Query("select p from ProductUsers p where p.enuu = :enuu and p.useruu = :useruu and p.product.title = :title and p.product.cmpCode = :spec and p.product.brand = :brand")
     List<ProductUsers> findByEnuuAndUseruuAndTitleAndCmpCodeAndBrand(@Param("enuu") Long enuu, @Param("useruu") Long useruu, @Param("title") String title, @Param("spec") String spec, @Param("brand") String brand);
 
-    /**
-     * 通过选择的id批量转入我的物料 -- 弃用存储过程，在后台调用公共服务接口处理
-     *
-     * @param ids
-     */
-    @Procedure(procedureName = "product_coverto_user")
-    Integer coverToUserProd(String ids, Long useruu, Long enuu);
-
     /**
      * 通过企业UU，个人uu和物料id查询我的产品库物料信息
      *
@@ -47,26 +38,6 @@ public interface ProductUsersDao extends JpaSpecificationExecutor<ProductUsers>,
      */
     ProductUsers findByEnuuAndUseruuAndPrid(Long enuu, Long useruu, Long prid);
 
-    /**
-     * 自动更新所有企业的物料信息
-     */
-    @Procedure(procedureName = "init_covertouser")
-    void initProductUser();
-
-    /**
-     * 通过物料id，enuu,useruu精确
-     */
-    @Procedure(procedureName = "prid_covertouser")
-    void coverToUserByPrid(Long prid, Long enuu, Long useruu);
-
-    /**
-     * 通过企业uu更新个人物料信息
-     *
-     * @param enuu
-     */
-    @Procedure(procedureName = "product_covertouser_byenuu")
-    void coverToUserByEnuu(Long enuu);
-
     /**
      * 通过ERPid查询个人物料信息
      *

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseAcceptIndex;
-
-@Repository
-public interface PurchaseAcceptIndexDao extends JpaRepository<PurchaseAcceptIndex, Long> {
-
-	@Query("select i.key from PurchaseAcceptIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseApBillIndex;
-
-@Repository
-public interface PurchaseApBillIndexDao extends JpaRepository<PurchaseApBillIndex, Long> {
-
-	@Query("select i.key from PurchaseApBillIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,17 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseApCheckIndex;
-
-@Repository
-public interface PurchaseApCheckIndexDao extends JpaRepository<PurchaseApCheckIndex, Long>{
-	
-	@Query("select i.key from PurchaseApCheckIndex i where i.enUu = :enUu and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUu") long enUu, @Param("keyword") String keyword);
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseBadInIndex;
-
-@Repository
-public interface PurchaseBadInIndexDao extends JpaRepository<PurchaseBadInIndex, Long> {
-
-	@Query("select i.key from PurchaseBadInIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseBadOutIndex;
-
-@Repository
-public interface PurchaseBadOutIndexDao extends JpaRepository<PurchaseBadOutIndex, Long> {
-
-	@Query("select i.key from PurchaseBadOutIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseForecastItemIndex;
-
-@Repository
-public interface PurchaseForecastItemIndexDao extends JpaRepository<PurchaseForecastItemIndex, Long> {
-
-	@Query("select i.key from PurchaseForecastItemIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseInquiryItemIndex;
-
-@Repository
-public interface PurchaseInquiryItemIndexDao extends JpaRepository<PurchaseInquiryItemIndex, Long> {
-
-	@Query("select i.key from PurchaseInquiryItemIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +1,16 @@
 package com.uas.platform.b2b.dao;
 
-import java.util.List;
-
+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 com.uas.platform.b2b.model.PurchaseInquiryMouldItem;
+import java.util.List;
 
 public interface PurchaseInquiryMouldItemDao
 		extends JpaSpecificationExecutor<PurchaseInquiryMouldItem>, JpaRepository<PurchaseInquiryMouldItem, Long> {
 
-
 	/**
 	 * 按卖家企业ID和询价主记录ID查找
 	 * 
@@ -35,7 +33,6 @@ public interface PurchaseInquiryMouldItemDao
 	List<PurchaseInquiryMouldItem> findByEnuuAndSendStatus(@Param("enuu") long enuu,
 			@Param("sendStatus") short sendStatus);
 
-
 	/**
 	 * 按卖家企业ID和询价明细的报价信息传到卖家ERP的状态查找询价明细
 	 * 
@@ -46,7 +43,6 @@ public interface PurchaseInquiryMouldItemDao
 	@Query("from PurchaseInquiryMouldItem d where d.inquiryMould.venduu = :venduu and d.inquiryMould.replySendStatus = :replySendStatus")
 	List<PurchaseInquiryMouldItem> findByVendUUAndReplySendStatus(long venduu, short replySendStatus);
 
-	
 	/**
 	 * 按卖家企业ID和询价明细的报价信息的采纳结果传到卖家ERP的状态查找询价明细
 	 * 
@@ -57,10 +53,4 @@ public interface PurchaseInquiryMouldItemDao
 	@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/PurchaseMRBIndexDao.java

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseMRBIndex;
-
-@Repository
-public interface PurchaseMRBIndexDao extends JpaRepository<PurchaseMRBIndex, Long> {
-
-	@Query("select i.key from PurchaseMRBIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseNoticeIndex;
-
-@Repository
-public interface PurchaseNoticeIndexDao extends JpaRepository<PurchaseNoticeIndex, Long> {
-
-	@Query("select i.key from PurchaseNoticeIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseOrderChangeIndex;
-
-@Repository
-public interface PurchaseOrderChangeIndexDao extends JpaRepository<PurchaseOrderChangeIndex, Long> {
-
-	@Query("select i.key from PurchaseOrderChangeIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseOrderIndex;
-
-@Repository
-public interface PurchaseOrderIndexDao extends JpaRepository<PurchaseOrderIndex, Long> {
-
-	@Query("select i.key from PurchaseOrderIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -78,6 +78,15 @@ public interface PurchaseOrderItemDao extends JpaSpecificationExecutor<PurchaseO
 	@Query("update PurchaseOrderItem p set p.replyQty=(select sum(r.qty) from PurchaseOrderReply r where r.orderItem=p),p.replyDelivery= :delivery,p.replyRemark= :remark where p.id= :id")
 	public void updateByReply(@Param("delivery") Date delivery, @Param("remark") String remark, @Param("id") long id);
 
+	/**
+	 * 批量回复采购订单
+	 *
+	 * @param idString id拼接成的字符串
+	 * @param username 用户姓名
+	 * @param userip ip
+	 * @param enuu enUU
+	 * @param useruu userUU
+	 */
     @Procedure(procedureName = "purc$reply_batch")
     public void replyByBatch(String idString, String username, String userip, Long enuu, Long useruu);
 }

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseProofingApprovalIndex;
-
-@Repository
-public interface PurchaseProofingApprovalIndexDao extends JpaRepository<PurchaseProofingApprovalIndex, Long> {
-
-	@Query("select i.key from PurchaseProofingApprovalIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseProofingItemIndex;
-
-@Repository
-public interface PurchaseProofingItemIndexDao extends JpaRepository<PurchaseProofingItemIndex, Long> {
-
-	@Query("select i.key from PurchaseProofingItemIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.PurchaseReturnIndex;
-
-@Repository
-public interface PurchaseReturnIndexDao extends JpaRepository<PurchaseReturnIndex, Long> {
-
-	@Query("select i.key from PurchaseReturnIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,24 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.SaleARCheckIndex;
-
-/** 
- * @author  yuj 
- * @date 创建时间：2015年11月17日 下午5:51:53 
- * @Description: 根据关键字检索key 
- * @version 1.0  
- */
-
-@Repository
-public interface SaleARCheckIndexDao extends JpaRepository<SaleARCheckIndex, Long> {
-	
-	@Query("select i.key from SaleARCheckIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-}

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

@@ -1,22 +1,12 @@
 package com.uas.platform.b2b.dao;
 
+import com.uas.platform.b2b.model.SaleQuotationAll;
 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 com.uas.platform.b2b.model.SaleQuotationAll;
-
 @Repository
 public interface SaleQuotationAllDao
 		extends JpaSpecificationExecutor<SaleQuotationAll>, JpaRepository<SaleQuotationAll, Long> {
 
-	/**
-	 * 更新主表同意（不同意）状态<br>
-	 * 主动报价单只有一条明细，而且为了和询价单对应，客户的同意状态存在从表，所以每次查询客户审核状态时要先更新主表的状态
-	 * 
-	 * @param enuu
-	 */
-	@Procedure(procedureName = "sale$quotation_agreed_update")
-	public void updateAgreedStatus(Long enuu);
 }

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

@@ -1,21 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.SaleQuotationItemIndex;
-
-@Repository
-public interface SaleQuotationItemIndexDao extends JpaRepository<SaleQuotationItemIndex, Long> {
-
-	@Query("select i.key from SaleQuotationItemIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByEnUUAndKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-	
-	@Query("select i.key from SaleQuotationItemIndex i where i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("keyword") String keyword);
-
-}

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

@@ -1,18 +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.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import com.uas.platform.b2b.model.SaleSendIndex;
-
-@Repository
-public interface SaleSendIndexDao extends JpaRepository<SaleSendIndex, Long> {
-
-	@Query("select i.key from SaleSendIndex i where i.enUU = :enUU and i.keyword = :keyword")
-	List<Long> findByKeyword(@Param("enUU") long enUU, @Param("keyword") String keyword);
-
-}

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

@@ -1,29 +0,0 @@
-package com.uas.platform.b2b.dao;
-
-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.TipReprintedLog;
-import com.uas.search.b2b.model.SPage;
-
-@Repository
-public interface TipReprintedLogDao
-		extends JpaRepository<TipReprintedLog, Long>, JpaSpecificationExecutor<TipReprintedLog> {
-
-	/**
-	 * 通过转载人uu查询转载记录
-	 * 
-	 * @param useruu
-	 * @return
-	 */
-	public SPage<TipReprintedLog> findByUseruu(Long useruu);
-
-	/**
-	 * 通过被转载人uu查询被转载记录
-	 * 
-	 * @param originaluu
-	 * @return
-	 */
-	public SPage<TipReprintedLog> findByOriginaluu(Long originaluu);
-}

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

@@ -0,0 +1,78 @@
+package com.uas.platform.b2b.erp.controller;
+
+import com.uas.account.support.Page;
+import com.uas.platform.b2b.erp.model.VendorRecommend;
+import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.service.VendorService;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.logging.BufferedLoggerManager;
+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.RestController;
+
+import java.util.List;
+
+/**
+ * 供应商推荐 -- 2018年4月8日 21:57:40  因为UAS不能立刻同时发布，所以保留原接口
+ * Created by dongbw
+ * 18/01/18 14:00.
+ */
+@RestController
+@RequestMapping("/erp/recommend")
+public class ErpVendorRecommendController {
+
+    @Autowired
+    private VendorService vendorService;
+
+    private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
+
+    /**
+     * 获取当前企业推荐供应商
+     *
+     * @param productMatchCondition 物料模糊匹配条件
+     * @param enterpriseMatchCondition 企业搜索匹配条件
+     * @param page 页面
+     * @param size 每页条数
+     * @return
+     */
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public Page<VendorRecommend> getVendorRecommend (String productMatchCondition, String enterpriseMatchCondition, int page, int size) {
+        Long enUU = SystemSession.getUser().getEnterprise().getUu();
+        Page<VendorRecommend> vendorRecommendPage = vendorService.getVendorRecommend(enUU, productMatchCondition, enterpriseMatchCondition, page, size);
+//        logger.log("供应商推荐","获取当前企业推荐供应商：" + enUU, vendorRecommendPage.getNumberOfElements());
+        return vendorRecommendPage;
+    }
+
+    /**
+     * 根据条件获取物料型号和品牌值对（UAS品牌和型号联想词接口）
+     *
+     * @param field 需要的字段名
+     * @param condition 物料模糊匹配条件
+     * @return 物料型号和品牌值对List
+     */
+    @RequestMapping(value = "/product/associate", method = RequestMethod.GET)
+    public List<Product> getProductAssociate (String field, String condition) {
+        List<Product> products = vendorService.getProductAssociate(field, condition);
+//        logger.log("供应商推荐","根据条件获取物料型号和品牌值对", products.size());
+        return products;
+    }
+
+    /**
+     * 获取推荐企业物料列表（匹配到的排前面）
+     * @param page 页数
+     * @param size 每页条数
+     * @param vendUU 推荐供应商企业UU
+     * @param productMatchCondition 列表的物料匹配搜索条件  不带where
+     * @param whereCondition where条件（product的筛选条件拼接） 不带where
+     * @return
+     */
+    @RequestMapping(value = "/detail", method = RequestMethod.GET)
+    public Page<Product> getVendorRecommendDetail(int page, int size, Long vendUU, String productMatchCondition, String whereCondition) {
+        Long enUU = SystemSession.getUser().getEnterprise().getUu();
+        Page<Product> productPage = vendorService.getProductsByVendorRecommend(page, size, enUU, vendUU, productMatchCondition, whereCondition);
+//        logger.log("供应商推荐","获取当前企业推荐供应商：" + enUU, productPage.getNumberOfElements());
+        return productPage;
+    }
+}

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

@@ -4,8 +4,11 @@ import com.uas.platform.b2b.erp.model.Prod;
 import com.uas.platform.b2b.erp.model.ProductSaler;
 import com.uas.platform.b2b.erp.service.ProdService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
+import com.uas.platform.b2b.model.NotExistProduct;
 import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.service.NotExistProductService;
 import com.uas.platform.b2b.service.ProductService;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
@@ -40,6 +43,9 @@ public class ProdController {
 	@Autowired
 	private ProductService productService;
 
+	@Autowired
+    private NotExistProductService notExistProductService;
+
 	private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	/**
@@ -169,4 +175,42 @@ public class ProdController {
         productService.quitProdSaler(productSalers);
         logger.log("物料资料", "ERP取消个人物料同步到平台", productSalers.size());
     }
+
+    /**
+     * 获取未上传的物料信息
+     * @return
+     */
+    @RequestMapping(value = "/notExistProds", method = RequestMethod.GET)
+	@ResponseBody
+	public List<Prod> findNotExistProducts() {
+        List<Prod> prods = covert(notExistProductService.findByEnuuAndStatus(SystemSession.getUser().getEnterprise().getUu(), Status.NOT_UPLOAD.value()));
+        logger.log("物料资料", "ERP获取平台未上传的物料信息", prods.size());
+        return prods;
+	}
+
+    private List<Prod> covert(List<NotExistProduct> productList) {
+        List<Prod> prods = new ArrayList<Prod>();
+        if (!CollectionUtils.isEmpty(productList)) {
+            for (NotExistProduct product : productList) {
+                Prod prod = new Prod();
+                prod.setB2b_id(product.getId());
+                prod.setPr_code(product.getCode());
+                prods.add(prod);
+            }
+        }
+        return prods;
+    }
+
+    /**
+     * 获取数据后更新下载状态
+     *
+     * @param data 封装的id串
+     * @throws Exception
+     */
+    @RequestMapping(value = "/notExistProds/back", method = RequestMethod.POST)
+    @ResponseBody
+    public void updateNotExistProdsStatus(@RequestParam("data") String data) throws Exception {
+        notExistProductService.updateDownloadStatus(URLDecoder.decode(data, "UTF-8").split(","));
+        logger.log("物料资料", "ERP获取平台未上传的物料信息返回更新下载状态", URLDecoder.decode(data, "UTF-8").split(",").length);
+    }
 }

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

@@ -5,20 +5,21 @@ import com.uas.platform.b2b.erp.model.VendorRecommend;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.service.VendorService;
-import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 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.RestController;
 
+import java.util.List;
+
 /**
  * 供应商推荐
  * Created by dongbw
  * 18/01/18 14:00.
  */
 @RestController
-@RequestMapping("/erp/recommend")
+@RequestMapping("/public/recommend")
 public class VendorRecommendController {
 
     @Autowired
@@ -31,31 +32,45 @@ public class VendorRecommendController {
      *
      * @param productMatchCondition 物料模糊匹配条件
      * @param enterpriseMatchCondition 企业搜索匹配条件
-     * @param productCondition 物料精确匹配条件
      * @param page 页面
      * @param size 每页条数
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Page<VendorRecommend> getVendorRecommend (String productMatchCondition, String enterpriseMatchCondition, String productCondition, int page, int size) {
-        Page<VendorRecommend> vendorRecommendPage = vendorService.getVendorRecommend(productMatchCondition, enterpriseMatchCondition, productCondition, page, size);
-        logger.log("供应商推荐","获取当前企业推荐供应商：" + SystemSession.getUser().getEnterprise().getUu(), vendorRecommendPage.getNumberOfElements());
+    public Page<VendorRecommend> getVendorRecommend (Long enUU, String productMatchCondition, String enterpriseMatchCondition, int page, int size) {
+        Page<VendorRecommend> vendorRecommendPage = vendorService.getVendorRecommend(enUU, productMatchCondition, enterpriseMatchCondition, page, size);
+//        logger.log("供应商推荐","获取当前企业推荐供应商：" + enUU, vendorRecommendPage.getNumberOfElements());
         return vendorRecommendPage;
     }
 
+    /**
+     * 根据条件获取物料型号和品牌值对（UAS品牌和型号联想词接口）
+     *
+     * @param field 需要的字段名
+     * @param condition 物料模糊匹配条件
+     * @return 物料型号和品牌值对List
+     */
+    @RequestMapping(value = "/product/associate", method = RequestMethod.GET)
+    public List<Product> getProductAssociate (String field, String condition) {
+        List<Product> products = vendorService.getProductAssociate(field, condition);
+//        logger.log("供应商推荐","根据条件获取物料型号和品牌值对", products.size());
+        return products;
+    }
+
     /**
      * 获取推荐企业物料列表（匹配到的排前面）
      * @param page 页数
      * @param size 每页条数
+     * @param enUU 当前企业UU
      * @param vendUU 推荐供应商企业UU
      * @param productMatchCondition 列表的物料匹配搜索条件  不带where
      * @param whereCondition where条件（product的筛选条件拼接） 不带where
      * @return
      */
     @RequestMapping(value = "/detail", method = RequestMethod.GET)
-    public Page<Product> getVendorRecommendDetail(int page, int size, Long vendUU, String productMatchCondition, String whereCondition) {
-        Page<Product> productPage = vendorService.getProductsByVendorRecommend(page, size, vendUU, productMatchCondition, whereCondition);
-        logger.log("供应商推荐","获取当前企业推荐供应商：" + SystemSession.getUser().getEnterprise().getUu(), productPage.getNumberOfElements());
+    public Page<Product> getVendorRecommendDetail(int page, int size, Long enUU, Long vendUU, String productMatchCondition, String whereCondition) {
+        Page<Product> productPage = vendorService.getProductsByVendorRecommend(page, size, enUU, vendUU, productMatchCondition, whereCondition);
+//        logger.log("供应商推荐","获取当前企业推荐供应商：" + enUU, productPage.getNumberOfElements());
         return productPage;
     }
 }

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

@@ -1,10 +1,5 @@
 package com.uas.platform.b2b.erp.model;
 
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Product;
-
-import java.util.List;
-
 /**
  * 供应商推荐实体
  * Created by dongbw
@@ -13,14 +8,69 @@ import java.util.List;
 public class VendorRecommend {
 
     /**
-     * 推荐的供应商
+     * 推荐的供应商UU
+     */
+    private Long en_uu;
+
+    /**
+     * 推荐的供应商名称
+     */
+    private String en_name;
+
+    /**
+     * 推荐的供应商简称
+     */
+    private String en_shortname;
+
+    /**
+     * 推荐的供应商地址
+     */
+    private String en_address;
+
+    /**
+     * 推荐的供应商电话
+     */
+    private String en_tel;
+
+    /**
+     * 推荐的供应商邮箱
+     */
+    private String en_email;
+
+    /**
+     * 公司法人
+     */
+    private String en_corporation;
+
+    /**
+     * 商业登记证号
+     */
+    private String en_businesscode;
+
+    /**
+     * 行业
+     */
+    private String en_profession;
+
+    /**
+     * 主营业务
+     */
+    private String en_tags;
+
+    /**
+     * 联系人
+     */
+    private String en_contactman;
+
+    /**
+     * 联系人电话
      */
-    private Enterprise enterprise;
+    private String en_contacttel;
 
     /**
-     * 匹配物料
+     * 匹配物料信息 名称（品牌）
      */
-    private List<Product> hitProds;
+    private String productInfo;
 
     /**
      * 匹配物料个数
@@ -33,20 +83,12 @@ public class VendorRecommend {
      */
     private Short isVendor;
 
-    public Enterprise getEnterprise() {
-        return enterprise;
-    }
-
-    public void setEnterprise(Enterprise enterprise) {
-        this.enterprise = enterprise;
-    }
-
-    public List<Product> getHitProds() {
-        return hitProds;
+    public String getProductInfo() {
+        return productInfo;
     }
 
-    public void setHitProds(List<Product> hitProds) {
-        this.hitProds = hitProds;
+    public void setProductInfo(String productInfo) {
+        this.productInfo = productInfo;
     }
 
     public Integer getHitNums() {
@@ -64,4 +106,100 @@ public class VendorRecommend {
     public void setIsVendor(Short isVendor) {
         this.isVendor = isVendor;
     }
+
+    public Long getEn_uu() {
+        return en_uu;
+    }
+
+    public void setEn_uu(Long en_uu) {
+        this.en_uu = en_uu;
+    }
+
+    public String getEn_name() {
+        return en_name;
+    }
+
+    public void setEn_name(String en_name) {
+        this.en_name = en_name;
+    }
+
+    public String getEn_shortname() {
+        return en_shortname;
+    }
+
+    public void setEn_shortname(String en_shortname) {
+        this.en_shortname = en_shortname;
+    }
+
+    public String getEn_address() {
+        return en_address;
+    }
+
+    public void setEn_address(String en_address) {
+        this.en_address = en_address;
+    }
+
+    public String getEn_tel() {
+        return en_tel;
+    }
+
+    public void setEn_tel(String en_tel) {
+        this.en_tel = en_tel;
+    }
+
+    public String getEn_email() {
+        return en_email;
+    }
+
+    public void setEn_email(String en_email) {
+        this.en_email = en_email;
+    }
+
+    public String getEn_corporation() {
+        return en_corporation;
+    }
+
+    public void setEn_corporation(String en_corporation) {
+        this.en_corporation = en_corporation;
+    }
+
+    public String getEn_businesscode() {
+        return en_businesscode;
+    }
+
+    public void setEn_businesscode(String en_businesscode) {
+        this.en_businesscode = en_businesscode;
+    }
+
+    public String getEn_profession() {
+        return en_profession;
+    }
+
+    public void setEn_profession(String en_profession) {
+        this.en_profession = en_profession;
+    }
+
+    public String getEn_tags() {
+        return en_tags;
+    }
+
+    public void setEn_tags(String en_tags) {
+        this.en_tags = en_tags;
+    }
+
+    public String getEn_contactman() {
+        return en_contactman;
+    }
+
+    public void setEn_contactman(String en_contactman) {
+        this.en_contactman = en_contactman;
+    }
+
+    public String getEn_contacttel() {
+        return en_contacttel;
+    }
+
+    public void setEn_contacttel(String en_contacttel) {
+        this.en_contacttel = en_contacttel;
+    }
 }

src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java

@@ -2,14 +2,7 @@ package com.uas.platform.b2b.erp.service.impl;
 
 import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.dao.CommonDao;
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
-import com.uas.platform.b2b.dao.SaleQuotationItemDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.Inquiry;
 import com.uas.platform.b2b.erp.model.InquiryDecide;
 import com.uas.platform.b2b.erp.model.InquiryDetail;
@@ -18,16 +11,10 @@ import com.uas.platform.b2b.erp.service.InquiryService;
 import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
 import com.uas.platform.b2b.event.PurchaseInquiryItemSaveReleaseEvent;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurchaseInquiry;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.SaleQuotation;
-import com.uas.platform.b2b.model.SaleQuotationItem;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.core.exception.NotFoundException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
@@ -72,6 +59,9 @@ public class InquiryServiceImpl implements InquiryService {
 	@Autowired
 	private VendorService vendorService;
 
+	@Autowired
+    private NotExistProductDao notExistProductDao;
+
     private final static ErpBufferedLogger logger = BufferedLoggerManager.getLogger(ErpBufferedLogger.class);
 
 	private final static UsageBufferedLogger usageLogger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
@@ -124,6 +114,16 @@ public class InquiryServiceImpl implements InquiryService {
 							if (products.size() > 0) {
 								item.setProduct(products.get(0));
 								item.setProductId(products.get(0).getId());
+							} else {
+                                List<NotExistProduct> productList = notExistProductDao.findByEnuuAndCode(enUU, product.getCode());
+                                if (org.springframework.util.CollectionUtils.isEmpty(productList)) {
+                                    notExistProductDao.save(new NotExistProduct(product.getCode(), enUU, "inquiry", inquiry.getIn_code()));
+                                } else {
+                                    NotExistProduct prod = productList.get(0);
+                                    prod.setStatus(Status.NOT_UPLOAD.value());
+                                    notExistProductDao.save(prod);
+                                }
+                                throw new NotFoundException("企业UU【" + enUU + "】,物料编号【" + product.getCode() + "】,来源【" + inquiry.getIn_code() + "】");
 							}
 							inquiryItems.add(item);
 						}

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseProdInOutServiceImpl.java

@@ -1,37 +1,17 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.PurchaseAcceptDao;
-import com.uas.platform.b2b.dao.PurchaseAcceptItemDao;
-import com.uas.platform.b2b.dao.PurchaseBadInDao;
-import com.uas.platform.b2b.dao.PurchaseBadOutDao;
-import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
-import com.uas.platform.b2b.dao.PurchaseReturnDao;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.ProdInOutRefreshPrice;
 import com.uas.platform.b2b.erp.model.PurchaseProdInOut;
 import com.uas.platform.b2b.erp.service.PurchaseProdInOutService;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurchaseAccept;
-import com.uas.platform.b2b.model.PurchaseAcceptItem;
-import com.uas.platform.b2b.model.PurchaseBadIn;
-import com.uas.platform.b2b.model.PurchaseBadInItem;
-import com.uas.platform.b2b.model.PurchaseBadOut;
-import com.uas.platform.b2b.model.PurchaseBadOutItem;
-import com.uas.platform.b2b.model.PurchaseOrderItem;
-import com.uas.platform.b2b.model.PurchaseReturn;
-import com.uas.platform.b2b.model.PurchaseReturnItem;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 
 @Service
@@ -106,6 +86,59 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 						acceptItems.add(item);
 					}
 				}
+			} else if (accepts2.size() > 0 && vendor != null) {
+				Set<PurchaseAcceptItem> haditems = accepts2.get(0).getAcceptItems();
+				List<String> haditemsBatchCode = new ArrayList<String>();
+				for (Iterator<PurchaseAcceptItem> itHaditems = haditems.iterator(); itHaditems.hasNext();) {
+					PurchaseAcceptItem hadItem = itHaditems.next();
+					haditemsBatchCode.add(hadItem.getBatchCode());
+				}
+
+				for (Iterator<PurchaseAcceptItem> it = accept.getAcceptItems().iterator(); it.hasNext();) {// 设置明细对应的采购单明细
+					PurchaseAcceptItem item = it.next();
+					if (haditemsBatchCode.contains(item.getBatchCode())) {
+						//已上传的明细不要
+						it.remove();
+					} else {
+						if (item.getOrderItem() != null) {
+							List<PurchaseOrderItem> purchaseOrderItems = purchaseOrderItemDao
+									.findByEnUUAndOrderCodeAndNumber(enUU, item.getOrderItem().getOrder().getCode(),
+											item.getOrderItem().getNumber());
+
+							if (purchaseOrderItems.size() > 0) {// 对应的采购单存在
+								item.setOrderItem(purchaseOrderItems.get(0));// 对应的采购单明细set进去
+								item.setOrderItemId(purchaseOrderItems.get(0).getId());
+
+								item.setAccept(accepts2.get(0));// 设置主记录
+
+								item.setErpDate(new Date());
+								item.setProdcode(purchaseOrderItems.get(0).getProduct().getCode());
+								item.setProdId(purchaseOrderItems.get(0).getProductId());
+								acceptItems.add(item);
+							} else {
+								it.remove();
+							}
+						} else {
+							List<Product> prod = productDao.findByEnUUAndCode(enUU, item.getProdcode());
+							if (prod.size() > 0) {
+								item.setProduct(prod.get(0));
+								item.setProdId(prod.get(0).getId());
+							} else {// 物料不存在先进行存储
+								Product product = new Product();
+								product.setCode(item.getProdcode());
+								product.setEnUU(enUU);
+								Long proId = ProductUtils.updateOne(product);
+								item.setProduct(product);
+								item.setProdId(proId);
+							}
+
+
+							item.setAccept(accepts2.get(0));
+							item.setErpDate(new Date());
+							acceptItems.add(item);
+						}
+					}
+				}
 			}
 		}
 		return acceptItems;

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseServiceImpl.java

@@ -51,6 +51,9 @@ public class PurchaseServiceImpl implements PurchaseService {
 	@Autowired
 	private VendorService vendorService;
 
+	@Autowired
+    private NotExistProductDao notExistProductDao;
+
 	private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
 	@Override
@@ -103,7 +106,15 @@ public class PurchaseServiceImpl implements PurchaseService {
 							item.setErpDate(new Date());
 							orderItems.add(item);
 						} else {
-							throw new NotFoundException("企业uu为【" + product.getEnUU() + "】编号为【" + product.getCode() + "】的物料");
+						    List<NotExistProduct> productList = notExistProductDao.findByEnuuAndCode(enUU, product.getCode());
+						    if (CollectionUtils.isEmpty(productList)) {
+                                notExistProductDao.save(new NotExistProduct(product.getCode(), enUU, "purchase", purchase.getPu_code()));
+                            } else {
+                                NotExistProduct prod = productList.get(0);
+                                prod.setStatus(Status.NOT_UPLOAD.value());
+                                notExistProductDao.save(prod);
+                            }
+							throw new NotFoundException("企业UU【" + enUU + "】,物料编号【" + product.getCode() + "】,来源【" + purchase.getPu_code() + "】");
 						}
 					}
 				}

src/main/java/com/uas/platform/b2b/event/MakeAcceptSaveEvent.java

@@ -1,76 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.MakeAccept;
-import com.uas.platform.b2b.model.MakeAcceptIndex;
-import com.uas.platform.b2b.model.MakeAcceptItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户委外验收单保存事件（保存关键词）
- * 
- * @author aof
- * @date 2015年8月27日
- */
-public class MakeAcceptSaveEvent extends SaveEvent<MakeAcceptIndex, MakeAccept> {
-
-	private static final long serialVersionUID = 1L;
-
-	public MakeAcceptSaveEvent(List<MakeAccept> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<MakeAcceptIndex> split(MakeAccept saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<MakeAcceptIndex> indexes = new ArrayList<MakeAcceptIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new MakeAcceptIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getAcceptItems())) {
-			indexes.addAll(MakeAcceptIndex.format(enUU, key, SearchKeyUtils.splitToKeys(
-					saved.getAcceptItems().toArray(new MakeAcceptItem[1])[0].getOrder().getEnterprise().getEnName(),
-					false)));
-			indexes.add(new MakeAcceptIndex(enUU, key, saved.getAcceptItems().toArray(new MakeAcceptItem[1])[0]
-					.getOrder().getEnterprise().getUu().toString()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		//送货工厂 全称匹配
-		for (MakeAcceptItem item : saved.getAcceptItems()) {
-			if(item.getOrder().getFactory() != null) {
-				indexes.add(new MakeAcceptIndex(enUU, key, item.getOrder().getFactory()));
-			}
-			indexes.add(new MakeAcceptIndex(enUU, key, item.getOrder().getProduct().getCode()));
-			indexes.addAll(MakeAcceptIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrder().getProduct().getTitle(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<MakeAccept> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (MakeAccept accept : savedList) {
-			for (MakeAcceptItem acceptItem : accept.getAcceptItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-				if (!productId.contains(acceptItem.getOrder().getProduct().getId())) {
-					XingePusher.pushSingleAccountAndroid(acceptItem.getOrder().getVendUserUU().toString(), "物料已被客户验收入库",
-							"物料：" + acceptItem.getOrder().getProduct().getTitle(), null, null);
-					XingePusher.pushSingleAccountIOS(acceptItem.getOrder().getVendUserUU().toString(),
-							acceptItem.getOrder().getProduct().getTitle() + "已被客户验收入库", null);
-					productId.add(acceptItem.getOrder().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/MakeOrderChangeSaveEvent.java

@@ -1,62 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.MakeOrderChangeIndex;
-import com.uas.platform.b2b.model.MakeOrderChangeItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户委外加工单保存事件
- * @author suntg
- * @since 2015年8月7日下午2:51:20
- */
-public class MakeOrderChangeSaveEvent extends SaveEvent<MakeOrderChangeIndex, MakeOrderChangeItem> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public MakeOrderChangeSaveEvent(List<MakeOrderChangeItem> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<MakeOrderChangeIndex> split(MakeOrderChangeItem saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<MakeOrderChangeIndex> indexes = new ArrayList<MakeOrderChangeIndex>();
-		// 委外单号（匹配完整的编号）
-		indexes.add(new MakeOrderChangeIndex(enUU, key, saved.getOrderCode()));
-		// 委外变更单号（匹配完整的编号）
-		indexes.add(new MakeOrderChangeIndex(enUU, key, saved.getOrderChange().getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(MakeOrderChangeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderChange().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new MakeOrderChangeIndex(enUU, key, saved.getOrderChange().getEnUU().toString()));
-		// 物料
-		indexes.add(new MakeOrderChangeIndex(enUU, key, saved.getProduct().getCode()));
-		indexes.addAll(MakeOrderChangeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getTitle(), false)));
-		indexes.addAll(MakeOrderChangeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<MakeOrderChangeItem> savedList) {
-		// 将采购单信息推送通知供应商联系人UU号
-		for (MakeOrderChangeItem order : savedList) {
-			if (order.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(order.getVendUserUU(), "客户委外加工单变更", "客户：" + 
-						order.getOrderChange().getEnterprise().getEnName(), "", 
-						"");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/MakeOrderSaveEvent.java

@@ -1,76 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.MakeOrder;
-import com.uas.platform.b2b.model.MakeOrderIndex;
-import com.uas.platform.b2b.support.XingePusher;
-import com.uas.platform.core.model.Constant;
-
-/**
- * 客户委外加工单保存事件
- * 
- * @author suntg
- * 
- */
-public class MakeOrderSaveEvent extends SaveEvent<MakeOrderIndex, MakeOrder> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public MakeOrderSaveEvent(List<MakeOrder> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<MakeOrderIndex> split(MakeOrder saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		long venUU = saved.getVendUU();
-		List<MakeOrderIndex> indexes = new ArrayList<MakeOrderIndex>();
-		// 委外单号（匹配完整的编号）
-		indexes.add(new MakeOrderIndex(enUU, key, venUU, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(MakeOrderIndex.format(enUU, key, venUU,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new MakeOrderIndex(enUU, key, venUU, saved.getEnUU().toString()));
-		// 送货工厂 全称匹配
-		if (saved.getFactory() != null) {
-			indexes.add(new MakeOrderIndex(enUU, key, venUU, saved.getFactory()));
-		}
-		// 物料
-		indexes.add(new MakeOrderIndex(enUU, key, venUU, saved.getProduct().getCode()));
-		indexes.addAll(MakeOrderIndex.format(enUU, key, venUU,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getTitle(), false)));
-		indexes.addAll(MakeOrderIndex.format(enUU, key, venUU,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<MakeOrder> savedList) {
-		// 将采购单信息推送通知供应商联系人UU号
-		for (MakeOrder order : savedList) {
-			if (order.getVendUserUU() != null) {
-				// 如果采购单单据存在客户联系人UU且UU正确--->客户联系人UU
-				// 如果不存在，但是平台中企业供应商资料存在供应商联系人UU--->平台中供应商资料中的联系人UU
-				// 否则不推送
-				// Android
-				if (order.getEnd() == null || !order.getEnd().equals(Constant.YES)) {
-					XingePusher.pushByUserUU(order.getVendUserUU(), "新增一条客户委外加工单",
-							"客户：" + "单号:" + order.getCode() + ",客户:" + order.getEnterprise().getEnName(), "", "");
-				} else { // 结案
-					XingePusher.pushByUserUU(order.getVendUserUU(), "客户已结案了委外加工单",
-							"客户：" + "单号:" + order.getCode() + ",客户:" + order.getEnterprise().getEnName(), "", "");
-				}
-
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/MakeReturnSaveEvent.java

@@ -1,77 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.EnterpriseInfo;
-import com.uas.platform.b2b.model.MakeReturn;
-import com.uas.platform.b2b.model.MakeReturnIndex;
-import com.uas.platform.b2b.model.MakeReturnItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户委外验收单保存事件
- * @author aof
- * @date 2015年8月31日
- */
-public class MakeReturnSaveEvent extends SaveEvent<MakeReturnIndex, MakeReturn> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public MakeReturnSaveEvent(List<MakeReturn> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<MakeReturnIndex> split(MakeReturn saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<MakeReturnIndex> indexes = new ArrayList<MakeReturnIndex>();
-		indexes.add(new MakeReturnIndex(enUU,key,saved.getCode()));
-		if(CollectionUtils.isEmpty(saved.getReturnItems())){
-			EnterpriseInfo enDemo = saved.getReturnItems().toArray(new MakeReturnItem[1])[0].getOrder().getEnterprise();
-			indexes.addAll(MakeReturnIndex.format(enUU, key, SearchKeyUtils.splitToKeys
-					(enDemo.getEnName(), false)));
-			indexes.add(new MakeReturnIndex(enUU,key,enDemo.getUu().toString()));
-		}
-//		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		//送货工厂 全称匹配
-		for (MakeReturnItem item : saved.getReturnItems()) {
-			if(item.getOrder().getFactory() != null) {
-				indexes.add(new MakeReturnIndex(enUU, key, item.getOrder().getFactory()));
-			}
-			indexes.add(new MakeReturnIndex(enUU, key, item.getOrder().getProduct().getCode()));
-			indexes.addAll(MakeReturnIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrder().getProduct().getTitle(), false)));
-			indexes.addAll(MakeReturnIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrder().getProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-	@Override
-	public void pusher(List<MakeReturn> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (MakeReturn re : savedList) {
-			for (MakeReturnItem returnItem : re.getReturnItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-				if (!productId.contains(returnItem.getOrder().getProduct().getId())) {
-					XingePusher.pushSingleAccountAndroid(returnItem.getOrder().getVendUserUU()
-							.toString(), "物料已被客户委外验退", "物料：" + returnItem.getOrder().getProduct().getTitle(), null, null);
-					XingePusher.pushSingleAccountIOS(returnItem.getOrder().getVendUserUU().toString(),
-							returnItem.getOrder().getProduct().getTitle() + "已被客户委外验退", null);
-					productId.add(returnItem.getOrder().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/ProductSaveEvent.java

@@ -1,49 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.ProductIndex;
-
-/**
- * 物料保存事件
- * 
- * @author suntg
- * 
- */
-public class ProductSaveEvent extends SaveEvent<ProductIndex, Product> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public ProductSaveEvent(List<Product> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<ProductIndex> split(Product saved) {
-		long key = saved.getId();
-		long enUU = saved.getEnUU();
-		List<ProductIndex> indexes = new ArrayList<ProductIndex>();
-		// 物料编号（匹配完整的编号）
-		indexes.add(new ProductIndex(enUU, key, saved.getCode()));
-		// 客户UU号
-		indexes.add(new ProductIndex(enUU, key, saved.getEnUU().toString()));
-		// 两个字以上的物料名称及规格关键字
-		indexes.addAll(ProductIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getTitle(), false)));
-		indexes.addAll(ProductIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getSpec(), false)));
-		indexes.addAll(ProductIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getBrand(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<Product> savedList) {
-		// 发送推送消息
-		// 不需要发送
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseAcceptSaveEvent.java

@@ -1,84 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseAccept;
-import com.uas.platform.b2b.model.PurchaseAcceptIndex;
-import com.uas.platform.b2b.model.PurchaseAcceptItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户采购验收单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseAcceptSaveEvent extends SaveEvent<PurchaseAcceptIndex, PurchaseAccept> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseAcceptSaveEvent(List<PurchaseAccept> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseAcceptIndex> split(PurchaseAccept saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseAcceptIndex> indexes = new ArrayList<PurchaseAcceptIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseAcceptIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getAcceptItems())) {
-			indexes.addAll(PurchaseAcceptIndex.format(
-					enUU,
-					key,
-					SearchKeyUtils.splitToKeys(saved.getAcceptItems().toArray(new PurchaseAcceptItem[1])[0].getOrderItem().getOrder()
-							.getEnterprise().getEnName(), false)));
-			indexes.add(new PurchaseAcceptIndex(enUU, key, saved.getAcceptItems().toArray(new PurchaseAcceptItem[1])[0].getOrderItem()
-					.getOrder().getEnterprise().getUu().toString()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		// 送货工厂 全称匹配
-		for (PurchaseAcceptItem item : saved.getAcceptItems()) {
-			indexes.add(new PurchaseAcceptIndex(enUU, key, item.getOrderItem().getProduct().getCode()));
-			// 建立订单索引
-			indexes.add(new PurchaseAcceptIndex(enUU, key, item.getOrderItem().getOrder().getCode()));
-			indexes.addAll(PurchaseAcceptIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getTitle(), false)));
-			indexes.addAll(PurchaseAcceptIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getSpec(), false)));
-			if (item.getOrderItem().getFactory() != null) {
-				indexes.add(new PurchaseAcceptIndex(enUU, key, item.getOrderItem().getFactory()));
-			}
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseAccept> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (PurchaseAccept accept : savedList) {
-			for (PurchaseAcceptItem acceptItem : accept.getAcceptItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-
-				if (!productId.contains(acceptItem.getOrderItem().getProduct().getId())) {
-					XingePusher.pushByUserUU(acceptItem.getOrderItem().getOrder().getVendUserUU(), "物料已被客户验收入库", "物料："
-							+ acceptItem.getOrderItem().getProduct().getTitle(), "", "");
-					productId.add(acceptItem.getOrderItem().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseApBillSaveEvent.java

@@ -1,70 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.model.PurchaseApBill;
-import com.uas.platform.b2b.model.PurchaseApBillIndex;
-import com.uas.platform.b2b.model.PurchaseApBillItem;
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户应收发票保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseApBillSaveEvent extends SaveEvent<PurchaseApBillIndex, PurchaseApBill> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseApBillSaveEvent(List<PurchaseApBill> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseApBillIndex> split(PurchaseApBill saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseApBillIndex> indexes = new ArrayList<PurchaseApBillIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseApBillIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseApBillIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseApBillIndex(enUU, key, saved.getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (PurchaseApBillItem item : saved.getItems()) {
-			indexes.add(new PurchaseApBillIndex(enUU, key, item.getProduct().getCode()));
-			indexes.addAll(PurchaseApBillIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getProduct().getTitle(), false)));
-			indexes.addAll(PurchaseApBillIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseApBill> savedList) {
-		// 发送推送消息
-		VendorDao vendorDao = ContextUtils.getBean(VendorDao.class);
-		for (PurchaseApBill apBill : savedList) {
-			List<Vendor> vend = vendorDao.findByMyEnUUAndVendUU(apBill.getEnUU(), apBill.getVendUU());
-			if (vend.size() > 0) {
-				Long vendUseruu = vend.get(0).getVendUserUU();// 供应商联系人
-				String customerName = apBill.getEnterprise().getEnName();// 客户名
-				XingePusher.pushByUserUU(vendUseruu, "收到一张客户应付票据", "客户：" + customerName, "", 
-						"");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseApCheckSaveEvent.java

@@ -1,41 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseApCheck;
-import com.uas.platform.b2b.model.PurchaseApCheckIndex;
-
-public class PurchaseApCheckSaveEvent extends SaveEvent<PurchaseApCheckIndex, PurchaseApCheck> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseApCheckSaveEvent(List<PurchaseApCheck> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseApCheckIndex> split(PurchaseApCheck saved) {
-		long key = saved.getId();
-		long enUU = saved.getEnUu();
-		List<PurchaseApCheckIndex> indexes = new ArrayList<PurchaseApCheckIndex>();
-		// // 单号（匹配完整的编号）
-		indexes.add(new PurchaseApCheckIndex(enUU, key, saved.getCode()));
-		// 供应商名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseApCheckIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getCustName(), false)));
-		// // 供应商UU号（匹配完整的UU号）
-		indexes.add(new PurchaseApCheckIndex(enUU, key, saved.getCustUu().toString()));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseApCheck> savedList) {
-		// TODO Auto-generated method stub
-
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseBadInSaveEvent.java

@@ -1,78 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseBadIn;
-import com.uas.platform.b2b.model.PurchaseBadInIndex;
-import com.uas.platform.b2b.model.PurchaseBadInItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户不良品入库单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseBadInSaveEvent extends SaveEvent<PurchaseBadInIndex, PurchaseBadIn> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseBadInSaveEvent(List<PurchaseBadIn> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseBadInIndex> split(PurchaseBadIn saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseBadInIndex> indexes = new ArrayList<PurchaseBadInIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseBadInIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getBadInItems())) {
-			indexes.addAll(PurchaseBadInIndex.format(
-					enUU,
-					key,
-					SearchKeyUtils.splitToKeys(saved.getBadInItems().toArray(new PurchaseBadInItem[1])[0].getOrderItem().getOrder()
-							.getEnterprise().getEnName(), false)));
-			indexes.add(new PurchaseBadInIndex(enUU, key, saved.getBadInItems().toArray(new PurchaseBadInItem[1])[0].getOrderItem()
-					.getOrder().getEnterprise().getUu().toString()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (PurchaseBadInItem item : saved.getBadInItems()) {
-			indexes.add(new PurchaseBadInIndex(enUU, key, item.getOrderItem().getOrder().getCode()));
-			indexes.add(new PurchaseBadInIndex(enUU, key, item.getOrderItem().getProduct().getCode()));
-			indexes.addAll(PurchaseBadInIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getTitle(), false)));
-			indexes.addAll(PurchaseBadInIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseBadIn> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (PurchaseBadIn badIn : savedList) {
-			for (PurchaseBadInItem badInItem : badIn.getBadInItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-				if (!productId.contains(badInItem.getOrderItem().getProduct().getId())) {
-					XingePusher.pushByUserUU(badInItem.getOrderItem().getOrder().getVendUserUU(), "物料已被客户不良品入库", "物料："
-							+ badInItem.getOrderItem().getProduct().getTitle(), "", "");
-					productId.add(badInItem.getOrderItem().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseBadOutSaveEvent.java

@@ -1,78 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseBadOut;
-import com.uas.platform.b2b.model.PurchaseBadOutIndex;
-import com.uas.platform.b2b.model.PurchaseBadOutItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户不良品出库单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseBadOutSaveEvent extends SaveEvent<PurchaseBadOutIndex, PurchaseBadOut> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseBadOutSaveEvent(List<PurchaseBadOut> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseBadOutIndex> split(PurchaseBadOut saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseBadOutIndex> indexes = new ArrayList<PurchaseBadOutIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseBadOutIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getBadOutItems())) {
-			indexes.addAll(PurchaseBadOutIndex.format(
-					enUU,
-					key,
-					SearchKeyUtils.splitToKeys(saved.getBadOutItems().toArray(new PurchaseBadOutItem[1])[0].getOrderItem().getOrder()
-							.getEnterprise().getEnName(), false)));
-			indexes.add(new PurchaseBadOutIndex(enUU, key, saved.getBadOutItems().toArray(new PurchaseBadOutItem[1])[0].getOrderItem()
-					.getOrder().getEnterprise().getUu().toString()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (PurchaseBadOutItem item : saved.getBadOutItems()) {
-			indexes.add(new PurchaseBadOutIndex(enUU, key, item.getOrderItem().getOrder().getCode()));
-			indexes.add(new PurchaseBadOutIndex(enUU, key, item.getOrderItem().getProduct().getCode()));
-			indexes.addAll(PurchaseBadOutIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getTitle(), false)));
-			indexes.addAll(PurchaseBadOutIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseBadOut> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (PurchaseBadOut badOut : savedList) {
-			for (PurchaseBadOutItem badOutItem : badOut.getBadOutItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-				if (!productId.contains(badOutItem.getOrderItem().getProduct().getId())) {
-					XingePusher.pushByUserUU(badOutItem.getOrderItem().getOrder().getVendUserUU(), "物料已被客户不良品出库", "物料："
-							+ badOutItem.getOrderItem().getProduct().getTitle(), "", "");
-					productId.add(badOutItem.getOrderItem().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseForecastItemSaveEvent.java

@@ -1,66 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseForecastAllItem;
-import com.uas.platform.b2b.model.PurchaseForecastItemIndex;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户采购预测单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseForecastItemSaveEvent extends SaveEvent<PurchaseForecastItemIndex, PurchaseForecastAllItem> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseForecastItemSaveEvent(List<PurchaseForecastAllItem> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseForecastItemIndex> split(PurchaseForecastAllItem saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseForecastItemIndex> indexes = new ArrayList<PurchaseForecastItemIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseForecastItemIndex(enUU, key, saved.getOrder().getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseForecastItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrder().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseForecastItemIndex(enUU, key, saved.getOrder().getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseForecastItemIndex(enUU, key, saved.getProduct().getCode()));
-		indexes.addAll(PurchaseForecastItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getTitle(), false)));
-		indexes.addAll(PurchaseForecastItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseForecastAllItem> savedList) {
-		Set<Long> vendUsers = new HashSet<Long>();
-		for (PurchaseForecastAllItem item : savedList) {
-			// 每一个相关的供应商联系人每次只接收到一条推送通知
-			if (!vendUsers.contains(item.getVendUserUU())) {
-				if (item.getVendUserUU() != null) {
-					XingePusher.pushByUserUU(item.getVendUserUU(), "客户对您下达了新的采购预测", "", "", 
-							"");
-				}
-				vendUsers.add(item.getVendUserUU());
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemSaveEvent.java

@@ -1,63 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseInquiry;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiryItemIndex;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户询价单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseInquiryItemSaveEvent extends SaveEvent<PurchaseInquiryItemIndex, PurchaseInquiryItem> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseInquiryItemSaveEvent(List<PurchaseInquiryItem> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseInquiryItemIndex> split(PurchaseInquiryItem saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseInquiryItemIndex> indexes = new ArrayList<PurchaseInquiryItemIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseInquiryItemIndex(enUU, key, saved.getInquiry().getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseInquiryItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getInquiry().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseInquiryItemIndex(enUU, key, saved.getInquiry().getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseInquiryItemIndex(enUU, key, saved.getProduct().getCode()));
-		indexes.addAll(PurchaseInquiryItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getTitle(), false)));
-		indexes.addAll(PurchaseInquiryItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseInquiryItem> savedList) {
-		// 将询价信息推送通知供应商联系人UU号
-		for (PurchaseInquiryItem item : savedList) {
-			PurchaseInquiry inquiry = item.getInquiry();
-			if (item.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(item.getVendUserUU(), "新增一条客户询价单", "单号:" + inquiry.getCode() + ",客户:" + inquiry.getEnterprise().getEnName(), 
-						"#/sale/inquiry/" + item.getId(),
-						"客户采购询价单");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryMouldSaveEvent.java

@@ -1,55 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseInquiryMould;
-import com.uas.platform.b2b.model.PurchaseInquiryMouldIndex;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 模具询价单保存事件
- * 
- * 
- * 
- */
-public class PurchaseInquiryMouldSaveEvent extends SaveEvent<PurchaseInquiryMouldIndex, PurchaseInquiryMould> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseInquiryMouldSaveEvent(List<PurchaseInquiryMould> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseInquiryMouldIndex> split(PurchaseInquiryMould saved) {
-		long key = saved.getId();
-		long enUU = saved.getVenduu();
-		List<PurchaseInquiryMouldIndex> indexes = new ArrayList<PurchaseInquiryMouldIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseInquiryMouldIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.add((PurchaseInquiryMouldIndex) PurchaseInquiryMouldIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseInquiryMouldIndex(enUU, key, saved.getEnuu().toString()));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseInquiryMould> savedList) {
-		// 将询价信息推送通知供应商联系人UU号
-		for (PurchaseInquiryMould mould : savedList) {
-			if (mould.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(mould.getVendUserUU(), "新增一条客户模具询价单",
-						"单号:" + mould.getCode() + ",客户:" + mould.getEnterprise().getEnName(),
-						"#/sale/mould/" + mould.getId(), "客户模具询价单");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseMRBSaveEvent.java

@@ -1,71 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseMRB;
-import com.uas.platform.b2b.model.PurchaseMRBIndex;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户MRB单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseMRBSaveEvent extends SaveEvent<PurchaseMRBIndex, PurchaseMRB> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseMRBSaveEvent(List<PurchaseMRB> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseMRBIndex> split(PurchaseMRB saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseMRBIndex> indexes = new ArrayList<PurchaseMRBIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseMRBIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseMRBIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderItem().getOrder().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseMRBIndex(enUU, key, saved.getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseMRBIndex(enUU, key, saved.getOrderItem().getProduct().getCode()));
-		indexes.addAll(PurchaseMRBIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderItem().getProduct().getTitle(), false)));
-		indexes.addAll(PurchaseMRBIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderItem().getProduct().getSpec(), false)));
-		// 判定结果
-		indexes.add(new PurchaseMRBIndex(enUU, key, saved.getResult()));
-		// 订单编号
-		indexes.add(new PurchaseMRBIndex(enUU, key, saved.getOrderItem().getOrder().getCode()));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseMRB> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (PurchaseMRB purchaseMRB : savedList) {
-			// 不是每一个明细都发送，每个物料发一个
-			if (!productId.contains(purchaseMRB.getOrderItem().getProduct().getId())) {
-				XingePusher.pushByUserUU(purchaseMRB.getOrderItem().getOrder().getVendUserUU(), "物料已被客户MRB入库", "物料：" + purchaseMRB.getOrderItem().getProduct().getTitle(), 
-						"", 
-						"");
-				productId.add(purchaseMRB.getOrderItem().getProduct().getId());
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseNoticeSaveEvent.java

@@ -1,67 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseNoticeIndex;
-import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户送货提醒单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseNoticeSaveEvent extends SaveEvent<PurchaseNoticeIndex, PurchaseNotice> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseNoticeSaveEvent(List<PurchaseNotice> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseNoticeIndex> split(PurchaseNotice saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseNoticeIndex> indexes = new ArrayList<PurchaseNoticeIndex>();
-		// 采购单号（匹配完整的编号）
-		indexes.add(new PurchaseNoticeIndex(enUU, key, saved.getOrderItem().getOrder().getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseNoticeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderItem().getOrder().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseNoticeIndex(enUU, key, saved.getOrderItem().getOrder().getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseNoticeIndex(enUU, key, saved.getOrderItem().getProduct().getCode()));
-		//送货工厂
-		if (saved.getOrderItem().getFactory() != null) {
-			indexes.add(new PurchaseNoticeIndex(enUU, key, saved.getOrderItem().getFactory()));
-		}
-		indexes.addAll(PurchaseNoticeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getOrderItem().getProduct().getTitle(), false)));
-		indexes.addAll(PurchaseNoticeIndex.format(enUU, key, SearchKeyUtils.splitToKeys(saved.getOrderItem().getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseNotice> savedList) {
-		// 将送货提醒推送通知供应商联系人UU号
-		for (PurchaseNotice notice : savedList) {
-			PurchaseOrder order = notice.getOrderItem().getOrder();
-			if (order.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(order.getVendUserUU(), "新增一个送货提醒", "客户采购单号:" + order.getCode() + ",客户:"
-						+ order.getEnterprise().getEnName(), 
-						"#/sale/notice/" + notice.getId(), 
-						"客户发货提醒");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseOrderChangeSaveEvent.java

@@ -1,67 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseOrderChange;
-import com.uas.platform.b2b.model.PurchaseOrderChangeIndex;
-import com.uas.platform.b2b.model.PurchaseOrderChangeItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户采购变更单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseOrderChangeSaveEvent extends SaveEvent<PurchaseOrderChangeIndex, PurchaseOrderChange> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseOrderChangeSaveEvent(List<PurchaseOrderChange> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseOrderChangeIndex> split(PurchaseOrderChange saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseOrderChangeIndex> indexes = new ArrayList<PurchaseOrderChangeIndex>();
-		// 采购单号（匹配完整的编号）
-		indexes.add(new PurchaseOrderChangeIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseOrderChangeIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (PurchaseOrderChangeItem item : saved.getOrderChangeItems()) {
-			indexes.add(new PurchaseOrderChangeIndex(enUU, key, item.getOldProduct().getCode()));
-			indexes.addAll(PurchaseOrderChangeIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOldProduct().getTitle(), false)));
-			indexes.addAll(PurchaseOrderChangeIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getOldProduct().getSpec(), false)));
-			indexes.add(new PurchaseOrderChangeIndex(enUU, key, item.getNewProduct().getCode()));
-			indexes.addAll(PurchaseOrderChangeIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getNewProduct().getTitle(), false)));
-			indexes.addAll(PurchaseOrderChangeIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(item.getNewProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseOrderChange> savedList) {
-		for (PurchaseOrderChange change : savedList) {
-			if (change.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(change.getVendUserUU(), "新增一条客户采购变更单", "单号:"
-						+ change.getOrderCode() + ",客户:" + change.getEnterprise().getEnName(), 
-						"#/sale/chenge/" + change.getId(), 
-						"客户采购变更单");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseOrderSaveEvent.java

@@ -1,84 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderAllItem;
-import com.uas.platform.b2b.model.PurchaseOrderIndex;
-
-/**
- * 客户采购单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseOrderSaveEvent extends SaveEvent<PurchaseOrderIndex, PurchaseOrderAll> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseOrderSaveEvent(List<PurchaseOrderAll> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseOrderIndex> split(PurchaseOrderAll saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		long venUU = saved.getVendUU();
-		List<PurchaseOrderIndex> indexes = new ArrayList<PurchaseOrderIndex>();
-		// 采购单号（匹配完整的编号）
-		indexes.add(new PurchaseOrderIndex(enUU, key, venUU, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseOrderIndex(enUU, key, venUU, saved.getEnUU().toString()));
-		// 供应商UU号(匹配完整的UU号）
-		indexes.add(new PurchaseOrderIndex(enUU, key, venUU, saved.getVendUU().toString()));
-
-		// 送货工厂全称匹配
-		for (PurchaseOrderAllItem item : saved.getOrderItems()) {
-			indexes.add(new PurchaseOrderIndex(enUU, key, venUU, item.getProduct().getCode()));
-			indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
-					SearchKeyUtils.splitToKeys(item.getProduct().getTitle(), false)));
-			indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
-					SearchKeyUtils.splitToKeys(item.getProduct().getSpec(), false)));
-			if (item.getFactory() != null) {
-				indexes.add(new PurchaseOrderIndex(enUU, key, venUU, item.getFactory()));
-			}
-			// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-			if (item.getProduct() != null) {
-				indexes.add(new PurchaseOrderIndex(enUU, key, venUU, item.getProduct().getCode()));
-				indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
-						SearchKeyUtils.splitToKeys(item.getProduct().getSpec(), false)));
-				indexes.addAll(PurchaseOrderIndex.format(enUU, key, venUU,
-						SearchKeyUtils.splitToKeys(item.getProduct().getTitle(), false)));
-			}
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseOrderAll> savedList) {
-		// 将采购单信息推送通知供应商联系人UU号
-		for (PurchaseOrderAll order : savedList) {
-			if (order.getVendUserUU() != null) {
-				// 如果采购单单据存在客户联系人UU且UU正确--->客户联系人UU
-				// 如果不存在，但是平台中企业供应商资料存在供应商联系人UU--->平台中供应商资料中的联系人UU
-				// 否则不推送
-				/*
-				 * PushUtils.push(order.getVendUU(), order.getVendUserUU(),
-				 * "收到新的客户采购单", "单号：" + order.getCode() + "，客户：" +
-				 * order.getEnterprise().getEnName(), "#/sale/order/" +
-				 * order.getId(), "客户采购订单");
-				 */
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseProofingApprovalSaveEvent.java

@@ -1,82 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
-import com.uas.platform.b2b.model.PurchaseProofingApproval;
-import com.uas.platform.b2b.model.PurchaseProofingApprovalIndex;
-import com.uas.platform.b2b.model.PurchaseProofingSend;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户认定单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseProofingApprovalSaveEvent extends SaveEvent<PurchaseProofingApprovalIndex, PurchaseProofingApproval> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	@Autowired
-	private PurchaseProofingSendDao purchaseProofingSendDao;
-
-	public PurchaseProofingApprovalSaveEvent(List<PurchaseProofingApproval> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseProofingApprovalIndex> split(PurchaseProofingApproval saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseProofingApprovalIndex> indexes = new ArrayList<PurchaseProofingApprovalIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseProofingApprovalIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseProofingApprovalIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseProofingApprovalIndex(enUU, key, saved.getEnUU().toString()));
-		// 认定结果
-		if(StringUtils.hasText(saved.getFinalresult())) {
-			indexes.add(new PurchaseProofingApprovalIndex(enUU, key, saved.getFinalresult()));
-		}
-		// 送样单号
-		if(StringUtils.hasText(saved.getPscode())) {
-			indexes.add(new PurchaseProofingApprovalIndex(enUU, key, saved.getPscode()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseProofingApprovalIndex(enUU, key, saved.getProdCode()));
-		indexes.addAll(PurchaseProofingApprovalIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProdDetail(), false)));
-		indexes.addAll(PurchaseProofingApprovalIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProdSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseProofingApproval> savedList) {
-		// 发送推送消息
-		for (PurchaseProofingApproval approval : savedList) {
-			if (approval.getSscode() != null && approval.getVendUU() != null) {
-				List<PurchaseProofingSend> sends = purchaseProofingSendDao.findByProofingItemVendUUAndCode(
-						approval.getVendUU(), approval.getSscode());
-				if (sends.size() > 0) {
-					PurchaseProofingSend send = sends.get(0);
-					XingePusher.pushByUserUU(send.getProofingItem().getVendUserUU(), "客户返回了送样认定单", "送样单号:" + approval.getSscode(), 
-							"", 
-							"");
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseProofingItemSaveEvent.java

@@ -1,63 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseProofingItem;
-import com.uas.platform.b2b.model.PurchaseProofingItemIndex;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户送样申请单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseProofingItemSaveEvent extends SaveEvent<PurchaseProofingItemIndex, PurchaseProofingItem> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseProofingItemSaveEvent(List<PurchaseProofingItem> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseProofingItemIndex> split(PurchaseProofingItem saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseProofingItemIndex> indexes = new ArrayList<PurchaseProofingItemIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new PurchaseProofingItemIndex(enUU, key, saved.getProofing().getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(PurchaseProofingItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProofing().getEnterprise().getEnName(), false)));
-		// 客户UU号（匹配完整的UU号）
-		indexes.add(new PurchaseProofingItemIndex(enUU, key, saved.getProofing().getEnUU().toString()));
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		indexes.add(new PurchaseProofingItemIndex(enUU, key, saved.getProofing().getProduct().getCode()));
-		indexes.addAll(PurchaseProofingItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProofing().getProduct().getTitle(), false)));
-		indexes.addAll(PurchaseProofingItemIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getProofing().getProduct().getSpec(), false)));
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseProofingItem> savedList) {
-		// 发送推送消息
-		for (PurchaseProofingItem proofingItem : savedList) {
-			// 每个明细发一个
-			if (proofingItem.getVendUserUU() != null) {
-				XingePusher.pushByUserUU(proofingItem.getVendUserUU(), "新增客户的打样申请单", "物料："
-						+ proofingItem.getProofing().getProduct().getTitle(), 
-						"", 
-						"");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/PurchaseReturnSaveEvent.java

@@ -1,82 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.PurchaseReturn;
-import com.uas.platform.b2b.model.PurchaseReturnIndex;
-import com.uas.platform.b2b.model.PurchaseReturnItem;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 客户采购验收单保存事件
- * 
- * @author yingp
- * 
- */
-public class PurchaseReturnSaveEvent extends SaveEvent<PurchaseReturnIndex, PurchaseReturn> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public PurchaseReturnSaveEvent(List<PurchaseReturn> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<PurchaseReturnIndex> split(PurchaseReturn saved) {
-		long key = saved.getId();
-		long enUU = saved.getVendUU();
-		List<PurchaseReturnIndex> indexes = new ArrayList<PurchaseReturnIndex>();
-		// 采购单号（匹配完整的编号）
-		indexes.add(new PurchaseReturnIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getReturnItems())) {
-			PurchaseReturnItem item = saved.getReturnItems().toArray(new PurchaseReturnItem[1])[0];
-			if (item.getOrderItem() != null) {
-				indexes.addAll(PurchaseReturnIndex.format(enUU, key,
-						SearchKeyUtils.splitToKeys(item.getOrderItem().getOrder().getEnterprise().getEnName(), false)));
-				indexes.add(new PurchaseReturnIndex(enUU, key, item.getOrderItem().getOrder().getEnterprise().getUu().toString()));
-			}
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (PurchaseReturnItem item : saved.getReturnItems()) {
-			if (item.getOrderItem() != null) {
-				if (item.getOrderItem().getFactory() != null) {
-					indexes.add(new PurchaseReturnIndex(enUU, key, item.getOrderItem().getFactory()));
-				}
-				indexes.add(new PurchaseReturnIndex(enUU, key, item.getOrderItem().getProduct().getCode()));
-				indexes.add(new PurchaseReturnIndex(enUU, key, item.getOrderItem().getOrder().getCode()));
-				indexes.addAll(PurchaseReturnIndex.format(enUU, key,
-						SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getTitle(), false)));
-				indexes.addAll(PurchaseReturnIndex.format(enUU, key,
-						SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getSpec(), false)));
-			}
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<PurchaseReturn> savedList) {
-		// 发送推送消息
-		Set<Long> productId = new HashSet<Long>();
-		for (PurchaseReturn re : savedList) {
-			for (PurchaseReturnItem returnItem : re.getReturnItems()) {
-				// 不是每一个明细都发送，每个物料发一个
-				if (!productId.contains(returnItem.getOrderItem().getProduct().getId())) {
-					XingePusher.pushByUserUU(returnItem.getOrderItem().getOrder().getVendUserUU(), "物料已被客户采购验退", "物料："
-							+ returnItem.getOrderItem().getProduct().getTitle(), "", "");
-					productId.add(returnItem.getOrderItem().getProduct().getId());
-				}
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/SaleArCheckSaveEvent.java

@@ -1,64 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.dao.VendorDao;
-import com.uas.platform.b2b.model.SaleARCheck;
-import com.uas.platform.b2b.model.SaleARCheckIndex;
-import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.b2b.support.XingePusher;
-
-/** 
- * @author  yuj 
- * @date 创建时间：2015年11月18日 上午10:30:06 
- * @Description:  
- * @version 1.0  
- */
-public class SaleArCheckSaveEvent extends SaveEvent<SaleARCheckIndex, SaleARCheck> {
-
-
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * @param savedList
-	 */
-	public SaleArCheckSaveEvent(List<SaleARCheck> savedList) {
-		super(savedList);
-	}
-
-
-	@Override
-	public List<SaleARCheckIndex> split(SaleARCheck saved) {
-		long key = saved.getId();
-		long enUU = saved.getEnUU();
-		List<SaleARCheckIndex> indexes = new ArrayList<SaleARCheckIndex>();
-		// 单号（匹配完整的编号）
-		indexes.add(new SaleARCheckIndex(enUU, key, saved.getCode()));
-		// 供应商名称（匹配两个字以上的客户名称关键字）
-		indexes.addAll(SaleARCheckIndex.format(enUU, key,
-				SearchKeyUtils.splitToKeys(saved.getVendor().getEnName(), false)));
-		// 供应商UU号（匹配完整的UU号）
-		indexes.add(new SaleARCheckIndex(enUU, key, saved.getVendUU().toString()));
-		return indexes;
-	}
-
-
-	@Override
-	public void pusher(List<SaleARCheck> savedList) {
-		// 发送推送消息
-		VendorDao vendorDao = ContextUtils.getBean(VendorDao.class);
-		for (SaleARCheck saleArCheck : savedList) {
-			List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(saleArCheck.getEnUU(), saleArCheck.getVendUU());
-			if (vendors.size() > 0) {
-				Long customerUserUU =  vendors.get(0).getMyUserUU(); // 买家公司userUU号
-				String vendName = saleArCheck.getVendor().getEnName(); //供应商名称
-				XingePusher.pushByUserUU(customerUserUU, "收到一张应付对账单", "客户：" + vendName, "", 
-						"");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/SaleQuotationSaveEvent.java

@@ -1,72 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.SaleQuotationItem;
-import com.uas.platform.b2b.model.SaleQuotationItemIndex;
-import com.uas.platform.b2b.support.XingePusher;
-import com.uas.platform.core.model.Status;
-
-/**
- * 主动报价保存事件
- * 
- * @author suntg
- * 
- */
-public class SaleQuotationSaveEvent extends SaveEvent<SaleQuotationItemIndex, SaleQuotationItem> {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public SaleQuotationSaveEvent(List<SaleQuotationItem> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<SaleQuotationItemIndex> split(SaleQuotationItem saved) {
-		if(saved.getQuotation().getStatus() != Status.SUBMITTED.value()) {
-			long key = saved.getId();
-			long enUU = saved.getQuotation().getEnUU();
-			List<SaleQuotationItemIndex> indexes = new ArrayList<SaleQuotationItemIndex>();
-			// 发货单号（匹配完整的编号）
-			indexes.add(new SaleQuotationItemIndex(enUU, key, saved.getQuotation().getCode()));
-			// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-			indexes.addAll(SaleQuotationItemIndex.format(
-					enUU,
-					key,
-					SearchKeyUtils.splitToKeys(saved.getQuotation().getCust().getEnName(), false)));
-			indexes.add(new SaleQuotationItemIndex(enUU, key, saved.getQuotation().getCustUU().toString()));
-			// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-			indexes.add(new SaleQuotationItemIndex(enUU, key, saved.getProduct().getCode()));
-			indexes.addAll(SaleQuotationItemIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(saved.getProduct().getTitle(), false)));
-			indexes.addAll(SaleQuotationItemIndex.format(enUU, key,
-					SearchKeyUtils.splitToKeys(saved.getProduct().getSpec(), false)));
-			return indexes;
-		}
-		return null;
-	}
-
-	@Override
-	public void pusher(List<SaleQuotationItem> savedList) {
-		// 发送推送消息
-		Set<Long> quotationIds = new HashSet<Long>();
-		for(SaleQuotationItem item : savedList) {
-			if(item.getQuotation().getStatus() == Status.SUBMITTED.value() && !quotationIds.contains(item.getQuotation().getId())){
-				XingePusher.pushByUserUU(item.getQuotation().getCustUserUU(), "新增供应商主动报价", "单号:"
-						+ item.getQuotation().getCode(), 
-						"", 
-						"");
-				quotationIds.add(item.getQuotation().getId());
-			}
-			
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/event/SaleSendSaveEvent.java

@@ -1,74 +0,0 @@
-package com.uas.platform.b2b.event;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.core.util.SearchKeyUtils;
-import com.uas.platform.b2b.model.SaleSend;
-import com.uas.platform.b2b.model.SaleSendIndex;
-import com.uas.platform.b2b.model.SaleSendItem;
-import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.b2b.support.XingePusher;
-
-/**
- * 发货单保存事件
- * 
- * @author suntg
- * 
- */
-public class SaleSendSaveEvent extends SaveEvent<SaleSendIndex, SaleSend> {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	public SaleSendSaveEvent(List<SaleSend> savedList) {
-		super(savedList);
-	}
-
-	@Override
-	public List<SaleSendIndex> split(SaleSend saved) {
-		long key = saved.getId();
-		long enUU = saved.getEnUU();
-
-		List<SaleSendIndex> indexes = new ArrayList<SaleSendIndex>();
-		// 发货单号（匹配完整的编号）
-		indexes.add(new SaleSendIndex(enUU, key, saved.getCode()));
-		// 客户名称（匹配两个字以上的客户名称关键字）、客户UU号
-		if (CollectionUtils.isEmpty(saved.getSendItems())) {
-			indexes.addAll(SaleSendIndex.format(
-					enUU,
-					key,
-					SearchKeyUtils.splitToKeys(saved.getSendItems().toArray(new SaleSendItem[1])[0].getOrderItem().getOrder()
-							.getEnterprise().getEnName(), false)));
-			indexes.add(new SaleSendIndex(enUU, key, saved.getCustUU().toString()));
-		}
-		// 物料（匹配完整的物料编号、两个字以上的物料名称及规格关键字）
-		for (SaleSendItem item : saved.getSendItems()) {
-			if (item.getOrderItem().getFactory() != null) {
-				indexes.add(new SaleSendIndex(enUU, key, item.getOrderItem().getFactory()));
-			}
-			indexes.add(new SaleSendIndex(enUU, key, item.getOrderItem().getProduct().getCode()));
-			// 匹配完整的采购订单编号
-			indexes.add(new SaleSendIndex(enUU, key, item.getOrderItem().getOrder().getCode()));
-			indexes.addAll(SaleSendIndex.format(enUU, key, SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getTitle(), false)));
-			indexes.addAll(SaleSendIndex.format(enUU, key, SearchKeyUtils.splitToKeys(item.getOrderItem().getProduct().getSpec(), false)));
-		}
-		return indexes;
-	}
-
-	@Override
-	public void pusher(List<SaleSend> savedList) {
-		// 发送推送消息
-		for (SaleSend saleSend : savedList) {
-			if (saleSend.getCustUserUU() != null) {
-				XingePusher.pushByUserUU(saleSend.getCustUserUU(), "供应商发货了", "供应商：" + SystemSession.getUser().getEnterprise().getEnName(),
-						"", "");
-			}
-		}
-	}
-
-}

src/main/java/com/uas/platform/b2b/listener/KeywordListener.java

@@ -1,34 +1,10 @@
 package com.uas.platform.b2b.listener;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import com.uas.platform.b2b.event.SaveEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import com.uas.platform.b2b.dao.MakeAcceptIndexDao;
-import com.uas.platform.b2b.dao.MakeOrderChangeIndexDao;
-import com.uas.platform.b2b.dao.MakeOrderIndexDao;
-import com.uas.platform.b2b.dao.MakeReturnIndexDao;
-import com.uas.platform.b2b.dao.ProductIndexDao;
-import com.uas.platform.b2b.dao.PurchaseAcceptIndexDao;
-import com.uas.platform.b2b.dao.PurchaseApBillIndexDao;
-import com.uas.platform.b2b.dao.PurchaseApCheckIndexDao;
-import com.uas.platform.b2b.dao.PurchaseBadInIndexDao;
-import com.uas.platform.b2b.dao.PurchaseBadOutIndexDao;
-import com.uas.platform.b2b.dao.PurchaseForecastItemIndexDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryItemIndexDao;
-import com.uas.platform.b2b.dao.PurchaseMRBIndexDao;
-import com.uas.platform.b2b.dao.PurchaseNoticeIndexDao;
-import com.uas.platform.b2b.dao.PurchaseOrderChangeIndexDao;
-import com.uas.platform.b2b.dao.PurchaseOrderIndexDao;
-import com.uas.platform.b2b.dao.PurchaseProofingApprovalIndexDao;
-import com.uas.platform.b2b.dao.PurchaseProofingItemIndexDao;
-import com.uas.platform.b2b.dao.PurchaseReturnIndexDao;
-import com.uas.platform.b2b.dao.SaleARCheckIndexDao;
-import com.uas.platform.b2b.dao.SaleQuotationItemIndexDao;
-import com.uas.platform.b2b.dao.SaleSendIndexDao;
-import com.uas.platform.b2b.event.SaveEvent;
-
 /**
  * 监听新增数据事件<br>
  * 将新增的数据拆分关键词，利于检索
@@ -39,134 +15,10 @@ import com.uas.platform.b2b.event.SaveEvent;
 @Component
 public class KeywordListener implements ApplicationListener<SaveEvent<?, ?>> {
 
-	@Autowired
-	private PurchaseAcceptIndexDao purchaseAcceptIndexDao;
-
-	@Autowired
-	private PurchaseApBillIndexDao purchaseApBillIndexDao;
-
-	@Autowired
-	private PurchaseBadInIndexDao purchaseBadInIndexDao;
-
-	@Autowired
-	private PurchaseBadOutIndexDao purchaseBadOutIndexDao;
-
-	@Autowired
-	private PurchaseForecastItemIndexDao purchaseForecastItemIndexDao;
-
-	@Autowired
-	private PurchaseInquiryItemIndexDao purchaseInquiryItemIndexDao;
-
-	@Autowired
-	private PurchaseMRBIndexDao purchaseMRBIndexDao;
-
-	@Autowired
-	private PurchaseNoticeIndexDao purchaseNoticeIndexDao;
-
-	@Autowired
-	private PurchaseOrderChangeIndexDao purchaseOrderChangeIndexDao;
-
-	@Autowired
-	private PurchaseOrderIndexDao purchaseOrderIndexDao;
-
-	@Autowired
-	private PurchaseProofingItemIndexDao purchaseProofingItemIndexDao;
-
-	@Autowired
-	private PurchaseReturnIndexDao purchaseReturnIndexDao;
-
-	@Autowired
-	private SaleSendIndexDao saleSendIndexDao;
-	
-	@Autowired
-	private ProductIndexDao productIndexDao;
-
-	@Autowired
-	private SaleQuotationItemIndexDao saleQuotationItemIndexDao;
-	
-	@Autowired
-	private PurchaseProofingApprovalIndexDao purchaseProofingApprovalIndexDao;
-
-	@Autowired
-	private MakeOrderIndexDao makeOrderIndexDao;
-	
-	@Autowired
-	private MakeOrderChangeIndexDao makeOrderChangeIndexDao;
-	
-	@Autowired
-	private MakeAcceptIndexDao makeAcceptIndexDao;
-	
-	@Autowired
-	private MakeReturnIndexDao makeReturnIndexDao;
-	
-	@Autowired
-	private SaleARCheckIndexDao saleARCheckIndexDao;
-	
-	@Autowired
-	PurchaseApCheckIndexDao purchaseApCheckIndexDao;
-	
 	@SuppressWarnings("unchecked")
 	@Async
 	@Override
 	public void onApplicationEvent(final SaveEvent<?, ?> event) {
-		// if (event instanceof PurchaseAcceptSaveEvent) {
-		// purchaseAcceptIndexDao.save((List<PurchaseAcceptIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseApBillSaveEvent) {
-		// purchaseApBillIndexDao.save((List<PurchaseApBillIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseBadInSaveEvent) {
-		// purchaseBadInIndexDao.save((List<PurchaseBadInIndex>) event.split());
-		// } else if (event instanceof PurchaseBadOutSaveEvent) {
-		// purchaseBadOutIndexDao.save((List<PurchaseBadOutIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseForecastItemSaveEvent) {
-		// purchaseForecastItemIndexDao.save((List<PurchaseForecastItemIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseInquiryItemSaveEvent) {
-		// purchaseInquiryItemIndexDao.save((List<PurchaseInquiryItemIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseMRBSaveEvent) {
-		// purchaseMRBIndexDao.save((List<PurchaseMRBIndex>) event.split());
-		// } else if (event instanceof PurchaseNoticeSaveEvent) {
-		// purchaseNoticeIndexDao.save((List<PurchaseNoticeIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseOrderChangeSaveEvent) {
-		// purchaseOrderChangeIndexDao.save((List<PurchaseOrderChangeIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseOrderSaveEvent) {
-		// purchaseOrderIndexDao.save((List<PurchaseOrderIndex>) event.split());
-		// } else if (event instanceof PurchaseProofingItemSaveEvent) {
-		// purchaseProofingItemIndexDao.save((List<PurchaseProofingItemIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseReturnSaveEvent) {
-		// purchaseReturnIndexDao.save((List<PurchaseReturnIndex>)
-		// event.split());
-		// } else if (event instanceof SaleSendSaveEvent) {
-		// saleSendIndexDao.save((List<SaleSendIndex>) event.split());
-		// } else if (event instanceof ProductSaveEvent) {
-		// productIndexDao.save((List<ProductIndex>) event.split());
-		// } else if (event instanceof SaleQuotationSaveEvent) {
-		// saleQuotationItemIndexDao.save((List<SaleQuotationItemIndex>)
-		// event.split());
-		// } else if (event instanceof PurchaseProofingApprovalSaveEvent) {
-		// purchaseProofingApprovalIndexDao.save((List<PurchaseProofingApprovalIndex>)
-		// event.split());
-		// } else if (event instanceof MakeOrderSaveEvent) {
-		// makeOrderIndexDao.save((List<MakeOrderIndex>) event.split());
-		// } else if (event instanceof MakeOrderChangeSaveEvent) {
-		// makeOrderChangeIndexDao.save((List<MakeOrderChangeIndex>)
-		// event.split());
-		// }else if (event instanceof MakeAcceptSaveEvent) {
-		// makeAcceptIndexDao.save((List<MakeAcceptIndex>) event.split());
-		// }else if (event instanceof MakeReturnSaveEvent) {
-		// makeReturnIndexDao.save((List<MakeReturnIndex>) event.split());
-		// }else if(event instanceof SaleArCheckSaveEvent) {
-		// saleARCheckIndexDao.save((List<SaleARCheckIndex>) event.split());
-		// }else if(event instanceof PurchaseApCheckSaveEvent) {
-		// purchaseApCheckIndexDao.save((List<PurchaseApCheckIndex>)
-		// event.split());
-		// }
 	}
 
 }

src/main/java/com/uas/platform/b2b/mobile/model/ApprovalLog.java

@@ -1,16 +1,12 @@
 package com.uas.platform.b2b.mobile.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+/**
+ * 审批日志
+ */
 @Entity
 @Table(name = "office$applog")
 public class ApprovalLog implements Serializable {

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

@@ -1,369 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import org.hibernate.annotations.Where;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-/**
- * 购物车
- * 
- * @author hejq
- * @time 创建时间：2017年2月25日
- */
-@Entity
-@Table(name = "purc$cart")
-public class Cart implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * id
-	 */
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$ca_gen")
-	@SequenceGenerator(name = "purc$ca_gen", sequenceName = "purc$ca_seq", allocationSize = 1)
-	@Column(name = "ca_id")
-	private Long id;
-
-	/**
-	 * 采购企业UU
-	 */
-	@Column(name = "ca_enuu")
-	private Long enUU;
-
-	/**
-	 * 采购企业
-	 */
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.REFRESH })
-	@JoinColumn(name = "ca_enuu", insertable = false, updatable = false)
-	private EnterpriseInfo enterprise;
-
-	/**
-	 * 采购单所属采购员
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "ca_useruu", insertable = false, updatable = false)
-	private User user;
-
-	/**
-	 * 采购单所属采购员UU
-	 */
-	@Column(name = "ca_useruu")
-	private Long userUU;
-
-	/**
-	 * 购物车单号
-	 */
-	@Column(name = "ca_code")
-	private String code;
-
-	/**
-	 * 单据归属日期
-	 */
-	@Column(name = "ca_date")
-	private Date date;
-
-	/**
-	 * 录单人
-	 */
-	@Column(name = "ca_recorder")
-	private String recorder;
-
-	/**
-	 * 审核人
-	 */
-	@Column(name = "ca_auditor")
-	private String auditor;
-
-	/**
-	 * 供应商UU
-	 */
-	@Column(name = "ca_venduu")
-	private Long vendUU;
-
-	/**
-	 * 供应商联系人UU
-	 */
-	@Column(name = "ca_venduseruu")
-	private Long vendUserUU;
-
-	/**
-	 * 供应商联系人
-	 */
-	@Column(name = "ca_venduser")
-	private String venduser;
-
-	/**
-	 * 供应商联系人电话
-	 */
-	@Column(name = "ca_vendusertel")
-	private String vendusertel;
-
-
-	public String getVendusertel() {
-		return vendusertel;
-	}
-
-	public void setVendusertel(String vendusertel) {
-		this.vendusertel = vendusertel;
-	}
-
-	public String getVenduser() {
-		return venduser;
-	}
-
-	public void setVenduser(String venduser) {
-		this.venduser = venduser;
-	}
-
-	/**
-	 * 收货地址
-	 */
-	@Column(name = "ca_shipaddress")
-	private String shipAddress;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "ca_remark")
-	private String remark;
-
-	/**
-	 * 付款币种
-	 */
-	@Column(name = "ca_currency")
-	private String currency;
-
-	/**
-	 * 汇率
-	 */
-	@Column(name = "ca_rate")
-	private Float rate;
-
-	/**
-	 * 付款方式
-	 */
-	@Column(name = "ca_payments")
-	private String payments;
-
-	/**
-	 * 购物车明细
-	 */
-	@OneToMany(mappedBy = "cart",  cascade = { CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE,
-			CascadeType.MERGE }, fetch = FetchType.EAGER)
-	@OrderBy("number")
-	private Set<CartDetail> cartDetails;
-
-	/**
-	 * 应付供应商名称
-	 */
-	@Column(name = "ca_receivename")
-	private String receiveName;
-
-	/**
-	 * 应付供应商编号
-	 */
-	@Column(name = "ca_receivecode")
-	private String receiveCode;
-
-	/**
-	 * 供应商名称
-	 */
-	@Transient
-	private String enName;
-	
-	/**
-	 * 提交状态
-	 */
-	@Column(name = "ca_status")
-	private Integer status;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public EnterpriseInfo getEnterprise() {
-		return enterprise;
-	}
-
-	public void setEnterprise(EnterpriseInfo enterprise) {
-		this.enterprise = enterprise;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
-	public Long getUserUU() {
-		return userUU;
-	}
-
-	public void setUserUU(Long userUU) {
-		this.userUU = userUU;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getRecorder() {
-		return recorder;
-	}
-
-	public void setRecorder(String recorder) {
-		this.recorder = recorder;
-	}
-
-	public String getAuditor() {
-		return auditor;
-	}
-
-	public void setAuditor(String auditor) {
-		this.auditor = auditor;
-	}
-
-	public Long getVendUU() {
-		return vendUU;
-	}
-
-	public void setVendUU(Long vendUU) {
-		this.vendUU = vendUU;
-	}
-
-	public Long getVendUserUU() {
-		return vendUserUU;
-	}
-
-	public void setVendUserUU(Long vendUserUU) {
-		this.vendUserUU = vendUserUU;
-	}
-
-	public String getShipAddress() {
-		return shipAddress;
-	}
-
-	public void setShipAddress(String shipAddress) {
-		this.shipAddress = shipAddress;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public Float getRate() {
-		return rate;
-	}
-
-	public void setRate(Float rate) {
-		this.rate = rate;
-	}
-
-	public String getPayments() {
-		return payments;
-	}
-
-	public void setPayments(String payments) {
-		this.payments = payments;
-	}
-
-	public Set<CartDetail> getCartDetails() {
-		return cartDetails;
-	}
-
-	public void setCartDetails(Set<CartDetail> cartDetails) {
-		this.cartDetails = cartDetails;
-	}
-
-	public String getReceiveName() {
-		return receiveName;
-	}
-
-	public void setReceiveName(String receiveName) {
-		this.receiveName = receiveName;
-	}
-
-	public String getReceiveCode() {
-		return receiveCode;
-	}
-
-	public void setReceiveCode(String receiveCode) {
-		this.receiveCode = receiveCode;
-	}
-
-	public String getEnName() {
-		return enName;
-	}
-
-	public void setEnName(String enName) {
-		this.enName = enName;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-}

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

@@ -1,255 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
-@Entity
-@Table(name = "purc$cartdetail")
-public class CartDetail {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$cartdetail_gen")
-	@SequenceGenerator(name = "purc$cartdetail_gen", sequenceName = "purc$cartdetail_seq", allocationSize = 1)
-	@Column(name = "cad_id")
-	private Long id;
-
-	/**
-	 * 序号
-	 */
-	@Column(name = "cad_number")
-	private Short number;
-
-	/**
-	 * 购物车主记录
-	 */
-	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "cad_caid", nullable = false)
-	private Cart cart;
-
-	/**
-	 * 产品ID
-	 */
-	@Column(name = "cad_prid")
-	private Long productId;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cad_prid", insertable = false, updatable = false)
-	private Product product;
-
-	/**
-	 * 数量
-	 */
-	@Column(name = "cad_qty")
-	private Double qty;
-
-	/**
-	 * 备注
-	 */
-	@Column(name = "cad_remark")
-	private String remark;
-
-	/**
-	 * 送货工厂
-	 */
-	@Column(name = "cad_factory")
-	private String factory;
-
-	/**
-	 * 供应商规格
-	 */
-	@Column(name = "cad_vendspec")
-	private String vendspec;
-
-	/**
-	 * 含税单价
-	 */
-	@Column(name = "cad_price")
-	private Double price;
-
-	/**
-	 * 税率
-	 */
-	@Column(name = "cad_taxrate")
-	private Float taxrate;
-
-	/**
-	 * 含税金额
-	 */
-	@Column(name = "cad_amount", insertable = false, updatable = false)
-	private Double amount;
-
-	/**
-	 * 不含税单价
-	 */
-	@Column(name = "cad_notaxprice", insertable = false, updatable = false)
-	private Double noTaxPrice;
-
-	/**
-	 * 不含税金额
-	 */
-	@Column(name = "cad_notaxamount", insertable = false, updatable = false)
-	private Double noTaxAmount;
-
-	/**
-	 * 交货日期
-	 */
-	@Column(name = "cad_delivery")
-	private Date delivery;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Short getNumber() {
-		return number;
-	}
-
-	public void setNumber(Short number) {
-		this.number = number;
-	}
-
-	@JsonIgnore
-	@JSONField(serialize = false)
-	public Cart getCart() {
-		return cart;
-	}
-
-	public void setCart(Cart cart) {
-		this.cart = cart;
-	}
-
-	public Long getProductId() {
-		return productId;
-	}
-
-	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
-	public Double getQty() {
-		return qty;
-	}
-
-	public void setQty(Double qty) {
-		this.qty = qty;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getFactory() {
-		return factory;
-	}
-
-	public void setFactory(String factory) {
-		this.factory = factory;
-	}
-
-	public String getVendspec() {
-		return vendspec;
-	}
-
-	public void setVendspec(String vendspec) {
-		this.vendspec = vendspec;
-	}
-
-	public Double getPrice() {
-		return price;
-	}
-
-	public void setPrice(Double price) {
-		this.price = price;
-	}
-
-	public Float getTaxrate() {
-		return taxrate;
-	}
-
-	public void setTaxrate(Float taxrate) {
-		this.taxrate = taxrate;
-	}
-
-	public Double getAmount() {
-		return amount;
-	}
-
-	public void setAmount(Double amount) {
-		this.amount = amount;
-	}
-
-	public Double getNoTaxPrice() {
-		return noTaxPrice;
-	}
-
-	public void setNoTaxPrice(Double noTaxPrice) {
-		this.noTaxPrice = noTaxPrice;
-	}
-
-	public Double getNoTaxAmount() {
-		return noTaxAmount;
-	}
-
-	public void setNoTaxAmount(Double noTaxAmount) {
-		this.noTaxAmount = noTaxAmount;
-	}
-
-	public Date getDelivery() {
-		return delivery;
-	}
-
-	public void setDelivery(Date delivery) {
-		this.delivery = delivery;
-	}
-
-	public static List<Cart> distinct(List<CartDetail> details) {
-		List<Cart> carts = new ArrayList<Cart>();
-		Set<Long> keys = new HashSet<Long>();
-		for (CartDetail detail : details) {
-			if (!keys.contains(detail.getCart().getId())) {
-				carts.add(detail.getCart());
-				keys.add(detail.getCart().getId());
-			}
-		}
-		return carts;
-	}
-
-}

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

@@ -1,113 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 单据类型
- * 
- * @author hejq
- * @time 创建时间：2017年3月16日
- */
-@Entity
-@Table(name = "office$documents")
-public class Documents implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$documents_gen")
-	@SequenceGenerator(name = "office$documents_gen", sequenceName = "office$documents_seq", allocationSize = 1)
-	@Column(name = "do_id")
-	private Long id;
-
-	/**
-	 * 企业uu
-	 */
-	@Column(name = "do_enuu")
-	private Long enuu;
-
-	/**
-	 * 用户uu
-	 */
-	@Column(name = "do_useruu")
-	private Long useruu;
-
-	/**
-	 * 单据名称
-	 */
-	@Column(name = "do_appname")
-	private String appname;
-
-	/**
-	 * 单据代码
-	 */
-	@Column(name = "do_appcode")
-	private Long appcode;
-
-	/**
-	 * 设置时间
-	 */
-	@Column(name = "do_date")
-	private Date date;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnuu() {
-		return enuu;
-	}
-
-	public void setEnuu(Long enuu) {
-		this.enuu = enuu;
-	}
-
-	public Long getUseruu() {
-		return useruu;
-	}
-
-	public void setUseruu(Long useruu) {
-		this.useruu = useruu;
-	}
-
-	public String getAppname() {
-		return appname;
-	}
-
-	public void setAppname(String appname) {
-		this.appname = appname;
-	}
-
-	public Long getAppcode() {
-		return appcode;
-	}
-
-	public void setAppcode(Long appcode) {
-		this.appcode = appcode;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-}

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

@@ -275,6 +275,11 @@ public class Enterprise implements Serializable {
 	@Column(name = "en_contactemail")
 	private String contactEmail;
 
+	/**
+	 * 企业权重 （用于供应商资源库排序） -- 2018年3月29日 17:59:00
+	 */
+	@Column(name = "en_weight")
+	private Integer weight;
 
 	public String getEnManagement() {
 		return enManagement;
@@ -750,4 +755,12 @@ public class Enterprise implements Serializable {
 	public void setContactEmail(String contactEmail) {
 		this.contactEmail = contactEmail;
 	}
+
+	public Integer getWeight() {
+		return weight;
+	}
+
+	public void setWeight(Integer weight) {
+		this.weight = weight;
+	}
 }

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

@@ -1,9 +1,6 @@
 package com.uas.platform.b2b.model;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
@@ -101,6 +98,36 @@ public class EnterpriseBaseInfo implements Serializable {
     @Column(name = "en_remark")
     private String remark;
 
+    /**
+     * 管理员姓名
+     */
+    @Transient
+    private String adminName;
+
+    /**
+     * 注册时间
+     */
+    @Transient
+    private Date date;
+
+    /**
+     * 邀请企业名称
+     */
+    @Transient
+    private String inviteEnName;
+
+    /**
+     * 邀请用户名
+     */
+    @Transient
+    private String inviteUserName;
+
+    /**
+     * 企业法人
+     */
+    @Transient
+    private String enCorporation;
+
     public EnterpriseBaseInfo(Long uu, String enBusinessCode, String enName, String enAddress) {
         this.uu = uu;
         this.enBusinessCode = enBusinessCode;
@@ -214,4 +241,37 @@ public class EnterpriseBaseInfo implements Serializable {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getInviteEnName() {
+        return inviteEnName;
+    }
+
+    public void setInviteEnName(String inviteEnName) {
+        this.inviteEnName = inviteEnName;
+    }
+
+    public String getInviteUserName() {
+        return inviteUserName;
+    }
+
+    public void setInviteUserName(String inviteUserName) {
+        this.inviteUserName = inviteUserName;
+    }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
+
+    public EnterpriseBaseInfo(Enterprise e) {
+        this.enName = e.getEnName();
+        this.uu = e.getUu();
+        this.enAddress = e.getEnAddress();
+        this.enTel = e.getEnTel();
+        this.date = e.getEnDate();
+        this.enCorporation = e.getEnCorporation();
+    }
 }

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

@@ -1,183 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.validation.constraints.Max;
-
-/**
- * 企业发布动态
- * 
- * @author hejq
- * @time 创建时间：2017年2月13日
- */
-@Entity
-@Table(name = "sec$enternews")
-public class EnterpriseNews implements Serializable {
-
-	/**
-	 * 序号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$enternews_gen")
-	@SequenceGenerator(name = "sec$enternews_gen", sequenceName = "sec$enternews_seq", allocationSize = 1)
-	@Column(name = "news_id")
-	private Long id;
-	
-	/**
-	 * 发布人
-	 */
-	@Column(name = "news_creater")
-	private String creater;
-	
-	/**
-	 * 发布人uu
-	 */
-	@Column(name = "news_createruu")
-	private Long createruu;
-
-	/**
-	 * 发布时间
-	 */
-	@Column(name = "news_date")
-	private Date date;
-
-	/**
-	 * 动态内容
-	 */
-	@Column(name = "news_content")
-	@Max(value = 4000)
-	private String content;
-	
-	/**
-	 * 企业
-	 */
-	@Column(name = "news_enname")
-	private String enname;
-	
-	/**
-	 * 企业uu
-	 */
-	@Column(name = "news_enuu")
-	private Long enuu;
-	
-	/**
-	 * 企业营业执照
-	 */
-	@Column(name = "news_businesscode")
-	private String businessCode;
-
-	/**
-	 * 转载来源
-	 */
-	@Column(name = "news_source")
-	private String source;
-
-	/**
-	 * 是否原创 <br>
-	 * 1. 是 <br>
-	 * 2. 否 <br>
-	 */
-	@Column(name = "news_isdeafult")
-	private Short isdefault;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCreater() {
-		return creater;
-	}
-
-	public void setCreater(String creater) {
-		this.creater = creater;
-	}
-
-	public Long getCreateruu() {
-		return createruu;
-	}
-
-	public void setCreateruu(Long createruu) {
-		this.createruu = createruu;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public String getEnname() {
-		return enname;
-	}
-
-	public void setEnname(String enname) {
-		this.enname = enname;
-	}
-
-	public Long getEnuu() {
-		return enuu;
-	}
-
-	public void setEnuu(Long enuu) {
-		this.enuu = enuu;
-	}
-
-	public String getBusinessCode() {
-		return businessCode;
-	}
-
-	public void setBusinessCode(String businessCode) {
-		this.businessCode = businessCode;
-	}
-
-	public String getSource() {
-		return source;
-	}
-
-	public void setSource(String source) {
-		this.source = source;
-	}
-
-	public Short getIsdefault() {
-		return isdefault;
-	}
-
-	public void setIsdefault(Short isdefault) {
-		this.isdefault = isdefault;
-	}
-
-	@Override
-	public String toString() {
-		return "EnterpriseNews [id=" + id + ", creater=" + creater + ", createruu=" + createruu + ", date=" + date
-				+ ", content=" + content + ", enname=" + enname + ", enuu=" + enuu + ", businessCode=" + businessCode
-				+ ", source=" + source + ", isdefault=" + isdefault + "]";
-	}
-
-}

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

@@ -1,109 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 企业标签
- * 
- * @author hejq
- * @time 创建时间：2017年2月13日
- */
-@Entity
-@Table(name = "sec$entogs")
-public class EnterpriseTogs implements Serializable {
-
-	/**
-	 * 序号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$entertog_gen")
-	@SequenceGenerator(name = "sec$entertog_gen", sequenceName = "sec$entertog_seq", allocationSize = 1)
-	@Column(name = "tog_id")
-	private Long id;
-
-	/**
-	 * 标签名字
-	 */
-	@Column(name = "tog_name")
-	private String name;
-
-	/**
-	 * 简介
-	 */
-	@Column(name = "tog_paraphrase")
-	private String paraphrase;
-
-	/**
-	 * 关联的企业营业执照号
-	 */
-	@Column(name = "tog_enbusinesscode")
-	private String enbusinesscode;
-
-	/**
-	 * 是否系统默认<br>
-	 * 1. 默认,不可删除 <br>
-	 * 0. 用户自定义，可删除
-	 */
-	@Column(name = "tog_isdefault")
-	private Short isdefault;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getParaphrase() {
-		return paraphrase;
-	}
-
-	public void setParaphrase(String paraphrase) {
-		this.paraphrase = paraphrase;
-	}
-
-	public String getEnbusinesscode() {
-		return enbusinesscode;
-	}
-
-	public void setEnbusinesscode(String enbusinesscode) {
-		this.enbusinesscode = enbusinesscode;
-	}
-
-	public Short getIsdefault() {
-		return isdefault;
-	}
-
-	public void setIsdefault(Short isdefault) {
-		this.isdefault = isdefault;
-	}
-
-	@Override
-	public String toString() {
-		return "EnterpriseTogs [id=" + id + ", name=" + name + ", paraphrase=" + paraphrase + ", enbusinesscode="
-				+ enbusinesscode + ", isdefault=" + isdefault + "]";
-	}
-
-}

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

@@ -1,59 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 流程条件设置
- * 
- * @author hejq
- * @time 创建时间：2017年3月19日
- */
-@Entity
-@Table(name = "office$flowconditions")
-public class FlowConditions implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$flowconditions_gen")
-	@SequenceGenerator(name = "office$flowconditions_gen", sequenceName = "office$flowconditions_seq", allocationSize = 1)
-	@Column(name = "fc_id")
-	private Long id;
-
-	/**
-	 * 企业uu
-	 */
-	@Column(name = "fc_enuu")
-	private Long enuu;
-	
-	/**
-	 * 设置人uu
-	 */
-	@Column(name = "fc_useruu")
-	private Long useruu;
-
-	/**
-	 * 设置人姓名
-	 */
-	@Column(name = "fc_username")
-	private String username;
-
-	/**
-	 * 设置时间
-	 */
-	@Column(name = "fc_date")
-	private Date date;
-
-}

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

@@ -0,0 +1,296 @@
+package com.uas.platform.b2b.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 针对用户的询价推荐提醒
+ *
+ * Created by hejq on 2018-01-31.
+ */
+public class InquiryRemind implements Serializable {
+
+    /**
+     * default serialVersionUID
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 询价单号
+     */
+    private String code;
+
+    /**
+     * 询价企业名称
+     */
+    private String enName;
+
+    /**
+     * 询价企业UU
+     */
+    private Long enUU;
+
+    /**
+     * 联系人
+     */
+    private String userName;
+
+    /**
+     * 联系方式
+     */
+    private String userTel;
+
+    /**
+     * 询价品牌
+     */
+    private String brand;
+
+    /**
+     * 原厂型号
+     */
+    private String cmpCode;
+
+    /**
+     * 物料规格
+     */
+    private String spec;
+
+    /**
+     * 物料名称
+     */
+    private String title;
+
+    /**
+     * 需求数量
+     */
+    private Double needQty;
+
+    /**
+     * 发布日期
+     */
+    private Date reDate;
+
+    /**
+     * 截止日期
+     */
+    private Date endDate;
+
+    /**
+     * 记录来源id
+     */
+    private Long itemId;
+
+    /**
+     * 记录转报价后的id
+     */
+    private Long newId;
+
+    /**
+     * 单据状态
+     * <note>
+     * {@code 100 在录入}
+     * {@code 101 已提交}
+     * {@code 102 已审核}
+     * {@code 103 未通过}
+     * {@code 104 已通过}
+     * </note>
+     */
+    private Integer status;
+
+    /**
+     * 被推荐的企业UU
+     */
+    private Long vendUU;
+
+    /**
+     * 被推荐的人员UU
+     */
+    private Long vendUserUU;
+
+    /**
+     * 记录日期
+     */
+    private Date date;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public Long getEnUU() {
+        return enUU;
+    }
+
+    public void setEnUU(Long enUU) {
+        this.enUU = enUU;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getCmpCode() {
+        return cmpCode;
+    }
+
+    public void setCmpCode(String cmpCode) {
+        this.cmpCode = cmpCode;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Double getNeedQty() {
+        return needQty;
+    }
+
+    public void setNeedQty(Double needQty) {
+        this.needQty = needQty;
+    }
+
+    public Date getReDate() {
+        return reDate;
+    }
+
+    public void setReDate(Date reDate) {
+        this.reDate = reDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Long getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    public Long getNewId() {
+        return newId;
+    }
+
+    public void setNewId(Long newId) {
+        this.newId = newId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Long getVendUU() {
+        return vendUU;
+    }
+
+    public void setVendUU(Long vendUU) {
+        this.vendUU = vendUU;
+    }
+
+    public Long getVendUserUU() {
+        return vendUserUU;
+    }
+
+    public void setVendUserUU(Long vendUserUU) {
+        this.vendUserUU = vendUserUU;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    @Override
+    public String toString() {
+        return "InquiryRemind{" +
+                "id=" + id +
+                ", code='" + code + '\'' +
+                ", enName='" + enName + '\'' +
+                ", enUU=" + enUU +
+                ", userName='" + userName + '\'' +
+                ", userTel='" + userTel + '\'' +
+                ", brand='" + brand + '\'' +
+                ", cmpCode='" + cmpCode + '\'' +
+                ", spec='" + spec + '\'' +
+                ", title='" + title + '\'' +
+                ", needQty=" + needQty +
+                ", reDate=" + reDate +
+                ", endDate=" + endDate +
+                ", itemId=" + itemId +
+                ", newId=" + newId +
+                ", status=" + status +
+                ", vendUU=" + vendUU +
+                ", vendUserUU=" + vendUserUU +
+                ", date=" + date +
+                '}';
+    }
+}

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

@@ -1,19 +1,9 @@
 package com.uas.platform.b2b.model;
 
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 /**
  * 邀请合作伙伴注册
  * 
@@ -58,7 +48,13 @@ public class InvitationRecord implements Serializable {
 	 */
 	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.REFRESH })
 	@JoinColumn(name = "in_useruu", insertable = false, updatable = false)
-	private User user;
+	private UserBaseInfo user;
+
+	/**
+	 * 邀请人联系方式
+	 */
+	@Column(name = "in_usertel")
+	private String userTel;
 	
 	/**
 	 * 最后一次邀请时间
@@ -67,25 +63,25 @@ public class InvitationRecord implements Serializable {
 	private Date date;
 
 	/**
-	 * 邀请的客户名称
+	 * 被邀请的客户名称
 	 */
 	@Column(name = "in_vendname")
 	private String vendname;
 
 	/**
-	 * 邀请的用户名称
+	 * 被邀请的用户名称
 	 */
 	@Column(name = "in_vendusername")
 	private String vendusername;
 
 	/**
-	 * 邀请的用户的电话
+	 * 被邀请的用户的电话
 	 */
 	@Column(name = "in_vendusertel")
 	private String vendusertel;
 
 	/**
-	 * 邀请的用户的邮箱
+	 * 被邀请的用户的邮箱
 	 */
 	@Column(name = "in_venduseremail")
 	private String venduseremail;
@@ -134,6 +130,18 @@ public class InvitationRecord implements Serializable {
 	@Column(name = "in_erpdate")
 	private Date erpdate;
 
+	/**
+	 * 物料上传数量
+	 */
+	@Transient
+	private Long productNum;
+
+	/**
+	 * 如果企业注册，展示注册时间
+	 */
+	@Transient
+	private Date registerDate;
+
 	public Long getId() {
 		return id;
 	}
@@ -166,7 +174,15 @@ public class InvitationRecord implements Serializable {
 		this.useruu = useruu;
 	}
 
-	public Date getDate() {
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel;
+    }
+
+    public Date getDate() {
 		return date;
 	}
 
@@ -238,11 +254,11 @@ public class InvitationRecord implements Serializable {
 		this.venduu = venduu;
 	}
 
-	public User getUser() {
+	public UserBaseInfo getUser() {
 		return user;
 	}
 
-	public void setUser(User user) {
+	public void setUser(UserBaseInfo user) {
 		this.user = user;
 	}
 
@@ -269,4 +285,20 @@ public class InvitationRecord implements Serializable {
 	public void setErpdate(Date erpdate) {
 		this.erpdate = erpdate;
 	}
+
+	public Long getProductNum() {
+		return productNum;
+	}
+
+	public void setProductNum(Long productNum) {
+		this.productNum = productNum;
+	}
+
+    public Date getRegisterDate() {
+        return registerDate;
+    }
+
+    public void setRegisterDate(Date registerDate) {
+        this.registerDate = registerDate;
+    }
 }

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

@@ -1,99 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 系统运维公告
- * 
- * @author yingp
- *
- */
-@Entity
-@Table(name = "info$maintenance")
-public class Maintenance implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "info$maintenance_gen")
-	@SequenceGenerator(name = "info$maintenance_gen", sequenceName = "info$maintenance_seq", allocationSize = 1)
-	@Column(name = "ma_id")
-	private Long id;
-
-	/**
-	 * 公告发起日期
-	 */
-	@Column(name = "ma_date")
-	private Date date;
-
-	/**
-	 * 运维开始时间
-	 */
-	@Column(name = "ma_begindate")
-	private Date begin;
-
-	/**
-	 * 运维结束时间
-	 */
-	@Column(name = "ma_enddate")
-	private Date end;
-
-	/**
-	 * 维护原因
-	 */
-	@Column(name = "ma_reason")
-	private String reason;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Date getBegin() {
-		return begin;
-	}
-
-	public void setBegin(Date begin) {
-		this.begin = begin;
-	}
-
-	public Date getEnd() {
-		return end;
-	}
-
-	public void setEnd(Date end) {
-		this.end = end;
-	}
-
-	public String getReason() {
-		return reason;
-	}
-
-	public void setReason(String reason) {
-		this.reason = reason;
-	}
-
-}

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

@@ -1,100 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户委外验收单关键词库
- * 
- * @author aof
- * @date 2015年8月27日
- */
-@Table(name = "make$accept$index", indexes = {
-		@Index(name = "make$accept$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class MakeAcceptIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$accept$index_gen")
-	@SequenceGenerator(name = "make$accept$index_gen", sequenceName = "make$accept$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 验收单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public MakeAcceptIndex() {
-	}
-
-	public MakeAcceptIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<MakeAcceptIndex> format(long enUU, long key, Set<String> keywords) {
-		List<MakeAcceptIndex> indexes = new ArrayList<MakeAcceptIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new MakeAcceptIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -1,105 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户委外变更单关键词库
- * 
- * @author suntg
- * @since 2015年8月7日14:50:22
- * 
- */
-@Table(name = "make$changes$index", indexes = { @Index(name = "make$changes$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class MakeOrderChangeIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$changes$index_gen")
-	@SequenceGenerator(name = "make$changes$index_gen", sequenceName = "make$changes$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 采购单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public MakeOrderChangeIndex() {
-	}
-
-	public MakeOrderChangeIndex(long enUU, long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public static List<MakeOrderChangeIndex> format(long enUU, long key, Set<String> keywords) {
-		List<MakeOrderChangeIndex> indexes = new ArrayList<MakeOrderChangeIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new MakeOrderChangeIndex(enUU, key, keyword));
-			}
-			
-		}
-		return indexes;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-}

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

@@ -1,120 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-import org.springframework.util.CollectionUtils;
-
-/**
- * 客户委外加工单关键词库
- * 
- * @author suntg
- * 
- */
-@Table(name = "make$orders$index", indexes = {
-		@Index(name = "make$orders$index_keyword", columnList = "index_enuu,index_word,index_venuu") })
-@Entity
-public class MakeOrderIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orders$index_gen")
-	@SequenceGenerator(name = "make$orders$index_gen", sequenceName = "make$orders$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 客户企业UU
-	 */
-	@Column(name = "index_venuu")
-	private Long venUU;
-
-	/**
-	 * 采购单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public MakeOrderIndex() {
-	}
-
-	public MakeOrderIndex(long enUU, long key, long venUU, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-		this.venUU = venUU;
-	}
-
-	public static List<MakeOrderIndex> format(long enUU, long key, long venUU, Set<String> keywords) {
-		List<MakeOrderIndex> indexes = new ArrayList<MakeOrderIndex>();
-		if (!CollectionUtils.isEmpty(keywords)) {
-			for (String keyword : keywords) {
-				indexes.add(new MakeOrderIndex(enUU, key, venUU, keyword));
-			}
-
-		}
-		return indexes;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public Long getVenUU() {
-		return venUU;
-	}
-
-	public void setVenUU(Long venUU) {
-		this.venUU = venUU;
-	}
-
-}

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

@@ -1,97 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Index;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 客户委外验退单关键词库
- * 
- * @author aof
- * @date 2015年8月31日
- */
-@Table(name = "make$return$index", indexes = {
-		@Index(name = "make$return$index_keyword", columnList = "index_enuu,index_word") })
-@Entity
-public class MakeReturnIndex {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$return$index_gen")
-	@SequenceGenerator(name = "make$return$index_gen", sequenceName = "make$return$index_seq", allocationSize = 1)
-	@Column(name = "index_id")
-	private Long id;
-
-	/**
-	 * 所属企业UU
-	 */
-	@Column(name = "index_enuu")
-	private Long enUU;
-
-	/**
-	 * 验退单ID
-	 */
-	@Column(name = "index_key")
-	private Long key;
-
-	/**
-	 * 关键词
-	 */
-	@Column(name = "index_word")
-	private String keyword;
-
-	public MakeReturnIndex(Long enUU, Long key, String keyword) {
-		this.enUU = enUU;
-		this.key = key;
-		this.keyword = keyword;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getEnUU() {
-		return enUU;
-	}
-
-	public void setEnUU(Long enUU) {
-		this.enUU = enUU;
-	}
-
-	public Long getKey() {
-		return key;
-	}
-
-	public void setKey(Long key) {
-		this.key = key;
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
-
-	public static List<MakeReturnIndex> format(long enUU, long key, Set<String> keywords) {
-		List<MakeReturnIndex> indexes = new ArrayList<MakeReturnIndex>();
-		for (String keyword : keywords) {
-			indexes.add(new MakeReturnIndex(enUU, key, keyword));
-		}
-		return indexes;
-	}
-
-}

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

@@ -0,0 +1,152 @@
+package com.uas.platform.b2b.model;
+
+import com.uas.platform.core.model.Status;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 这张表用来记录ERP订单上传过程中未存在的物料信息
+ *
+ * Created by hejq on 2018-03-14.
+ */
+@Table(name = "erp$products")
+@Entity
+public class NotExistProduct implements Serializable {
+
+    /**
+     * default serialVersionUID
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "erp$products_gen")
+    @SequenceGenerator(name = "erp$products_gen", sequenceName = "erp$products_seq", allocationSize = 1)
+    @Column(name = "pr_id")
+    private Long id;
+
+    /**
+     * 物料编号
+     */
+    @Column(name = "pr_code")
+    private String code;
+
+    /**
+     * 企业
+     */
+    @Column(name = "pr_enuu")
+    private Long enuu;
+
+    /**
+     * 下载状态<br>
+     *     <pro>
+     *         203: 已下载， 202 未下载
+     *     </pro>
+     */
+    @Column(name = "pr_status")
+    private Integer status;
+
+    /**
+     * 单据日期
+     */
+    @Column(name = "pr_date")
+    private Date date;
+
+    /**
+     * 物料来源，哪个单据发现的
+     */
+    @Column(name = "pr_source")
+    private String source;
+
+    /**
+     * 单据编号
+     */
+    @Column(name = "pr_sourcecode")
+    private String sourceCode;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Long getEnuu() {
+        return enuu;
+    }
+
+    public void setEnuu(Long enuu) {
+        this.enuu = enuu;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getSourceCode() {
+        return sourceCode;
+    }
+
+    public void setSourceCode(String sourceCode) {
+        this.sourceCode = sourceCode;
+    }
+
+    public NotExistProduct() {
+
+    }
+
+    public NotExistProduct(String code, Long enuu, String source, String sourceCode) {
+        this.code = code;
+        this.enuu = enuu;
+        this.source = source;
+        this.sourceCode = sourceCode;
+        this.date = new Date(System.currentTimeMillis());
+        this.status = Status.NOT_UPLOAD.value();
+    }
+
+    @Override
+    public String toString() {
+        return "NotExistProduct{" +
+                "id=" + id +
+                ", code='" + code + '\'' +
+                ", enuu=" + enuu +
+                ", status=" + status +
+                ", date=" + date +
+                ", source='" + source + '\'' +
+                ", sourceCode='" + sourceCode + '\'' +
+                '}';
+    }
+}

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

@@ -2,12 +2,19 @@ package com.uas.platform.b2b.model;
 
 import com.uas.platform.core.persistence.EnterpriseUU;
 import com.uas.platform.core.persistence.Logger;
-import com.uas.platform.core.persistence.StatusColumn;
 import com.uas.platform.core.persistence.UserUU;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 import java.util.Set;
 
@@ -350,6 +357,12 @@ public class Product {
 	@Column(name = "pr_b2bdisabled", insertable = false, updatable = false)
 	private Short b2bDisabled;
 
+	/**
+	 * 匹配的料号（买方）（用于供应商推荐接口匹配状态）
+	 */
+	@Transient
+	private String ifMatched;
+
 	public Product() {
 	}
 
@@ -773,4 +786,12 @@ public class Product {
 	public void setB2bDisabled(Short b2bDisabled) {
 		this.b2bDisabled = b2bDisabled;
 	}
+
+	public String getIfMatched() {
+		return ifMatched;
+	}
+
+	public void setIfMatched(String ifMatched) {
+		this.ifMatched = ifMatched;
+	}
 }