From 303cd94e35579182035bb528450329307b724cd2 Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Mon, 3 Nov 2025 13:55:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20srm=20=E4=BF=AE=E6=94=B9models?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ofm/services.py                           |  2 +-
 .../migrations/0002_patentrecord_pc_type.py    | 18 ++++++++++++++++++
 apps/srm/models.py                             |  6 ++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 apps/srm/migrations/0002_patentrecord_pc_type.py

diff --git a/apps/ofm/services.py b/apps/ofm/services.py
index 3ed56207..48ca1fa3 100644
--- a/apps/ofm/services.py
+++ b/apps/ofm/services.py
@@ -1,7 +1,7 @@
 
 from apps.wf.models import Ticket
 # TicketFlow, Transition, Workflow, CustomField, State, 
-from apps.ofm.models import LendingSeal, Vehicle, BorrowRecord, Publicity, MroomBooking, MroomSlot, PatentInfo, Papersecret
+from apps.ofm.models import LendingSeal, Vehicle, BorrowRecord, Publicity, MroomBooking, MroomSlot
 from rest_framework.exceptions import ParseError
 
 
diff --git a/apps/srm/migrations/0002_patentrecord_pc_type.py b/apps/srm/migrations/0002_patentrecord_pc_type.py
new file mode 100644
index 00000000..103fb1de
--- /dev/null
+++ b/apps/srm/migrations/0002_patentrecord_pc_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2025-11-03 05:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('srm', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='patentrecord',
+            name='pc_type',
+            field=models.CharField(choices=[('invention', '发明专利'), ('utility', '实用新型专利'), ('design', '外观设计专利')], default='invention', max_length=50, verbose_name='专利类型'),
+        ),
+    ]
diff --git a/apps/srm/models.py b/apps/srm/models.py
index 7ab14e00..45ec807a 100644
--- a/apps/srm/models.py
+++ b/apps/srm/models.py
@@ -46,9 +46,15 @@ class Papersecret(CommonBDModel):
 
 class PatentRecord(CommonADModel):
     """TN: 专利台账登记"""
+    PATENT_TYPE_CHOICES = (
+    ('invention', '发明专利'),
+    ('utility', '实用新型专利'),
+    ('design', '外观设计专利'),
+    )
     volume_number = models.CharField(max_length=50, null=True, blank=True, verbose_name="卷号")
     application_number = models.CharField(max_length=50, verbose_name="申请号（交局后补登）")
     patent = models.ForeignKey('PatentInfo', verbose_name="专利名称", on_delete=models.CASCADE, related_name='patent_record')
+    pc_type = models.CharField('专利类型', max_length=50, choices=PATENT_TYPE_CHOICES, default='invention')
     organization = models.CharField(max_length=100, verbose_name="单位")
     inventors = models.CharField(max_length=255, verbose_name="发明人")
     agent = models.CharField(max_length=255, null=True, blank=True, verbose_name="代理人")

From 830b0392c531c84bf3eb3a82751befcf5e7889dd Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Mon, 3 Nov 2025 14:08:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20srm=20=E4=BF=AE=E6=94=B9=20views?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/srm/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/srm/views.py b/apps/srm/views.py
index 03402c16..4e137f61 100644
--- a/apps/srm/views.py
+++ b/apps/srm/views.py
@@ -41,7 +41,7 @@ class PatentRecordViewSet(CustomModelViewSet):
     serializer_class = PatentRecordSerializer
     select_related_fields = ["patent"]
     filterset_fields = ["volume_number", "volume_number","inventors"]
-    ordering = ["-create_time", "volume_number", "type"]
+    ordering = ["-create_time", "volume_number"]
     search_fields = ["volume_number", "volume_number", "inventors"]
     
     def get_queryset(self):