Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS

bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerController.java

@@ -81,7 +81,11 @@ public class BmsCustomerController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BmsCustomer bmsCustomer)
     {
-        return toAjax(bmsCustomerService.insertBmsCustomer(bmsCustomer));
+        bmsCustomerService.insertBmsCustomer(bmsCustomer);
+        // 返回新主键，供前端新增成功后停留在编辑页继续维护子表/绑定产品
+        AjaxResult ajax = AjaxResult.success("新增成功");
+        ajax.put("customerId", bmsCustomer.getCustomerId());
+        return ajax;
     }
 
     /**

bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerMoneyController.java

@@ -84,7 +84,7 @@ public class CustomerMoneyController extends BaseController
     /**
      * 审核通过收款单：确认后变动客户余额并生成余额流水
      */
-    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:edit')")
+    @PreAuthorize("@ss.hasPermi('customer:balance:review')")
     @Log(title = "客户收款审核", businessType = BusinessType.UPDATE)
     @PutMapping("/receipt/confirm/{id}")
     public AjaxResult confirmReceipt(@PathVariable("id") Long id)

bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/supplierinfo/BmsSupplierController.java

@@ -74,7 +74,11 @@ public class BmsSupplierController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BmsSupplier bmsSupplier)
     {
-        return toAjax(bmsSupplierService.insertBmsSupplier(bmsSupplier));
+        bmsSupplierService.insertBmsSupplier(bmsSupplier);
+        // 返回新主键，供前端新增成功后停留在编辑页继续维护子表
+        AjaxResult ajax = AjaxResult.success("新增成功");
+        ajax.put("supplierId", bmsSupplier.getSupplierId());
+        return ajax;
     }
 
     /** 修改供应商 */
@@ -112,4 +116,20 @@ public class BmsSupplierController extends BaseController
         List<BmsSupplierCompany> list = bmsSupplierService.selectBmsSupplierCompanyList(bmsSupplierCompany);
         return getDataTable(list);
     }
+
+    /** 删除供应商公司主体 */
+    @Log(title = "供应商公司主体", businessType = BusinessType.DELETE)
+    @DeleteMapping("/company/{companyIds}")
+    public AjaxResult removeCompany(@PathVariable Long[] companyIds)
+    {
+        return toAjax(bmsSupplierService.deleteBmsSupplierCompanyByCompanyIds(companyIds));
+    }
+
+    /** 删除供应商联系人 */
+    @Log(title = "供应商联系人", businessType = BusinessType.DELETE)
+    @DeleteMapping("/contact/{contactIds}")
+    public AjaxResult removeContact(@PathVariable Long[] contactIds)
+    {
+        return toAjax(bmsSupplierService.deleteBmsSupplierContactByContactIds(contactIds));
+    }
 }