Merge branch 'dev-2.11.0' of depot-qinghai/depot-device-qinghai into dev

src/main/java/com/chinaitop/depot/device/controller/BusinessImPurchaseSaleController.java

@@ -48,7 +48,7 @@ public class BusinessImPurchaseSaleController {
         return ResponseEntity.ok(businessImPurchaseSaleService.getList(pageParam));
     }
 
-    @PostMapping("/saveAndUpdate")
+/*    @PostMapping("/saveAndUpdate")
     @ApiOperation(value="采购销售管理-保存/修改", notes = "保存/修改")
     public Map<String, Object> save(@RequestBody String businessImPurchaseSaleJson) {
         Map<String, Object> modelMap = new HashMap<>();
@@ -65,6 +65,21 @@ public class BusinessImPurchaseSaleController {
             e.printStackTrace();
         }
         return modelMap;
+    }*/
+
+    @PostMapping("/saveAndUpdate")
+    @ApiOperation(value="采购销售管理-保存/修改", notes = "保存/修改")
+    public Map<String, Object> save(@RequestBody BusinessImPurchaseSale businessImPurchaseSale) {
+        Map<String, Object> modelMap = new HashMap<>();
+        try {
+            businessImPurchaseSaleService.saveOrUpdateBusinessImPurchaseSale(businessImPurchaseSale);
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存/修改失败！");
+            e.printStackTrace();
+        }
+        return modelMap;
     }
 
   /*  @PutMapping("/update")
@@ -84,4 +99,5 @@ public class BusinessImPurchaseSaleController {
     public ResponseEntity<BusinessImPurchaseSale> getById(@PathVariable("id") String id) {
         return ResponseEntity.ok(businessImPurchaseSaleService.getById(id));
     }
+
 }