优化

iam/src/main/resources/db/phase5-delivery-permissions.sql

@@ -9,6 +9,9 @@ BEGIN
   IF EXISTS (
     SELECT 1 FROM iam_permission
      WHERE (id = 5107064 AND permission_code <> 'platform:overseas-warehouse:dispatch:list')
+        OR (id = 5107065 AND permission_code <> 'platform:overseas-warehouse:dispatch:create')
+        OR (id = 5107066 AND permission_code <> 'platform:overseas-warehouse:dispatch:loading-complete')
+        OR (id = 5107067 AND permission_code <> 'platform:overseas-warehouse:dispatch:depart')
         OR (id = 5107016 AND permission_code <> 'platform:overseas-warehouse:dispatch:edit')
         OR (id = 5107017 AND permission_code <> 'platform:overseas-warehouse:dispatch:cancel')
         OR (id = 5107018 AND permission_code <> 'platform:overseas-warehouse:dispatch:transfer-delivery')
@@ -25,10 +28,12 @@ BEGIN
         OR (id = 5107081 AND permission_code <> 'platform:overseas-warehouse:customer-visit:edit')
         OR (id = 5107082 AND permission_code <> 'platform:overseas-warehouse:delivery:status')
         OR (id = 5306000 AND permission_code <> 'merchant:warehouse:delivery:list')
-        OR (id = 5306001 AND permission_code <> 'merchant:warehouse:delivery:create')
   ) OR EXISTS (
     SELECT 1 FROM iam_permission
      WHERE (permission_code = 'platform:overseas-warehouse:dispatch:list' AND id <> 5107064)
+        OR (permission_code = 'platform:overseas-warehouse:dispatch:create' AND id <> 5107065)
+        OR (permission_code = 'platform:overseas-warehouse:dispatch:loading-complete' AND id <> 5107066)
+        OR (permission_code = 'platform:overseas-warehouse:dispatch:depart' AND id <> 5107067)
         OR (permission_code = 'platform:overseas-warehouse:dispatch:edit' AND id <> 5107016)
         OR (permission_code = 'platform:overseas-warehouse:dispatch:cancel' AND id <> 5107017)
         OR (permission_code = 'platform:overseas-warehouse:dispatch:transfer-delivery' AND id <> 5107018)
@@ -45,7 +50,6 @@ BEGIN
         OR (permission_code = 'platform:overseas-warehouse:customer-visit:edit' AND id <> 5107081)
         OR (permission_code = 'platform:overseas-warehouse:delivery:status' AND id <> 5107082)
         OR (permission_code = 'merchant:warehouse:delivery:list' AND id <> 5306000)
-        OR (permission_code = 'merchant:warehouse:delivery:create' AND id <> 5306001)
   ) THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='五期海外派送权限初始化失败：权限ID或编码冲突';
   END IF;
@@ -59,8 +63,11 @@ INSERT INTO iam_permission
    permission_name, route_path, http_method, sort_no, status, built_in, deleted)
 VALUES
   (5107064,0,'PLATFORM','MENU',0,'platform:overseas-warehouse:dispatch:list','海外排车单','/overseas-warehouse/dispatches','GET',764,'ACTIVE',1,0),
+  (5107065,0,'PLATFORM','BUTTON',5107064,'platform:overseas-warehouse:dispatch:create','新增排车单',NULL,'POST',765,'ACTIVE',1,0),
+  (5107066,0,'PLATFORM','BUTTON',5107064,'platform:overseas-warehouse:dispatch:loading-complete','确认装车完成',NULL,'POST',766,'ACTIVE',1,0),
+  (5107067,0,'PLATFORM','BUTTON',5107064,'platform:overseas-warehouse:dispatch:depart','确认实际发车',NULL,'POST',767,'ACTIVE',1,0),
   (5107016,0,'PLATFORM','BUTTON',5107064,'platform:overseas-warehouse:dispatch:edit','编辑海外排车',NULL,'PUT',716,'ACTIVE',1,0),
-  (5107017,0,'PLATFORM','BUTTON',5107064,'platform:overseas-warehouse:dispatch:cancel','取消海外排车',NULL,'DELETE',717,'ACTIVE',1,0),
+  (5107017,0,'PLATFORM','BUTTON',5107064,'platform:overseas-warehouse:dispatch:cancel','取消海外排车',NULL,'POST',717,'ACTIVE',1,0),
   (5107018,0,'PLATFORM','BUTTON',5107064,'platform:overseas-warehouse:dispatch:transfer-delivery','排车转派送',NULL,'POST',718,'ACTIVE',1,0),
   (5107070,0,'PLATFORM','MENU',0,'platform:overseas-warehouse:exception-order:list','海外异常订单','/overseas-warehouse/exception-orders','GET',770,'ACTIVE',1,0),
   (5107071,0,'PLATFORM','BUTTON',5107070,'platform:overseas-warehouse:exception-order:create','新增海外异常订单',NULL,'POST',771,'ACTIVE',1,0),
@@ -74,8 +81,7 @@ VALUES
   (5107092,0,'PLATFORM','MENU',0,'platform:overseas-warehouse:delivery:list','海外派送单','/overseas-warehouse/delivery-orders','GET',767,'ACTIVE',1,0),
   (5107094,0,'PLATFORM','BUTTON',5107092,'platform:overseas-warehouse:delivery:documents','管理派送资料',NULL,'POST',769,'ACTIVE',1,0),
   (5107093,0,'PLATFORM','BUTTON',5107090,'platform:overseas-warehouse:outbound:cancel','取消海外出库单',NULL,'POST',768,'ACTIVE',1,0),
-  (5306000,0,'MERCHANT','MENU',0,'merchant:warehouse:delivery:list','海外仓派送单','/orders/delivery','GET',60,'ACTIVE',1,0),
-  (5306001,0,'MERCHANT','BUTTON',5306000,'merchant:warehouse:delivery:create','创建海外仓派送单',NULL,'POST',10,'ACTIVE',1,0)
+  (5306000,0,'MERCHANT','MENU',0,'merchant:warehouse:delivery:list','海外仓派送单','/orders/delivery','GET',60,'ACTIVE',1,0)
 ON DUPLICATE KEY UPDATE
   permission_type=VALUES(permission_type), parent_id=VALUES(parent_id),
   permission_name=VALUES(permission_name), route_path=VALUES(route_path),
@@ -92,6 +98,9 @@ SELECT 0, role.id, permission.id, CURRENT_TIMESTAMP(3)
    AND role.status='ACTIVE' AND role.deleted=0
    AND permission.permission_code IN (
      'platform:overseas-warehouse:dispatch:list',
+     'platform:overseas-warehouse:dispatch:create',
+     'platform:overseas-warehouse:dispatch:loading-complete',
+     'platform:overseas-warehouse:dispatch:depart',
      'platform:overseas-warehouse:dispatch:edit',
      'platform:overseas-warehouse:dispatch:cancel',
      'platform:overseas-warehouse:dispatch:transfer-delivery',
@@ -117,8 +126,7 @@ SELECT role.tenant_id, role.id, permission.id, CURRENT_TIMESTAMP(3)
  WHERE role.tenant_id>0 AND role.app_code='MERCHANT' AND role.role_code='MERCHANT_OWNER'
    AND role.status='ACTIVE' AND role.deleted=0
    AND permission.permission_code IN (
-     'merchant:warehouse:delivery:list',
-     'merchant:warehouse:delivery:create')
+     'merchant:warehouse:delivery:list')
    AND permission.status='ACTIVE' AND permission.deleted=0;
 
 -- 仓库后台岗位按最小职责授权；PDA 岗位不得获得后台排车、出库或派送权限。
@@ -130,6 +138,9 @@ CREATE TEMPORARY TABLE tmp_phase5_delivery_role_permission (
 ) ENGINE=MEMORY;
 INSERT INTO tmp_phase5_delivery_role_permission (role_code, permission_code) VALUES
   ('WAREHOUSE_OPERATOR','platform:overseas-warehouse:dispatch:list'),
+  ('WAREHOUSE_OPERATOR','platform:overseas-warehouse:dispatch:create'),
+  ('WAREHOUSE_OPERATOR','platform:overseas-warehouse:dispatch:loading-complete'),
+  ('WAREHOUSE_OPERATOR','platform:overseas-warehouse:dispatch:depart'),
   ('WAREHOUSE_OPERATOR','platform:overseas-warehouse:dispatch:edit'),
   ('WAREHOUSE_OPERATOR','platform:overseas-warehouse:dispatch:cancel'),
   ('WAREHOUSE_OPERATOR','platform:overseas-warehouse:dispatch:transfer-delivery'),
@@ -160,6 +171,9 @@ WHERE role.tenant_id=0 AND role.app_code='PLATFORM'
   AND role.role_code IN ('WAREHOUSE_OPERATOR','WAREHOUSE_TALLY','OVERSEAS_WAREHOUSE_PDA_OPERATOR','CN_FIRSTLEG_PDA_OPERATOR')
   AND permission.permission_code IN (
     'platform:overseas-warehouse:dispatch:list',
+     'platform:overseas-warehouse:dispatch:create',
+     'platform:overseas-warehouse:dispatch:loading-complete',
+     'platform:overseas-warehouse:dispatch:depart',
     'platform:overseas-warehouse:dispatch:edit',
     'platform:overseas-warehouse:dispatch:cancel',
     'platform:overseas-warehouse:dispatch:transfer-delivery',
@@ -186,7 +200,7 @@ SELECT 0, role.id, permission.id, CURRENT_TIMESTAMP(3)
     AND permission.permission_code=expected.permission_code
     AND permission.status='ACTIVE' AND permission.deleted=0;
 
--- 客户默认管理员获得派送列表/详情只读及独立创建；其他客户角色不自动扩权。
+-- 客户默认管理员只获得派送列表和详情读取；整车派送由平台统一安排。
 INSERT IGNORE INTO iam_role_permission (tenant_id, role_id, permission_id, created_at)
 SELECT 0, role.id, permission.id, CURRENT_TIMESTAMP(3)
   FROM iam_role role
@@ -194,8 +208,7 @@ SELECT 0, role.id, permission.id, CURRENT_TIMESTAMP(3)
  WHERE role.tenant_id=0 AND role.app_code='MERCHANT' AND role.role_code='MERCHANT_OWNER'
    AND role.status='ACTIVE' AND role.deleted=0
    AND permission.permission_code IN (
-     'merchant:warehouse:delivery:list',
-     'merchant:warehouse:delivery:create')
+     'merchant:warehouse:delivery:list')
    AND permission.status='ACTIVE' AND permission.deleted=0;
 
 DROP PROCEDURE IF EXISTS assert_phase5_delivery_permissions;
@@ -209,6 +222,9 @@ BEGIN
        WHERE tenant_id=0 AND status='ACTIVE' AND deleted=0
          AND permission_code IN (
            'platform:overseas-warehouse:dispatch:list',
+     'platform:overseas-warehouse:dispatch:create',
+     'platform:overseas-warehouse:dispatch:loading-complete',
+     'platform:overseas-warehouse:dispatch:depart',
            'platform:overseas-warehouse:dispatch:edit',
            'platform:overseas-warehouse:dispatch:cancel',
            'platform:overseas-warehouse:dispatch:transfer-delivery',
@@ -224,8 +240,7 @@ BEGIN
            'platform:overseas-warehouse:delivery:documents',
            'platform:overseas-warehouse:customer-visit:list',
            'platform:overseas-warehouse:customer-visit:edit',
-           'merchant:warehouse:delivery:list',
-           'merchant:warehouse:delivery:create')) <> 18 THEN
+           'merchant:warehouse:delivery:list')) <> 20 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='五期海外派送权限初始化失败：权限目录不完整';
   END IF;
   IF (SELECT COUNT(*) FROM iam_role_permission grant_row
@@ -234,6 +249,9 @@ BEGIN
        WHERE role.role_code='PLATFORM_ADMIN'
          AND permission.permission_code IN (
            'platform:overseas-warehouse:dispatch:list',
+     'platform:overseas-warehouse:dispatch:create',
+     'platform:overseas-warehouse:dispatch:loading-complete',
+     'platform:overseas-warehouse:dispatch:depart',
            'platform:overseas-warehouse:dispatch:edit',
            'platform:overseas-warehouse:dispatch:cancel',
            'platform:overseas-warehouse:dispatch:transfer-delivery',
@@ -248,7 +266,7 @@ BEGIN
            'platform:overseas-warehouse:delivery:status',
            'platform:overseas-warehouse:delivery:documents',
            'platform:overseas-warehouse:customer-visit:list',
-           'platform:overseas-warehouse:customer-visit:edit')) <> 16 THEN
+           'platform:overseas-warehouse:customer-visit:edit')) <> 19 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='五期海外派送权限初始化失败：平台管理员授权不完整';
   END IF;
   IF EXISTS (SELECT 1 FROM iam_role role
@@ -260,6 +278,9 @@ BEGIN
               WHERE grant_row.role_id=role.id AND grant_row.tenant_id=role.tenant_id
                 AND permission.permission_code IN (
            'platform:overseas-warehouse:dispatch:list',
+     'platform:overseas-warehouse:dispatch:create',
+     'platform:overseas-warehouse:dispatch:loading-complete',
+     'platform:overseas-warehouse:dispatch:depart',
            'platform:overseas-warehouse:dispatch:edit',
            'platform:overseas-warehouse:dispatch:cancel',
            'platform:overseas-warehouse:dispatch:transfer-delivery',
@@ -274,14 +295,14 @@ BEGIN
            'platform:overseas-warehouse:delivery:status',
            'platform:overseas-warehouse:delivery:documents',
            'platform:overseas-warehouse:customer-visit:list',
-           'platform:overseas-warehouse:customer-visit:edit')) <> 16) THEN
+           'platform:overseas-warehouse:customer-visit:edit')) <> 19) THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='五期海外派送权限初始化失败：平台自定义管理员授权不完整';
   END IF;
   SELECT COALESCE(SUM(role_code='WAREHOUSE_OPERATOR'),0),
          COALESCE(SUM(role_code='WAREHOUSE_TALLY'),0)
     INTO v_warehouse_operator_permission_count, v_warehouse_tally_permission_count
     FROM tmp_phase5_delivery_role_permission;
-  IF v_warehouse_operator_permission_count <> 16
+  IF v_warehouse_operator_permission_count <> 19
      OR v_warehouse_tally_permission_count <> 5 THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='五期海外派送权限初始化失败：仓库岗位最小权限矩阵异常';
   END IF;
@@ -291,6 +312,9 @@ BEGIN
        WHERE role.role_code IN ('OVERSEAS_WAREHOUSE_PDA_OPERATOR','CN_FIRSTLEG_PDA_OPERATOR')
          AND permission.permission_code IN (
            'platform:overseas-warehouse:dispatch:list',
+     'platform:overseas-warehouse:dispatch:create',
+     'platform:overseas-warehouse:dispatch:loading-complete',
+     'platform:overseas-warehouse:dispatch:depart',
            'platform:overseas-warehouse:dispatch:edit',
            'platform:overseas-warehouse:dispatch:cancel',
            'platform:overseas-warehouse:dispatch:transfer-delivery',
@@ -313,11 +337,10 @@ BEGIN
          ON grant_row.role_id=role.id AND grant_row.tenant_id=role.tenant_id
        LEFT JOIN iam_permission permission ON permission.id=grant_row.permission_id
          AND permission.permission_code IN (
-           'merchant:warehouse:delivery:list',
-           'merchant:warehouse:delivery:create')
+           'merchant:warehouse:delivery:list')
        WHERE role.role_code='MERCHANT_OWNER' AND role.app_code='MERCHANT'
          AND role.status='ACTIVE' AND role.deleted=0
-       GROUP BY role.id HAVING COUNT(DISTINCT permission.permission_code) <> 2) THEN
+       GROUP BY role.id HAVING COUNT(DISTINCT permission.permission_code) <> 1) THEN
     SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='五期海外派送权限初始化失败：客户默认管理员授权不完整';
   END IF;
 END$$