Feat: 后端新增基础资料与业务管理只读汇总接口
为 Web 端改版提供名称、统计和看板数据。只新增只读查询、扩展列表与详情 返回字段;写接口、托盘状态机和幂等键规则均未改动,未新增权限标识。 - 基础资料:列表补充名称与汇总,客户详情返回现场树,托盘详情返回最近流转, 托盘列表支持按流转阶段筛选和二维码精确匹配;新增现场、产线、隧道的上级 资料选项接口;Excel 导入支持 preview 只校验不写入 - 发货出库:列表支持 keyword、receiptState 筛选并补充名称、托盘数、包数和 菌种构成;详情明细补充托盘号、菌种、批次 - 首次入库:列表与详情补充名称、托盘数、托盘当前状态;新增 /summary - 托盘退回:列表支持 keyword 并补充名称与托盘汇总,详情补充托盘号和隧道; 新增 /summary、/site-options - 工厂装填:列表支持 keyword 并补充托盘号、仓库、操作人;新增 /summary、 /batches、/batches/detail - 客户现场使用:列表支持 keyword、fifoSkipped 并补充名称和被跳过的先到托盘号; 新增 /site-options、/site-board 以及 usage-fifo 的 /queue - 先到先用 DAO 抽出公共候选条件与排序,建议查询生成的 SQL 与改动前一致 - 新增各汇总 DAO 的单元测试,同步更新路由权限与模型字段契约测试 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -21,6 +21,7 @@ from module_admin.entity.vo.user_vo import CurrentUserModel, UserInfoModel
|
||||
from module_admin.service.login_service import LoginService
|
||||
from module_business.controller import filling_controller as filling_controller_module
|
||||
from module_business.dao.access_dao import AccessDao
|
||||
from module_business.dao.filling_summary_dao import FillingSummaryDao
|
||||
from module_business.dao.inventory_dao import InventoryDao
|
||||
from module_business.dao.master_dao import MasterDao
|
||||
from module_business.dao.operation_dao import OperationDao
|
||||
@@ -30,8 +31,12 @@ from module_business.entity.do.master_do import BizPallet, BizStrain
|
||||
from module_business.entity.do.operation_do import BizFillingRecord, BizPalletEvent, BizPalletInventory
|
||||
from module_business.entity.vo.operation_vo import (
|
||||
BusinessOptionModel,
|
||||
FillingBatchDetailModel,
|
||||
FillingBatchModel,
|
||||
FillingCreateModel,
|
||||
FillingListItemModel,
|
||||
FillingModel,
|
||||
FillingOverviewModel,
|
||||
FillingPageQueryModel,
|
||||
PalletScanResponseModel,
|
||||
)
|
||||
@@ -242,6 +247,7 @@ class TestFillingReadServices(unittest.IsolatedAsyncioTestCase):
|
||||
with (
|
||||
patch.object(AccessDao, 'list_user_warehouse_ids', new=AsyncMock(return_value=[9, 7, 7])),
|
||||
patch.object(OperationDao, 'get_filling_list', new=get_list),
|
||||
patch.object(FillingSummaryDao, 'get_list_summaries', new=AsyncMock(return_value={})),
|
||||
):
|
||||
result = await FillingService.get_filling_list_services(self.db, query, self.user, TestBatchScope.formal())
|
||||
|
||||
@@ -1169,6 +1175,9 @@ class TestFillingController(unittest.TestCase):
|
||||
schema = app.openapi()
|
||||
expected = {
|
||||
('/business/filling/list', 'get'),
|
||||
('/business/filling/summary', 'get'),
|
||||
('/business/filling/batches', 'get'),
|
||||
('/business/filling/batches/detail', 'get'),
|
||||
('/business/filling/strain-options', 'get'),
|
||||
('/business/filling/scan/{qr_token}', 'get'),
|
||||
('/business/filling/{filling_id}', 'get'),
|
||||
@@ -1179,7 +1188,21 @@ class TestFillingController(unittest.TestCase):
|
||||
self.assertEqual({'qr_token'}, {parameter['name'] for parameter in scan_parameters})
|
||||
|
||||
routes = self._routes()
|
||||
self.assertEqual(PageResponseModel[FillingModel], routes[('/business/filling/list', 'GET')].response_model)
|
||||
self.assertEqual(
|
||||
PageResponseModel[FillingListItemModel], routes[('/business/filling/list', 'GET')].response_model
|
||||
)
|
||||
self.assertEqual(
|
||||
DataResponseModel[FillingOverviewModel],
|
||||
routes[('/business/filling/summary', 'GET')].response_model,
|
||||
)
|
||||
self.assertEqual(
|
||||
PageResponseModel[FillingBatchModel],
|
||||
routes[('/business/filling/batches', 'GET')].response_model,
|
||||
)
|
||||
self.assertEqual(
|
||||
DataResponseModel[FillingBatchDetailModel],
|
||||
routes[('/business/filling/batches/detail', 'GET')].response_model,
|
||||
)
|
||||
self.assertEqual(
|
||||
DataResponseModel[list[BusinessOptionModel]],
|
||||
routes[('/business/filling/strain-options', 'GET')].response_model,
|
||||
@@ -1197,12 +1220,21 @@ class TestFillingController(unittest.TestCase):
|
||||
def test_static_routes_are_declared_before_dynamic_detail(self) -> None:
|
||||
paths = [route.path_format for route in filling_controller_module.filling_controller.routes]
|
||||
detail_index = paths.index('/business/filling/{filling_id}')
|
||||
self.assertLess(paths.index('/business/filling/strain-options'), detail_index)
|
||||
self.assertLess(paths.index('/business/filling/scan/{qr_token}'), detail_index)
|
||||
for static_path in (
|
||||
'/business/filling/summary',
|
||||
'/business/filling/batches',
|
||||
'/business/filling/batches/detail',
|
||||
'/business/filling/strain-options',
|
||||
'/business/filling/scan/{qr_token}',
|
||||
):
|
||||
self.assertLess(paths.index(static_path), detail_index)
|
||||
|
||||
def test_each_route_has_exact_permission_and_three_unique_values(self) -> None:
|
||||
expected = {
|
||||
('/business/filling/list', 'GET'): 'business:filling:list',
|
||||
('/business/filling/summary', 'GET'): 'business:filling:list',
|
||||
('/business/filling/batches', 'GET'): 'business:filling:list',
|
||||
('/business/filling/batches/detail', 'GET'): 'business:filling:query',
|
||||
('/business/filling/strain-options', 'GET'): 'business:filling:query',
|
||||
('/business/filling/scan/{qr_token}', 'GET'): 'business:filling:query',
|
||||
('/business/filling/{filling_id}', 'GET'): 'business:filling:query',
|
||||
|
||||
Reference in New Issue
Block a user