优化

firstleg/src/main/resources/db/phase3-smart-loading-schema.sql

@@ -827,7 +827,44 @@ BEGIN
   IF current_plan_status = 'LOADING' AND EXISTS (
       SELECT 1 FROM fl_loading_pick_item
        WHERE loading_plan_item_id = OLD.id AND picked_package_count > 0) THEN
-    IF NOT EXISTS (
+    IF NOT (NEW.warehouse_remark <=> OLD.warehouse_remark) THEN
+      IF NEW.package_count <> OLD.package_count OR NEW.deleted <> OLD.deleted
+        OR NOT (NEW.customer_name <=> OLD.customer_name)
+        OR NOT (NEW.inbound_id <=> OLD.inbound_id)
+        OR NOT (NEW.inbound_detail_id <=> OLD.inbound_detail_id)
+        OR NOT (NEW.order_id <=> OLD.order_id)
+        OR NOT (NEW.order_no <=> OLD.order_no)
+        OR NOT (NEW.inbound_code <=> OLD.inbound_code)
+        OR NOT (NEW.destination_warehouse_id <=> OLD.destination_warehouse_id)
+        OR NOT (NEW.destination_warehouse_code <=> OLD.destination_warehouse_code)
+        OR NOT (NEW.destination_warehouse_name <=> OLD.destination_warehouse_name)
+        OR NOT (NEW.sku_code <=> OLD.sku_code)
+        OR NOT (NEW.product_name_zh <=> OLD.product_name_zh)
+        OR NOT (NEW.product_name_en <=> OLD.product_name_en)
+        OR NOT (NEW.product_image_file_id <=> OLD.product_image_file_id)
+        OR NOT (NEW.product_image_url <=> OLD.product_image_url)
+        OR NOT (NEW.product_quantity <=> OLD.product_quantity)
+        OR NOT (NEW.units_per_carton <=> OLD.units_per_carton)
+        OR NOT (NEW.pallet_count <=> OLD.pallet_count)
+        OR NOT (NEW.gross_weight_kg <=> OLD.gross_weight_kg)
+        OR NOT (NEW.net_weight_kg <=> OLD.net_weight_kg)
+        OR NOT (NEW.dimensional_weight_kg <=> OLD.dimensional_weight_kg)
+        OR NOT (NEW.volume_cbm <=> OLD.volume_cbm)
+        OR NOT (NEW.fba_tracking_no <=> OLD.fba_tracking_no)
+        OR NOT (NEW.shipment_no <=> OLD.shipment_no)
+        OR NOT (NEW.shipping_mark <=> OLD.shipping_mark)
+        OR NOT (NEW.load_sequence <=> OLD.load_sequence)
+        OR NOT (NEW.position_snapshot <=> OLD.position_snapshot)
+        OR NOT (NEW.internal_remark <=> OLD.internal_remark)
+        OR NOT (NEW.customer_remark <=> OLD.customer_remark)
+        OR NOT (NEW.frozen_at <=> OLD.frozen_at)
+        OR NOT (NEW.frozen_by <=> OLD.frozen_by)
+        OR NOT (NEW.removed_by <=> OLD.removed_by)
+        OR NOT (NEW.removed_by_name <=> OLD.removed_by_name)
+        OR NOT (NEW.removed_at <=> OLD.removed_at) THEN
+        SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '已有PDA拣货记录的装柜明细修改仓库备注时不得变更其他业务字段';
+      END IF;
+    ELSEIF NOT EXISTS (
         SELECT 1 FROM fl_loading_pick_item
          WHERE loading_plan_item_id = OLD.id
            AND item_status = 'PARTIAL'
@@ -862,7 +899,6 @@ BEGIN
       OR NOT (NEW.position_snapshot <=> OLD.position_snapshot)
       OR NOT (NEW.internal_remark <=> OLD.internal_remark)
       OR NOT (NEW.customer_remark <=> OLD.customer_remark)
-      OR NOT (NEW.warehouse_remark <=> OLD.warehouse_remark)
       OR NOT (NEW.frozen_at <=> OLD.frozen_at)
       OR NOT (NEW.frozen_by <=> OLD.frozen_by)
       OR NOT (NEW.removed_by <=> OLD.removed_by)

firstleg/src/main/resources/openapi/firstleg-v1.yaml

@@ -833,6 +833,26 @@ paths:
             application/json:
               schema: {$ref: '#/components/schemas/MerchantInboundBillingEnvelope'}
         '403': {description: 非当前客户或无订单查看权限}
+  /api/platform/v1/loading-plans/{loadingPlanId}/fee-details/{feeId}/adjust:
+    post:
+      summary: 调整已审核柜次费用的日期和金额
+      description: >-
+        仅 ACTIVE、APPROVED 且 sourceVersion 匹配的费用可调整。成功后 sourceVersion 加一并重新进入
+        PENDING；费用方向、费用项目、往来单位、币种、参与结算和备注保持原快照。身份或结算字段需要变化时，
+        必须作废原费用并新增。同一 expectedSourceVersion、businessDate、amount 的原样重试只读返回已生成的
+        PENDING 版本；旧版本异参、已作废或非已审核状态返回 A0409 且零写入。
+      parameters:
+        - {name: accountId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: loadingPlanId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: feeId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/ContainerFeeAdjustRequest'}
+      responses:
+        '200': {description: 成功时 data 为调整后柜次费用；业务冲突通过响应体 A0409 返回}
+        '403': {description: 无 firstleg:inbound:fee-detail:edit 权限}
 components:
   securitySchemes:
     bearerAuth:
@@ -1793,3 +1813,11 @@ components:
       properties:
         expectedVersion: {type: integer, minimum: 0}
         reason: {type: string, minLength: 1, maxLength: 500}
+    ContainerFeeAdjustRequest:
+      type: object
+      additionalProperties: false
+      required: [expectedSourceVersion, businessDate, amount]
+      properties:
+        expectedSourceVersion: {type: integer, minimum: 1}
+        businessDate: {type: string, format: date}
+        amount: {type: number, minimum: 0}