Pārlūkot izejas kodu

物料更新、转入我的物料库接口方法修改

dongbw 7 gadi atpakaļ
vecāks
revīzija
45b6e16137

+ 2 - 2
src/main/java/com/uas/ps/product/controller/ProductController.java

@@ -97,9 +97,9 @@ public class ProductController {
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public List<Long> updateProdInfo(@RequestBody String data, String sourceApp) throws UnsupportedEncodingException {
+    public List<Long> updateProdInfo(@RequestParam("data") String data, String sourceApp) throws UnsupportedEncodingException {
         // TODO 物料信息中的企业UU和用户UU,需要在调用接口之前设置。有id为更新,无id为新增
-        List<Product> productInfo = JSONObject.parseArray(data, Product.class);
+        List<Product> productInfo = JSONObject.parseArray(URLDecoder.decode(data, "utf-8"), Product.class);
         List<Long> resultProducts = new ArrayList<>();
 
         boolean fromB2B = sourceApp != null && sourceApp.equalsIgnoreCase("B2B");

+ 2 - 2
src/main/java/com/uas/ps/product/controller/ProductUsersController.java

@@ -138,8 +138,8 @@ public class ProductUsersController {
         String json = URLDecoder.decode(data, "utf-8");
         JSONObject jsonObject = JSON.parseObject(json, JSONObject.class);
         String ids = (String) jsonObject.get("ids");
-        Long enUU = (Long) jsonObject.get("enUU");
-        Long userUU = (Long) jsonObject.get("userUU");
+        Long enUU = Long.valueOf(String.valueOf(jsonObject.get("enUU")));
+        Long userUU = Long.valueOf(String.valueOf(jsonObject.get("userUU")));
         return productUsersService.coverToUserProdByIds(ids, userUU, enUU);
     }
 

+ 5 - 1
src/main/java/com/uas/ps/product/service/impl/ProductServiceImpl.java

@@ -395,12 +395,16 @@ public class ProductServiceImpl implements ProductService {
      */
     @Override
     public void quitProdSaler(List<ProductSaler> productSalers) {
+        List<ProductUsers> deleteList = new ArrayList<>();
         for (ProductSaler productSaler : productSalers) {
             ProductUsers prod = productUsersDao.findByEnuuAndUseruuAndErpid(productSaler.getEn_uu(), productSaler.getEm_uu(), productSaler.getPs_id());
             if (null != prod) {
-                productUsersDao.delete(prod);
+                deleteList.add(prod);
 //                erpLogger.log("ERP删除个人物料信息同步", "关联物料id: " + prod.getPrid(), 1);
             }
         }
+        if (!CollectionUtils.isEmpty(deleteList)) {
+            productUsersDao.delete(deleteList);
+        }
     }
 }