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

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

@@ -63,6 +63,8 @@ class FillingService:
                 'warehouse_id': page_object.warehouse_id,
                 'strain_id': page_object.strain_id,
                 'batch_no': page_object.batch_no.strip(),
+                'production_date': page_object.production_date.isoformat(),
+                'expiry_date': page_object.expiry_date.isoformat(),
                 'package_spec': page_object.package_spec.strip(),
                 'initial_packages': page_object.initial_packages,
             },
@@ -147,10 +149,11 @@ class FillingService:
 
     @staticmethod
     def _validate_package_count(initial_packages: int, pallet: BizPallet) -> None:
-        if type(initial_packages) is not int or initial_packages <= 0:
-            raise ServiceException(message='装填包数必须为正整数')
-        if initial_packages > pallet.capacity_packages:
-            raise ServiceException(message='装填包数不能超过托盘容量')
+        standard_packages = 100
+        if type(initial_packages) is not int or initial_packages != standard_packages:
+            raise ServiceException(message='新装填包数固定为 100 包')
+        if pallet.capacity_packages != standard_packages:
+            raise ServiceException(message='历史非 100 包托盘不允许新增装填')
 
     @staticmethod
     def _validate_active_strain(strain: BizStrain | None) -> BizStrain:
@@ -276,10 +279,11 @@ class FillingService:
             pallet,
             inventory,
             inventory.warehouse_id,
-            qr_token,
+            pallet.qr_token,
         )
         return PalletScanResponseModel(
             pallet_id=pallet.pallet_id,
+            qr_token=pallet.qr_token,
             pallet_code=pallet.pallet_code,
             flow_state=PalletFlowState.EMPTY_IN_WAREHOUSE,
             warehouse_id=inventory.warehouse_id,
@@ -472,6 +476,8 @@ class FillingService:
                 strain_code_snapshot=strain.strain_code,
                 strain_name_snapshot=strain.strain_name,
                 batch_no=page_object.batch_no.strip(),
+                production_date=page_object.production_date,
+                expiry_date=page_object.expiry_date,
                 package_spec=page_object.package_spec.strip(),
                 initial_packages=page_object.initial_packages,
                 active_slot='ACTIVE',