Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory

apps/ofm/migrations/0009_borrowrecord_ticket.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.12 on 2025-09-12 07:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wf', '0002_alter_state_filter_dept'),
+        ('ofm', '0008_remove_borrowrecord_borrow_user'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='borrowrecord',
+            name='ticket',
+            field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='borrow_ticket', to='wf.ticket', verbose_name='关联工单'),
+        ),
+    ]

apps/ofm/models.py

@@ -101,6 +101,8 @@ class BorrowRecord(CommonBDModel):
     return_date = models.DateField('归还日期',  null=True, blank=True)
     contacts = models.CharField('借阅人电话', max_length=50, validators=[phone_validator], null=True, blank=True)
     remark = models.JSONField('用途', default=list, help_text=['借阅', '复印', '查阅'])
+    ticket = models.ForeignKey('wf.ticket', verbose_name='关联工单',
+                               on_delete=models.SET_NULL, related_name='borrow_ticket', null=True, blank=True, db_constraint=False)
 
 
 # class Publicity(CommonBDModel):