wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wuweihua
2026-09-15 16:55:16 +08:00
parent ccf85ebefc 73e425b12f
commit 0643c5a2dc
20 changed files with 2904 additions and 2025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customerinfo/BmsCustomerController.java
+5 -1
View File
@@ -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
+1 -1
View File
@@ -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
+21 -1
View File
@@ -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));
}
}
bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml
+7 -6
View File
@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBmsCustomerList" parameterType="BmsCustomer" resultMap="BmsCustomerResult">
<include refid="selectBmsCustomerVo"/>
<where>
c.del_flag = '0'
<if test="customerCode != null and customerCode != ''"> and c.customer_code = #{customerCode}</if>
<if test="customerName != null and customerName != ''"> and c.customer_name like concat('%', #{customerName}, '%')</if>
<if test="customerCodeDw != null and customerCodeDw != ''"> and c.customer_code_dw = #{customerCodeDw}</if>
@@ -265,14 +266,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="creditCode != null">credit_code = #{creditCode},</if>
<if test="customerType != null">customer_type = #{customerType},</if>
<if test="isEnable != null">is_enable = #{isEnable},</if>
<if test="salesUserId != null">sales_user_id = #{salesUserId},</if>
<if test="salesUser != null">sales_user = #{salesUser},</if>
sales_user_id = #{salesUserId},
sales_user = #{salesUser},
<if test="ed != null">ed = #{ed},</if>
<if test="zq != null">zq = #{zq},</if>
<if test="settlementUserId != null">settlement_user_id = #{settlementUserId},</if>
<if test="settlementUser != null">settlement_user = #{settlementUser},</if>
<if test="serviceUserId != null">service_user_id = #{serviceUserId},</if>
<if test="serviceUser != null">service_user = #{serviceUser},</if>
settlement_user_id = #{settlementUserId},
settlement_user = #{settlementUser},
service_user_id = #{serviceUserId},
service_user = #{serviceUser},
<if test="settlementType != null">settlement_type = #{settlementType},</if>
<if test="tempEd != null">temp_ed = #{tempEd},</if>
<if test="accountBalance != null">account_balance = #{accountBalance},</if>
bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml
+6 -6
View File
@@ -139,12 +139,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="creditCode != null">credit_code = #{creditCode},</if>
<if test="supplierType != null">supplier_type = #{supplierType},</if>
<if test="isEnable != null">is_enable = #{isEnable},</if>
<if test="purchaserUserId != null">purchaser_user_id = #{purchaserUserId},</if>
<if test="purchaserUser != null">purchaser_user = #{purchaserUser},</if>
<if test="settlementUserId != null">settlement_user_id = #{settlementUserId},</if>
<if test="settlementUser != null">settlement_user = #{settlementUser},</if>
<if test="serviceUserId != null">service_user_id = #{serviceUserId},</if>
<if test="serviceUser != null">service_user = #{serviceUser},</if>
purchaser_user_id = #{purchaserUserId},
purchaser_user = #{purchaserUser},
settlement_user_id = #{settlementUserId},
settlement_user = #{settlementUser},
service_user_id = #{serviceUserId},
service_user = #{serviceUser},
<if test="ed != null">ed = #{ed},</if>
<if test="zq != null">zq = #{zq},</if>
<if test="settlementType != null">settlement_type = #{settlementType},</if>
bms-back/sql/customer+supplier/customer_supplier_menu_perms.sql
+104
View File
@@ -0,0 +1,104 @@
-- ----------------------------
-- 客户管理 / 供应商管理 菜单按钮权限补全 + 普通角色(role_id=2)初始授权
-- 幂等：可重复执行；已有记录不会重复插入
-- 菜单结构：
-- 2309 客户/供应商管理(M)
-- 2313 客户管理(C) perms -> customersupplier:customerinfo:list
-- 2422 客户余额管理(C,隐藏，静态路由页面，仅作收款审核按钮挂载点)
-- 2423 收款审核(F) customer:balance:review
-- [新增] 客户查询/新增/修改/删除/导出 5个F按钮
-- 2314 供应商管理(C) perms -> customersupplier:supplierinfo:list
-- [新增] 供应商查询/新增/修改/删除/导出 5个F按钮
-- ----------------------------
-- 1. 两个业务菜单补 list 权限标识（后端列表接口 @PreAuthorize 要求）
UPDATE `sys_menu` SET `perms` = 'customersupplier:customerinfo:list'
WHERE `menu_id` = 2313 AND (`perms` IS NULL OR `perms` = '');
UPDATE `sys_menu` SET `perms` = 'customersupplier:supplierinfo:list'
WHERE `menu_id` = 2314 AND (`perms` IS NULL OR `perms` = '');
-- 2. 客户余额管理为静态路由页面(/customersupplier/customer-money)，侧边栏不应显示，避免死链
UPDATE `sys_menu` SET `visible` = '1'
WHERE `menu_id` = 2422 AND `visible` = '0';
-- 3. 补全客户管理 5 个按钮（F），按 perms 幂等
INSERT INTO `sys_menu`
(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
`menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
SELECT '客户查询', 2313, 1, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:customerinfo:query', '#', 'admin', NOW(), ''
WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:customerinfo:query' AND `parent_id` = 2313);
INSERT INTO `sys_menu`
(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
`menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
SELECT '客户新增', 2313, 2, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:customerinfo:add', '#', 'admin', NOW(), ''
WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:customerinfo:add' AND `parent_id` = 2313);
INSERT INTO `sys_menu`
(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
`menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
SELECT '客户修改', 2313, 3, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:customerinfo:edit', '#', 'admin', NOW(), ''
WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:customerinfo:edit' AND `parent_id` = 2313);
INSERT INTO `sys_menu`
(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
`menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
SELECT '客户删除', 2313, 4, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:customerinfo:remove', '#', 'admin', NOW(), ''
WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:customerinfo:remove' AND `parent_id` = 2313);
INSERT INTO `sys_menu`
(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
`menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
SELECT '客户导出', 2313, 5, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:customerinfo:export', '#', 'admin', NOW(), ''
WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:customerinfo:export' AND `parent_id` = 2313);
-- 4. 补全供应商管理 5 个按钮（F），按 perms 幂等
INSERT INTO `sys_menu`
(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
`menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
SELECT '供应商查询', 2314, 1, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:supplierinfo:query', '#', 'admin', NOW(), ''
WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:supplierinfo:query' AND `parent_id` = 2314);
INSERT INTO `sys_menu`
(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
`menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
SELECT '供应商新增', 2314, 2, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:supplierinfo:add', '#', 'admin', NOW(), ''
WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:supplierinfo:add' AND `parent_id` = 2314);
INSERT INTO `sys_menu`
(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
`menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
SELECT '供应商修改', 2314, 3, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:supplierinfo:edit', '#', 'admin', NOW(), ''
WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:supplierinfo:edit' AND `parent_id` = 2314);
INSERT INTO `sys_menu`
(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
`menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
SELECT '供应商删除', 2314, 4, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:supplierinfo:remove', '#', 'admin', NOW(), ''
WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:supplierinfo:remove' AND `parent_id` = 2314);
INSERT INTO `sys_menu`
(`menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`,
`menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`)
SELECT '供应商导出', 2314, 5, '', '', '', 1, 0, 'F', '0', '0', 'customersupplier:supplierinfo:export', '#', 'admin', NOW(), ''
WHERE NOT EXISTS (SELECT 1 FROM `sys_menu` WHERE `perms` = 'customersupplier:supplierinfo:export' AND `parent_id` = 2314);
-- 5. 普通角色(role_id=2) 授权：目录 + 2个菜单 + 余额隐藏菜单 + 收款审核 + 10个新按钮（幂等）
INSERT INTO `sys_role_menu` (`role_id`, `menu_id`)
SELECT 2, m.`menu_id`
FROM `sys_menu` m
WHERE (
m.`menu_id` IN (2309, 2313, 2314, 2422, 2423)
OR m.`perms` IN (
'customersupplier:customerinfo:query', 'customersupplier:customerinfo:add',
'customersupplier:customerinfo:edit', 'customersupplier:customerinfo:remove',
'customersupplier:customerinfo:export',
'customersupplier:supplierinfo:query', 'customersupplier:supplierinfo:add',
'customersupplier:supplierinfo:edit', 'customersupplier:supplierinfo:remove',
'customersupplier:supplierinfo:export'
)
)
AND NOT EXISTS (
SELECT 1 FROM `sys_role_menu` rm WHERE rm.`role_id` = 2 AND rm.`menu_id` = m.`menu_id`
);