|
|
@@ -1,10 +1,8 @@
|
|
|
package com.uas.ps.product.controller;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.ps.core.util.CollectionUtils;
|
|
|
import com.uas.ps.entity.Product;
|
|
|
-import com.uas.ps.entity.ProductMatchResult;
|
|
|
import com.uas.ps.entity.Status;
|
|
|
import com.uas.ps.product.entity.Prod;
|
|
|
import com.uas.ps.product.entity.ProductSaler;
|
|
|
@@ -229,7 +227,7 @@ public class ProductController {
|
|
|
*
|
|
|
* @author hejq
|
|
|
* @date 2018-01-12 19:11
|
|
|
- * @param data
|
|
|
+ * @param data 同步的个人物料信息
|
|
|
* @throws UnsupportedEncodingException
|
|
|
*/
|
|
|
@RequestMapping(value = "/produser", method = RequestMethod.POST)
|
|
|
@@ -245,9 +243,9 @@ public class ProductController {
|
|
|
* ERP个人物料删除同步状态到平台
|
|
|
*
|
|
|
* @author hejq
|
|
|
- * @date 2018-01-12 19:11
|
|
|
- * @param data
|
|
|
- * @throws UnsupportedEncodingException
|
|
|
+ * @since 2018-01-12 19:11
|
|
|
+ * @param data 删除的个人物料信息
|
|
|
+ * @throws UnsupportedEncodingException 解析异常
|
|
|
*/
|
|
|
@RequestMapping(value = "/produser/quit", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
@@ -262,13 +260,12 @@ public class ProductController {
|
|
|
* 根据id删除物料匹配结果和个人物料(子应用禁用物料时调用)
|
|
|
*
|
|
|
* @author dongbw
|
|
|
- * @date 2018-01-23 19:23
|
|
|
+ * @since 2018-01-23 19:23
|
|
|
* @param id 物料id
|
|
|
- * @throws UnsupportedEncodingException
|
|
|
*/
|
|
|
@RequestMapping(value = "/matchResultAndProductUser/delete", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public void deleteMatchResultAndProductUser(@RequestParam("id") Long id) throws UnsupportedEncodingException {
|
|
|
+ public void deleteMatchResultAndProductUser(@RequestParam("id") Long id) {
|
|
|
productService.deleteMatchResultAndProductUser(id);
|
|
|
// logger.log("物料资料", "ERP取消个人物料同步到公共物料库", productSalers.size());
|
|
|
}
|
|
|
@@ -302,16 +299,4 @@ public class ProductController {
|
|
|
@RequestParam("switchStatus") Integer switchStatus) {
|
|
|
productService.switchProductByIdAndTypeAndStatus(id, switchType, switchStatus);
|
|
|
}
|
|
|
-
|
|
|
- /**
|
|
|
- * 保存单个物料的匹配结果
|
|
|
- *
|
|
|
- * @param data 匹配结果List的JSON串
|
|
|
- */
|
|
|
- @RequestMapping(value = "/matchResult/save", method = RequestMethod.POST)
|
|
|
- @ResponseBody
|
|
|
- public void saveProductMatchResult(@RequestParam("data") String data) throws Exception {
|
|
|
- List<ProductMatchResult> results = JSON.parseArray(URLDecoder.decode(data, "utf-8"), ProductMatchResult.class);
|
|
|
- productService.saveMatchResults(results);
|
|
|
- }
|
|
|
}
|