Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/uas/ps/product/controller/ProductController.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.ps.core.util.CollectionUtils;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.Status;
-import com.uas.ps.product.entity.Constant;
 import com.uas.ps.product.entity.FileUpload;
 import com.uas.ps.product.entity.Prod;
 import com.uas.ps.product.entity.ProductSaler;
@@ -175,21 +174,6 @@ public class ProductController {
         productService.onProductDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
     }
 
-    /**
-     * UAS端禁用物料时调用此接口禁用此物料
-     * 通过物料编码（code）
-     *
-     * @param data 包含enUU、code的map
-     */
-    @RequestMapping(value = "/updateEnabled", method = RequestMethod.POST)
-    @ResponseBody
-    public int updateB2bEnabled(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String json = URLDecoder.decode(data, "UTF-8");
-        JSONObject object = JSON.parseObject(json, JSONObject.class);
-        Short enabled = Constant.NO;
-        return productService.updateEnabled((Long)object.get("enUU"), (String)object.get("code"), enabled);
-    }
-
     /**
      * ERP个人物料同步到公共物料库
      *

src/main/java/com/uas/ps/product/repository/ProductDao.java

@@ -3,12 +3,8 @@ package com.uas.ps.product.repository;
 import com.uas.ps.entity.Product;
 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;
 
 /**
@@ -35,18 +31,6 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
      */
     List<Product> findByEnUUAndSourceAppAndDownloadStatus(Long enUU, String app, Integer status);
 
-    /**
-     * 通过企业uu和物料编号禁用物料
-     *
-     * @param enUU 物料所属企业UU
-     * @param code 物料号
-     * @param enabled 是否启用字段
-     */
-    @Transactional
-    @Modifying
-    @Query("update Product p set p.enabled = :enabled where p.enUU = :enUU and p.code = :code")
-    int updateEnabled(@Param("enUU") Long enUU, @Param("code") String code, @Param("enabled") Short enabled);
-
     /**
      * 根据物料所属enUU、原产型号品牌查询物料
      * @param enUU

src/main/java/com/uas/ps/product/service/ProductService.java

@@ -85,15 +85,6 @@ public interface ProductService {
      */
     public void onProductDownSuccess(String[] idArray);
 
-    /**
-     * 禁用物料
-     *
-     * @param enUU 物料所属企业UU
-     * @param code 物料号
-     * @param enabled 是否启用字段
-     */
-    public int updateEnabled(Long enUU, String code, Short enabled);
-
     /**
      * ERP个人物料同步到物料库
      *

src/main/java/com/uas/ps/product/service/impl/ProductServiceImpl.java

@@ -167,18 +167,6 @@ public class ProductServiceImpl implements ProductService {
         }
     }
 
-    /**
-     * 禁用物料
-     *
-     * @param enUU 物料所属enUU
-     * @param code 物料号
-     * @param enabled 是否启用
-     */
-    @Override
-    public int updateEnabled(Long enUU, String code, Short enabled) {
-        return productDao.updateEnabled(enUU, code, enabled);
-    }
-
     /**
      * ERP个人物料同步到物料库
      *