Merge remote-tracking branch 'origin/feature-201806-suntg' into feature-201806-suntg

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

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

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

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

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

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

src/main/java/com/uas/platform/b2b/erp/service/AutOrderService.java

@@ -1,20 +0,0 @@
-package com.uas.platform.b2b.erp.service;
-
-import com.uas.platform.b2b.erp.model.AutOrder;
-
-import java.util.List;
-
-/**
- * 自动生成订单接口
- *
- * Created by hejq on 2018-05-04.
- */
-public interface AutOrderService {
-
-    /**
-     * 保存订单信息
-     *
-     * @param orderList 订单信息
-     */
-    void saveOrder(List<AutOrder> orderList);
-}

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

@@ -1,260 +0,0 @@
-package com.uas.platform.b2b.erp.service.impl;
-
-import com.uas.platform.b2b.core.util.ThreadUtils;
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
-import com.uas.platform.b2b.erp.dao.AutOrderDao;
-import com.uas.platform.b2b.erp.dao.AutOrderDetailDao;
-import com.uas.platform.b2b.erp.dao.KeywordAliasDao;
-import com.uas.platform.b2b.erp.model.AutOrder;
-import com.uas.platform.b2b.erp.model.AutOrderDetail;
-import com.uas.platform.b2b.erp.model.KeywordAlias;
-import com.uas.platform.b2b.erp.service.AutOrderService;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderAllItem;
-import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.Status;
-import org.apache.axis.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 自动生成订单
- *
- * Created by hejq on 2018-05-04.
- */
-@Service
-public class AutOrderServiceImpl implements AutOrderService {
-
-    @Autowired
-    private AutOrderDao autOrderDao;
-
-    @Autowired
-    private AutOrderDetailDao detailDao;
-
-    @Autowired
-    private KeywordAliasDao keywordAliasDao;
-
-    @Autowired
-    private EnterpriseDao enterpriseDao;
-
-    @Autowired
-    private ProductDao productDao;
-
-    @Autowired
-    private PurchaseOrderAllDao orderAllDao;
-
-    /**
-     * 企业类型
-     */
-    private final String ENTERPRISE_TYPE = "enterprise";
-
-    /**
-     * 币别类型
-     */
-    private final String CURRENCY_TYPE = "currency";
-
-    /**
-     * 数字正则
-     */
-    private final String NUMBER_REG = "[^0-9]";
-
-    /**
-     * 用户类型
-     */
-    private final String USER_TYPE = "user";
-
-    /**
-     * 中文年
-     */
-    private final String YEAR_CH_CHARACTER = "年";
-
-    /**
-     * 中文月
-     */
-    private final String MONTH_CH_CHARACTER = "月";
-
-    /**
-     * 中文日
-     */
-    private final String DAY_CH_CHARACTER = "日";
-
-
-    /**
-     * 保存订单信息
-     *
-     * @param orderList 订单信息
-     */
-    @Override
-    public void saveOrder(List<AutOrder> orderList) {
-        if (!CollectionUtils.isEmpty(orderList)) {
-            for (AutOrder order : orderList) {
-                order.setStatus(Status.TOBE_HANDLE.value());
-                order.setDate(new Date(System.currentTimeMillis()));
-                order =  autOrderDao.save(order);
-                if (!CollectionUtils.isEmpty(order.getDetails())) {
-                    for (AutOrderDetail detail : order.getDetails()) {
-                        detail.setPuId(order.getId());
-                        detail.setDate(new Date(System.currentTimeMillis()));
-                    }
-                    detailDao.save(order.getDetails());
-                    // 转成平台的单据
-                    covertToSaleOrders(order);
-                }
-            }
-        }
-    }
-
-    /**
-     * 生成平台的单据
-     *
-     * @param autOrder 订单主表
-     */
-    private void covertToSaleOrders(final AutOrder autOrder) {
-        ThreadUtils.task(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    PurchaseOrderAll order = coverToPurchase(autOrder);
-                    orderAllDao.save(order);
-                    AutOrder order1 = autOrderDao.findOne(order.getAuId());
-                    order1.setToDate(new Date(System.currentTimeMillis()));
-                    autOrderDao.save(order1);
-                } catch (ParseException e) {
-                    e.printStackTrace();
-                }
-            }
-        }).run();
-    }
-
-    /**
-     * 解析的订单数据转换成平台的订单数据
-     *
-     * @param autOrder 解析的订单数据
-     * @return
-     */
-    private PurchaseOrderAll coverToPurchase(AutOrder autOrder) throws ParseException {
-        PurchaseOrderAll order = new PurchaseOrderAll();
-        order.setCode(autOrder.getPu_code());
-        order.setDate(new Date(System.currentTimeMillis()));
-        order.setSendStatus((short) Status.NOT_UPLOAD.value());
-        order.setStatus((short) Status.NOT_REPLY.value());
-        order.setShipAddress(autOrder.getPu_shipaddresscode());
-        order.setEnd(Constant.NO);
-        order.setDisplay(Constant.NO);
-        order.setPrint(Constant.NO);
-        order.setCustPrint(Constant.NO);
-        order.setReply(Constant.NO);
-        order.setFilepath(autOrder.getPu_filepath());
-        order.setAuId(autOrder.getId());
-        KeywordAlias en_alias = keywordAliasDao.findByTypeAndAlias(ENTERPRISE_TYPE, autOrder.getEn_name());
-        if (null != en_alias) {
-            order.setEnUU(Long.valueOf(en_alias.getValue()));
-            order.setCop(en_alias.getName());
-            Enterprise enterprise = enterpriseDao.findOne(Long.valueOf(en_alias.getValue()));
-            order.setUserUU(enterprise.getEnAdminuu());
-        }
-        KeywordAlias cu_alias = keywordAliasDao.findByTypeAndAlias(CURRENCY_TYPE, autOrder.getPu_currency());
-        if (null != cu_alias) {
-            order.setCurrency(cu_alias.getValue());
-        }
-        KeywordAlias ve_alias = keywordAliasDao.findByTypeAndAlias(ENTERPRISE_TYPE, autOrder.getVe_name());
-        if (null != ve_alias) {
-            order.setVendUU(Long.valueOf(ve_alias.getValue()));
-            order.setReceiveName(ve_alias.getName());
-        }
-        Pattern p = Pattern.compile(NUMBER_REG);
-        Matcher m = p.matcher(autOrder.getPu_date());
-        String rate = m.replaceAll("").trim();
-        order.setRate(StringUtils.isEmpty(rate) ? null : Float.valueOf(rate));
-        KeywordAlias u_alias = keywordAliasDao.findByTypeAndAlias(USER_TYPE, autOrder.getEm_name());
-        if (null != u_alias) {
-            order.setUserUU(Long.valueOf(u_alias.getValue()));
-        }
-        Set<PurchaseOrderAllItem> items = new HashSet<>();
-        if (!CollectionUtils.isEmpty(autOrder.getDetails())) {
-            int i = 1;
-            for (AutOrderDetail detail : autOrder.getDetails()) {
-                items.add(coverToItem(detail, i, order.getEnUU()));
-                i++;
-            }
-        }
-        order.setOrderItems(items);
-        return order;
-    }
-
-    /**
-     * 将解析订单明细转成平台采购订单明细
-     *
-     * @param detail 解析出来的采购订单明细
-     * @param i 序号
-     * @param enUU 企业UU
-     * @return
-     */
-    private PurchaseOrderAllItem coverToItem(AutOrderDetail detail, int i, Long enUU) throws ParseException {
-        PurchaseOrderAllItem item = new PurchaseOrderAllItem();
-        item.setStatus((short) Status.NOT_REPLY.value());
-        item.setErpDate(new Date(System.currentTimeMillis()));
-        item.setAudId(detail.getId());
-        Pattern p = Pattern.compile(NUMBER_REG);
-        Matcher m = p.matcher(detail.getPd_qty());
-        String qty = m.replaceAll("").trim();
-        item.setQty(StringUtils.isEmpty(qty) ? 0 : Double.valueOf(qty));
-        item.setNumber(StringUtils.isEmpty(detail.getPd_detno()) ? (short) i : Short.valueOf(detail.getPd_detno()));
-        Matcher ma = p.matcher(detail.getPd_rate());
-        String taxtRate = ma.replaceAll("").trim();
-        item.setTaxrate(StringUtils.isEmpty(taxtRate) ? null : Float.valueOf(taxtRate));
-        List<Product> productList = productDao.findByEnUUAndCode(enUU, detail.getPd_prodcode());
-        if (!CollectionUtils.isEmpty(productList)) {
-            item.setProductId(productList.get(0).getId());
-        }
-        Matcher pr = p.matcher(detail.getPd_price());
-        String price = pr.replaceAll("").trim();
-        item.setPrice(StringUtils.isEmpty(price) ? null : Double.valueOf(price));
-        item.setDelivery(matchTime(detail.getPd_delivery()));
-        return item;
-    }
-
-    /**
-     * 处理时间格式
-     *
-     * @param delivery 解析订单中的明细交期
-     * @return
-     */
-    private Date matchTime(String delivery) throws ParseException {
-        if (!StringUtils.isEmpty(delivery)) {
-            delivery = delivery.trim();
-            String TIME_PATTERN_1 = "\\d{4}-\\d{2}-\\d{2}";
-            String TIME_PATTERN_2 = "\\d{4}\\d{2}\\d{2}";
-            String TIME_PATTERN_3 = "\\d{4}/\\d{2}/\\d{2}";
-            if (delivery.matches(TIME_PATTERN_1)) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
-                return sdf.parse(delivery);
-            } else if (delivery.matches(TIME_PATTERN_2)) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyymmdd");
-                return sdf.parse(delivery);
-            } else if (delivery.contains(YEAR_CH_CHARACTER) || delivery.contains(MONTH_CH_CHARACTER) || delivery.contains(DAY_CH_CHARACTER)) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy年mm月dd");
-                return sdf.parse(delivery);
-            } else if (delivery.matches(TIME_PATTERN_3)) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy/mm/dd");
-                return sdf.parse(delivery);
-            }
-
-        }
-        return null;
-    }
-}

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

@@ -262,7 +262,7 @@ public class InquiryServiceImpl implements InquiryService {
                     List<InquiryDetail> inquiryDetails = commonDao.query("select * from purc$inquiryitems where id_inid = " + inquiry.getIn_id() + " and id_sourceid = " + detail.getId_id(), InquiryDetail.class);
                     if(inquiryDetails.size() == 0) {
                         //查询对应平台的物料信息
-                        List<Product> products = productDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), detail.getId_prodcode());
+                        List<Product> products = ProductUtils.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), detail.getId_prodcode());
                         if(products.size() > 0) {
                             Long prodId = products.get(0).getId();
                             Long id = commonDao.getJdbcTemplate().queryForLong("select purc$inquiryitems_seq.nextval from dual");

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

@@ -1,60 +1,38 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.erp.model.Prod;
 import com.uas.platform.b2b.erp.service.ProdService;
 import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.support.SystemSession;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 
+/**
+ * 物料服务
+ * 
+ * @author hejq
+ * @date 2018-07-24 17:10
+ */
 @Service
 public class ProdServiceImpl implements ProdService {
 
-	@Autowired
-	private ProductDao productDao;
-
 	@Override
 	public List<Product> convertProduct(List<Prod> prods) {
 		List<Product> products = new ArrayList<Product>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (Prod prod : prods) {
 			prod.setKind(prod.getPr_detail());
-			if (prod.getPr_orispeccode() == null) {// 如果原厂型号不存在，将规格赋值给原厂型号
+			// 如果原厂型号不存在，将规格赋值给原厂型号
+			if (prod.getPr_orispeccode() == null) {
 				prod.setPr_orispeccode(prod.getPr_spec());
 			}
-			// if (prod.getPr_uuid() == null) {
-			// if (prod.getPr_code() != null) {
-			// List<Component> components =
-			// componentDao.findByCode(prod.getPr_orispeccode());
-			// if (components.size() == 1) {// 如果查询是标准数据，给个标准赋值
-			// prod.setPr_uuid(components.get(0).getUuid());
-			// prod.setPbrand(components.get(0).getBrand().getNameCn());
-			// prod.setPbranden(components.get(0).getBrand().getNameEn());
-			// prod.setKind(components.get(0).getKind().getNameCn());
-			// prod.setKinden(components.get(0).getKind().getNameEn());
-			// }
-			// }
-			// } else {
-			// Component component = componentDao.findByUuid(prod.getPr_uuid());
-			// prod.setPr_uuid(component.getUuid());
-			// prod.setPbrand(component.getBrand().getNameCn());
-			// prod.setPbranden(component.getBrand().getNameEn());
-			// prod.setKind(component.getKind().getNameCn());
-			// prod.setKinden(component.getKind().getNameEn());
-			// }
-			// if (prod.getPr_uuid() != null) {
-			// prod.setStandard(Constant.YES);
-			// } else {
-			// prod.setStandard(Constant.NO);
-			// }
-			List<Product> prodResult = productDao.findByEnUUAndCode(enUU, prod.getPr_code());
-			if (CollectionUtils.isEmpty(prodResult)) {// 平台上不存在的新上传上来的物料，新增
+			List<Product> prodResult = ProductUtils.findByEnUUAndCode(enUU, prod.getPr_code());
+			if (CollectionUtils.isEmpty(prodResult)) {
+				// 平台上不存在的新上传上来的物料，新增
 				products.add(prod.convert());
 			} else {// 平台上已经存在的物料，修改
 				Product product = prod.convert();

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

@@ -197,7 +197,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 							returnItem.setProdCode(purchaseOrderItems.get(0).getProduct().getCode());
 						}
 					} else {
-						List<Product> prod = productDao.findByEnUUAndCode(enUU, returnItem.getProdCode());
+						List<Product> prod = ProductUtils.findByEnUUAndCode(enUU, returnItem.getProdCode());
 						if (prod.size() > 0) {
 							returnItem.setProdId(prod.get(0).getId());
 						} else {

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

@@ -9,7 +9,7 @@ import javax.persistence.*;
  * 模具物料明细
  * 
  * @author hejq
- * @date 2018-07-24 16:33
+ * @date 2018-07-24 16:37
  */
 @Entity
 @Table(name = "purc$inquirymoulddetail")

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

@@ -366,7 +366,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 				prodInfo.setAttachment(attach.getPath());
 			}
 		}
-		List<Product> products = productDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(),
+		List<Product> products = ProductUtils.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(),
 				prodInfo.getCode());
 		if (!CollectionUtils.isEmpty(products)) {
 			map.put("error", "物料已存在");

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

@@ -82,6 +82,7 @@ public class ProductServiceImpl implements ProductService {
 	public Page<Product> findAllByPageInfo(final PageInfo pageInfo, final String keyword) {
 		return productDao.findAll(new Specification<Product>() {
 
+			@Override
 			public Predicate toPredicate(Root<Product> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				if (StringUtils.hasText(keyword)) {
 					List<Object> lists = new ArrayList<>();
@@ -436,6 +437,7 @@ public class ProductServiceImpl implements ProductService {
 	private Page<Product> findAllProudctByPageInfo(final PageInfo pageInfo, final String keyword) {
 		return productDao.findAll(new Specification<Product>() {
 
+			@Override
 			public Predicate toPredicate(Root<Product> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 				query.where(pageInfo.getPredicates(root, query, builder));
@@ -447,6 +449,7 @@ public class ProductServiceImpl implements ProductService {
 	private Page<Product> findAllB2bEnabledProudctByPageInfo(final PageInfo pageInfo, final String keyword) {
 		return productDao.findAll(new Specification<Product>() {
 
+			@Override
 			public Predicate toPredicate(Root<Product> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 				pageInfo.filter("b2bDisabled", Constant.NO);
@@ -477,7 +480,7 @@ public class ProductServiceImpl implements ProductService {
 
 	@Override
 	public int updateB2bEnabled(String code, Short b2bDisabled) throws Exception {
-		List<Product> products = productDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), code);
+		List<Product> products = ProductUtils.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), code);
 		if (!CollectionUtils.isEmpty(products)) {
 			Product product = products.get(0);
 			List<ProductStatus> productStatuses = productStatusDao.findByPrId(product.getId());
@@ -509,7 +512,7 @@ public class ProductServiceImpl implements ProductService {
 	public void updateProdSaler(List<ProductSaler> productSalers) throws Exception {
 		Long enuu = SystemSession.getUser().getEnterprise().getUu();
 		for (ProductSaler productSaler : productSalers) {
-            List<Product> prods = productDao.findByEnUUAndCode(enuu, productSaler.getPs_code());
+            List<Product> prods = ProductUtils.findByEnUUAndCode(enuu, productSaler.getPs_code());
             if (CollectionUtils.isEmpty(prods)) {
                 throw new NotFoundException("[" + productSaler.getPs_code() + "]物料没找到");
             } else {

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

@@ -98,12 +98,15 @@ public class ProductUsersServiceImpl implements ProductUsersService {
         Long enuu = SystemSession.getUser().getEnterprise().getUu();
         Long useruu =  SystemSession.getUser().getUserUU();
         List<ProductUsers> productUsers = productUsersDao.findByEnuuAndUseruuAndTitleAndCmpCodeAndBrand(enuu, useruu, prodInfo.getTitle(), prodInfo.getCmpCode(), prodInfo.getBrand());
-        if(CollectionUtils.isEmpty(productUsers)) {// 如果不存在则进行其他操作，存在不处理（先查询非标）
+        // 如果不存在则进行其他操作，存在不处理（先查询非标）
+        if (CollectionUtils.isEmpty(productUsers)) {
             List<Product> productList = productDao.findByTitleAndCmpCodeAndBrandAndEnUU(prodInfo.getTitle(), prodInfo.getCmpCode(), prodInfo.getBrand(), SystemSession.getUser().getEnterprise().getUu());
-            if(CollectionUtils.isEmpty(productList)) {// 如果非标不存在再查询标准
+            // 如果非标不存在再查询标准
+            if (CollectionUtils.isEmpty(productList)) {
                 productList = productDao.findByTitleAndPcmpcodeAndPbrandAndEnUU(prodInfo.getTitle(), prodInfo.getCmpCode(), prodInfo.getBrand(), SystemSession.getUser().getEnterprise().getUu());
             }
-            if(!CollectionUtils.isEmpty(productList)) { // 如果存在，找出其中一个进行绑定
+            // 如果存在，找出其中一个进行绑定
+            if (!CollectionUtils.isEmpty(productList)) {
                 ProductUsers prod = new ProductUsers();
                 prod.setDate(new Date());
                 prod.setEnuu(enuu);
@@ -118,10 +121,12 @@ public class ProductUsersServiceImpl implements ProductUsersService {
                     String code = SystemSession.getUser().getEnterprise().getUu() + sdf.format(new Date());
                     prodInfo.setCode(code);
                 } else {
-                    List<Product> products = productDao.findByEnUUAndCode(enuu, prodInfo.getCode());
+                    List<Product> products = ProductUtils.findByEnUUAndCode(enuu, prodInfo.getCode());
                     String code = SystemSession.getUser().getEnterprise().getUu() + sdf.format(new Date());
-                    if(products.size() != 0) // 如果该企业下该编号的物料存在，重新赋值
+                    // 如果该企业下该编号的物料存在，重新赋值
+                    if (products.size() != 0) {
                         prodInfo.setCode(code);
+                    }
 
                 }
                 List<Role> roles = roleService.findByEnUUAndUserUU(enuu, useruu);
@@ -135,8 +140,9 @@ public class ProductUsersServiceImpl implements ProductUsersService {
                     }
                 }
                 prodInfo.setEnUU(enuu);
-                if (null == prodInfo.getUnit())
+                if (null == prodInfo.getUnit()) {
                     prodInfo.setUnit("PCS");
+                }
                 prodInfo.setSourceApp("B2B");
                 prodInfo.setIsPubsale(Constant.NO);
                 prodInfo.setIsShow(Constant.NO);
@@ -166,7 +172,6 @@ public class ProductUsersServiceImpl implements ProductUsersService {
 
     @Override
     public ModelMap releaseByWorkbook(Workbook workbook) {
-        long start = System.currentTimeMillis();
         ModelMap modelMap = new ModelMap();
         List<ProductTemp> temps = new ArrayList<>();
         Long enUU = SystemSession.getUser().getEnterprise().getUu();
@@ -317,7 +322,8 @@ public class ProductUsersServiceImpl implements ProductUsersService {
     /**
      * 将物料信息同步到个人信息库
      *
-     * @param productId
+     * @param temps 临时物料
+     * @param modelMap
      */
     private void checkTempProducts(List<ProductTemp> temps, ModelMap modelMap) {
         if (!CollectionUtils.isEmpty(temps)) {
@@ -345,12 +351,10 @@ public class ProductUsersServiceImpl implements ProductUsersService {
      * 保存到公共库
      */
     private void saveToDataCenter(List<ProductTemp> temps, ModelMap modelMap){
-        long start = System.currentTimeMillis();
         if (!CollectionUtils.isEmpty(temps)) {
             String importId = temps.get(0).getPr_import_id();
             // 已匹配+未匹配到的物料
             List<Product> products = productTempDao.getProducts(importId);
-            start = System.currentTimeMillis();
             try {
                 // 更新物料并插入个人物料
                 ModelMap map = ProductUtils.paginationUpdateAndAddToProductUser(products);
@@ -379,7 +383,7 @@ public class ProductUsersServiceImpl implements ProductUsersService {
         Long useruu = SystemSession.getUser().getUserUU();
         Long enuu = SystemSession.getUser().getEnterprise().getUu();
         ProductUsers productUsers = productUsersDao.findByEnuuAndUseruuAndPrid(enuu, useruu, id);
-        if(null == productUsers) {
+        if (null == productUsers) {
         	Product product = productDao.findOne(id);
 	        List<Role> roles = roleService.findByEnUUAndUserUU(enuu, useruu);
 	        // 根据当前用户角色更新物料销售采购属性
@@ -438,7 +442,7 @@ public class ProductUsersServiceImpl implements ProductUsersService {
                         Product newProduct = new Product();
                         BeanUtils.copyProperties(product, newProduct);
                         // 将客户物料转入到本企业
-                        List<Product> products = productDao.findByEnUUAndCode(enuu, product.getCode());
+                        List<Product> products = ProductUtils.findByEnUUAndCode(enuu, product.getCode());
                         if (CollectionUtils.isEmpty(products)) {
                             newProduct.setId(null);
                             newProduct.setSourceId(product.getId());

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

@@ -262,7 +262,7 @@ public class PurcOrderServiceImpl implements PurcOrderService {
                             product.setIsPurchase(Constant.YES);
                             // 如果物料不存在，则进行存储
                             if (product.getCode() != null) {
-                                List<Product> prods = productDao.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), product.getCode());
+                                List<Product> prods = ProductUtils.findByEnUUAndCode(SystemSession.getUser().getEnterprise().getUu(), product.getCode());
                                 if (CollectionUtils.isEmpty(prods)) {
                                     try {
                                         Long prId = ProductUtils.updateOne(product);

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

@@ -187,7 +187,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		Product originProduct = productDao.findOne(prid);
 		if (null != originProduct && null != originProduct.getCode()) {
 		    Long enUU = SystemSession.getUser().getEnterprise().getUu();
-			List<Product> productList = productDao.findByEnUUAndCode(enUU, originProduct.getCode());
+			List<Product> productList = ProductUtils.findByEnUUAndCode(enUU, originProduct.getCode());
 			if (!CollectionUtils.isEmpty(productList)) {
                 PageInfo pageInfo = new PageInfo(1, 1);
                 pageInfo.filter("inquiry.enUU", enUU);

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

@@ -210,7 +210,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         if (!CollectionUtils.isEmpty(tenderProds)) {
             for (PurchaseTenderProd tenderProd : tenderProds) {
                 // 将不在物料库的产品信息添加进去
-                List<Product> oldProducts = productDao.findByEnUUAndCode(currentEnUU, tenderProd.getProdCode());
+                List<Product> oldProducts = ProductUtils.findByEnUUAndCode(currentEnUU, tenderProd.getProdCode());
                 if (CollectionUtils.isEmpty(oldProducts)) {
                     Product newProduct = new Product(tenderProd, currentEnUU);
                     ProductUtils.updateOne(newProduct);
@@ -271,7 +271,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
         Set<PurchaseTenderProd> tenderProds = tender.getPurchaseTenderProds();
         for (PurchaseTenderProd tenderProd : tenderProds) {
             // 将不在物料库的产品信息添加进去
-            List<Product> oldProducts = productDao.findByEnUUAndCode(currentEnUU, tenderProd.getProdCode());
+            List<Product> oldProducts = ProductUtils.findByEnUUAndCode(currentEnUU, tenderProd.getProdCode());
             if (CollectionUtils.isEmpty(oldProducts)) {
                 Product newProduct = new Product(tenderProd, currentEnUU);
                 ProductUtils.updateOne(newProduct);

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

@@ -1,11 +1,13 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.core.util.StringUtil;
-import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.dao.ProductDao;
+import com.uas.platform.b2b.dao.PurchaseOrderDao;
+import com.uas.platform.b2b.dao.SaleOrderItemDao;
 import com.uas.platform.b2b.erp.exception.ExceptionNote;
-import com.uas.platform.b2b.erp.model.*;
+import com.uas.platform.b2b.erp.model.PurchaseDetail;
 import com.uas.platform.b2b.model.*;
-import com.uas.platform.b2b.model.Attach;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.service.NotExistOrderService;
 import com.uas.platform.b2b.service.NotExistProductService;
 import com.uas.platform.b2b.service.SaleOrderItemService;
@@ -125,7 +127,7 @@ public class SaleOrderItemServiceImpl implements SaleOrderItemService {
             }
             item.setAttachs(b2bAttaches);
         }
-        List<Product> products = productDao.findByEnUUAndCode(enUU, detail.getPd_prodcode());
+        List<Product> products = ProductUtils.findByEnUUAndCode(enUU, detail.getPd_prodcode());
         if (!CollectionUtils.isEmpty(products)) {
             item.setProductId(products.get(0).getId());
             return item;