Просмотр исходного кода

物料信息搜索条件修改;批量移除个人产品问题修复;ERP禁用物料时,物料销售、采购属性均设置为否

dongbw 8 лет назад
Родитель
Сommit
5598c953ba

+ 3 - 3
src/main/java/com/uas/platform/b2b/controller/ProductController.java

@@ -114,7 +114,7 @@ public class ProductController {
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 
 
 		HashMap<String, Object> map = new HashMap<>();
 		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2benabled", Constant.YES);
+		map.put("pr_b2bdisabled", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 		pageParams.setNotEqualFilters(map);
 
 
 		List<Sort> sortList = new ArrayList<>();
 		List<Sort> sortList = new ArrayList<>();
@@ -148,7 +148,7 @@ public class ProductController {
 		pageParams.getFilters().put("pr_standard", Constant.YES);
 		pageParams.getFilters().put("pr_standard", Constant.YES);
 
 
 		HashMap<String, Object> map = new HashMap<>();
 		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2benabled", Constant.YES);
+		map.put("pr_b2bdisabled", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 		pageParams.setNotEqualFilters(map);
 
 
 		List<Sort> sortList = new ArrayList<>();
 		List<Sort> sortList = new ArrayList<>();
@@ -180,7 +180,7 @@ public class ProductController {
 		pageParams.getFilters().put("pr_standard", Constant.NO);
 		pageParams.getFilters().put("pr_standard", Constant.NO);
 
 
 		HashMap<String, Object> map = new HashMap<>();
 		HashMap<String, Object> map = new HashMap<>();
-		map.put("pr_b2benabled", Constant.YES);
+		map.put("pr_b2bdisabled", Constant.YES);
 		pageParams.setNotEqualFilters(map);
 		pageParams.setNotEqualFilters(map);
 
 
 		List<Sort> sortList = new ArrayList<>();
 		List<Sort> sortList = new ArrayList<>();

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

@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
- * 对ERP的数据接口<br>
+ * 对ERP的数据接口<br> -- B2B物料传输都使用物料传输公共服务,禁用物料仍调用本接口。--dongbw 2018年1月31日 13:46:45
  * 产品处理
  * 产品处理
  *
  *
  * @author yingp
  * @author yingp

+ 1 - 1
src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -130,7 +130,7 @@ public class ProductUtils {
      */
      */
     public static void deleteProductUserByBatch(List<Long> idList) throws Exception {
     public static void deleteProductUserByBatch(List<Long> idList) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         HashMap<String, Object> params = new HashMap<>();
-        params.put("ids", idList);
+        params.put("ids", FlexJsonUtils.toJsonDeep(idList));
         Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/productuser/edit/deleteByBatch", params);
         Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/productuser/edit/deleteByBatch", params);
         if (HttpStatus.OK.value()!= res.getStatusCode()) {
         if (HttpStatus.OK.value()!= res.getStatusCode()) {
             throw new RuntimeException("删除个人物料失败");
             throw new RuntimeException("删除个人物料失败");

+ 2 - 0
src/main/java/com/uas/platform/b2b/service/impl/ProductServiceImpl.java

@@ -537,6 +537,8 @@ public class ProductServiceImpl implements ProductService {
 			List<ProductStatus> productStatuses = productStatusDao.findByPrId(product.getId());
 			List<ProductStatus> productStatuses = productStatusDao.findByPrId(product.getId());
 			if (CollectionUtils.isEmpty(productStatuses)) {
 			if (CollectionUtils.isEmpty(productStatuses)) {
                 product.setErpDate(new Date());
                 product.setErpDate(new Date());
+                product.setIsPurchase(Constant.NO);
+				product.setIsSale(Constant.NO);
                 ProductStatus productStatus = new ProductStatus(product, Constant.YES);
                 ProductStatus productStatus = new ProductStatus(product, Constant.YES);
                 productStatusDao.save(productStatus);
                 productStatusDao.save(productStatus);
                 ProductUtils.updateOne(product);
                 ProductUtils.updateOne(product);