Merge pull request 'fix:分支提交测试' (#2) from dev_sj into master

Reviewed-on: http://gitea.xxhhcty.xyz:8080/zcdsj/factory/pulls/2
This commit is contained in:
caoqianming 2026-05-11 15:27:37 +08:00
commit 5354557f4a
1 changed files with 1 additions and 1 deletions

View File

@ -28,7 +28,7 @@ class WprViewSet(CustomListModelMixin, CustomRetrieveModelMixin, ComplexQueryMix
filterset_class = WprFilter filterset_class = WprFilter
ordering = ["number", "create_time"] ordering = ["number", "create_time"]
ordering_fields = ["number", "create_time", "update_time"] ordering_fields = ["number", "create_time", "update_time"]
search_fields = ["number", "material__name", "material__model", "material__specification", "number_out"] search_fields = ["number", "material__name", "material__model", "material__specification", "number_out","wm__batch"]
annotate_dict = { annotate_dict = {
"number_prefix": RawSQL("regexp_replace(wpmw_wpr.number, '(\\d+)$', '')", []), "number_prefix": RawSQL("regexp_replace(wpmw_wpr.number, '(\\d+)$', '')", []),
"number_suffix": RawSQL("COALESCE(NULLIF(regexp_replace(wpmw_wpr.number, '.*?(\\d+)$', '\\1'), ''), '0')::bigint", []), "number_suffix": RawSQL("COALESCE(NULLIF(regexp_replace(wpmw_wpr.number, '.*?(\\d+)$', '\\1'), ''), '0')::bigint", []),