|
|
@@ -86,19 +86,21 @@ public class ProductController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public ModelMap updateProdInfo(@RequestParam("data") String data) throws UnsupportedEncodingException {
|
|
|
+ public List<Long> updateProdInfo(@RequestParam("data") String data) throws UnsupportedEncodingException {
|
|
|
// TODO 物料信息中的企业UU和用户UU,需要在调用接口之前设置。有id为更新,无id为新增
|
|
|
List<Product> productInfo = JSONObject.parseArray(URLDecoder.decode(data, "utf-8"), Product.class);
|
|
|
- ModelMap map = new ModelMap();
|
|
|
+ List<Long> resultProducts = new ArrayList<>();
|
|
|
+
|
|
|
for (Product product : productInfo) {
|
|
|
List<Product> products = productService.findByEnUUAndCmpCodeAndBrand(product.getEnUU(),product.getCmpCode(),product.getBrand());
|
|
|
if ( products == null || products.size() == 0 ) {
|
|
|
- productService.save(product);
|
|
|
+ Product product1 = productService.save(product);
|
|
|
+ resultProducts.add(product1.getId());
|
|
|
}
|
|
|
}
|
|
|
// logger.log("更新物料", "[" + productInfo.getUserUU() + "]更新了id为" + productInfo.getId() + "的["
|
|
|
// + productInfo.getTitle() + "]");
|
|
|
- return map;
|
|
|
+ return resultProducts;
|
|
|
}
|
|
|
|
|
|
private void log(List<Prod> prods, String message) {
|