物料调整

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

@@ -383,14 +383,4 @@ public class PurcProductController {
 		return map;
 	}
 
-	/**
-	 * 一键匹配物料信息
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/edit/matchbytype/{type}", method = RequestMethod.POST)
-	@ResponseBody
-	private ModelMap matchall(@PathVariable String type) throws Exception {
-		return productService.matchall(type);
-	}
 }

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

@@ -16,15 +16,6 @@ import java.util.List;
 @Repository
 public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaRepository<Product, Long> {
 
-	/**
-	 * 通过uu和名称判断物料是否存在（新增采购导入时需用到）
-	 * 
-	 * @param enUU
-	 * @param title
-	 * @return
-	 */
-	List<Product> findByEnUUAndTitle(Long enUU, String title);
-
 	/**
 	 * 通过企业UU，物料名称、规格、品牌（非标准）查询物料信息
 	 *

src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -456,6 +456,7 @@ public class ProductUtils {
      * @return
      */
     public static Page<Product> findByPageInfo(PageInfo pageInfo, String keyword) {
+        pageInfo.setSort(null);
         Response res = null;
         try {
             JSONObject formData = JSON.parseObject(JSON.toJSONString(pageInfo));

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

@@ -5,6 +5,7 @@ import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.service.BaseInfoService;
 import com.uas.platform.b2b.service.PurcOrderService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -246,7 +247,8 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 					}
 					if (failure == 0) {
 					    // 录入数据符合要求，进行物料处理
-                        productInfos = musterdProduct(product);
+                        productInfos = (List<ProductInfo>) musterdProduct(product, productInfo, success).get("productInfos");
+                        success = (Integer) musterdProduct(product, productInfo, success).get("success");
                     }
 				}
 			}
@@ -263,8 +265,18 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 		return modelMap;
 	}
 
-    private List<ProductInfo> musterdProduct(Product product) {
-        /*product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+    /**
+     * 输入数据符合要求，进行其他处理操作
+     *
+     * @param product
+     * @param productInfo
+     * @param success
+     * @return
+     */
+    private ModelMap musterdProduct(Product product, ProductInfo productInfo, int success) {
+        List<ProductInfo> productInfos = new ArrayList<>();
+        ModelMap map = new ModelMap();
+        product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
         product.setUserUU(SystemSession.getUser().getUserUU());
         product.setSourceApp("B2B");
         product.setIsSale(Constant.YES);
@@ -318,8 +330,10 @@ public class PurcOrderServiceImpl implements PurcOrderService {
             productInfo.setPrice(productInfo.getRateprice());
             productInfo.setTotalprice(productInfo.getPrice() * productInfo.getAmount());
             productInfos.add(productInfo);
-        }*/
-        return null;
+        }
+        map.put("productInfos", productInfos);
+        map.put("success", success);
+        return map;
     }
 
     @Override