更新登录页及优化相关功能

shierfeng-fastapi-backend/module_business/service/shipment_service.py

@@ -460,6 +460,7 @@ class ShipmentService:
         )
         return PalletScanResponseModel(
             pallet_id=pallet.pallet_id,
+            qr_token=pallet.qr_token,
             pallet_code=pallet.pallet_code,
             flow_state=PalletFlowState.FILLED_IN_WAREHOUSE,
             warehouse_id=inventory.warehouse_id,
@@ -470,6 +471,8 @@ class ShipmentService:
             strain_code=filling.strain_code_snapshot,
             strain_name=filling.strain_name_snapshot,
             batch_no=filling.batch_no,
+            production_date=filling.production_date,
+            expiry_date=filling.expiry_date,
             package_spec=filling.package_spec,
             capacity_packages=pallet.capacity_packages,
             remaining_packages=inventory.remaining_packages,
@@ -902,12 +905,13 @@ class ShipmentService:
             for inventory in inventories:
                 PalletStateMachine.ensure_transition(
                     PalletFlowState(inventory.flow_state),
-                    PalletFlowState.AT_SITE_UNUSED,
+                    PalletFlowState.IN_TRANSIT,
                 )
 
             inventory_by_id = {inventory.pallet_id: inventory for inventory in inventories}
             current_time = datetime.now()
             locked_shipment.status = DocumentStatus.CONFIRMED.value
+            locked_shipment.receipt_state = 'PENDING'
             locked_shipment.confirm_idempotency_key = idempotency_key
             locked_shipment.confirm_request_hash = request_hash
             locked_shipment.confirmed_by = user_id
@@ -927,7 +931,8 @@ class ShipmentService:
                 before_line_id = inventory.current_line_id
                 before_remaining_packages = inventory.remaining_packages
 
-                inventory.flow_state = PalletFlowState.AT_SITE_UNUSED.value
+                inventory.flow_state = PalletFlowState.IN_TRANSIT.value
+                inventory.site_arrived_at = None
                 inventory.warehouse_id = None
                 inventory.site_id = locked_shipment.target_site_id
                 inventory.current_line_id = None
@@ -939,7 +944,7 @@ class ShipmentService:
                     source_type='SHIPMENT',
                     source_id=shipment_id,
                     before_state=before_state,
-                    after_state=PalletFlowState.AT_SITE_UNUSED.value,
+                    after_state=PalletFlowState.IN_TRANSIT.value,
                     before_warehouse_id=before_warehouse_id,
                     before_site_id=before_site_id,
                     before_line_id=before_line_id,