From 4ff3a46c59b6f8dcd7bec0e89b0850981205f298 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 29 Sep 2021 08:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5em=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inm/migrations/0004_auto_20210929_0842.py | 45 +++++++++++++++++++
 hb_server/apps/inm/models.py                  | 11 ++---
 .../0010_alter_ticketflow_transition.py       | 19 ++++++++
 3 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 hb_server/apps/inm/migrations/0004_auto_20210929_0842.py
 create mode 100644 hb_server/apps/wf/migrations/0010_alter_ticketflow_transition.py

diff --git a/hb_server/apps/inm/migrations/0004_auto_20210929_0842.py b/hb_server/apps/inm/migrations/0004_auto_20210929_0842.py
new file mode 100644
index 0000000..aefebcb
--- /dev/null
+++ b/hb_server/apps/inm/migrations/0004_auto_20210929_0842.py
@@ -0,0 +1,45 @@
+# Generated by Django 3.2.6 on 2021-09-29 00:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0018_material_count'),
+        ('inm', '0003_auto_20210928_1702'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MaterialBatch',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('count', models.IntegerField(default=0, verbose_name='存量')),
+                ('batch', models.CharField(blank=True, max_length=100, null=True, verbose_name='批次号')),
+                ('expiration_date', models.DateField(blank=True, null=True, verbose_name='有效期')),
+                ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.material', verbose_name='物料信息')),
+                ('warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='inm.warehouse', verbose_name='所在仓库')),
+            ],
+            options={
+                'verbose_name': '库存表',
+                'verbose_name_plural': '库存表',
+            },
+        ),
+        migrations.RemoveField(
+            model_name='inventory',
+            name='create_by',
+        ),
+        migrations.RemoveField(
+            model_name='inventory',
+            name='update_by',
+        ),
+        migrations.DeleteModel(
+            name='Materials',
+        ),
+    ]
diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py
index 9a320d1..52a7ddc 100644
--- a/hb_server/apps/inm/models.py
+++ b/hb_server/apps/inm/models.py
@@ -23,7 +23,7 @@ class WareHouse(CommonAModel):
     def __str__(self):
         return self.name
 
-class Inventory(CommonAModel):
+class Inventory(BaseModel):
     """
     库存物料
     """
@@ -34,14 +34,15 @@ class Inventory(CommonAModel):
         verbose_name = '库存表'
         verbose_name_plural = verbose_name
 
-class Materials(CommonAModel):
+class MaterialBatch(BaseModel):
     """
     物料批次
     """
-    inventory = models.ForeignKey(Inventory, on_delete=models.CASCADE, verbose_name='仓库物料')
+    material = models.ForeignKey(Material, on_delete=models.CASCADE, verbose_name='物料信息')
+    warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
     count = models.IntegerField('存量', default=0)
-    batch = models.CharField('批次', max_length=100, null=True, blank=True)
-    effective = models.DateField('有效期', null=True, blank=True)
+    batch = models.CharField('批次号', max_length=100, null=True, blank=True)
+    expiration_date = models.DateField('有效期', null=True, blank=True)
     class Meta:
         verbose_name = '库存表'
         verbose_name_plural = verbose_name
diff --git a/hb_server/apps/wf/migrations/0010_alter_ticketflow_transition.py b/hb_server/apps/wf/migrations/0010_alter_ticketflow_transition.py
new file mode 100644
index 0000000..82a9ce8
--- /dev/null
+++ b/hb_server/apps/wf/migrations/0010_alter_ticketflow_transition.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.6 on 2021-09-29 00:42
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wf', '0009_ticketflow_participant_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ticketflow',
+            name='transition',
+            field=models.ForeignKey(blank=True, help_text='与worklow.Transition关联， 为0时表示认为干预的操作', null=True, on_delete=django.db.models.deletion.CASCADE, to='wf.transition', verbose_name='流转id'),
+        ),
+    ]