From ba9466a90b0af720c05007d506c68b789fc432ac Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 4 Nov 2021 10:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AD=90=E8=AE=A1=E5=88=92bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pm/migrations/0011_auto_20211104_1006.py  | 25 +++++++++++++++++++
 hb_server/apps/pm/models.py                   |  6 ++---
 hb_server/apps/wpm/models.py                  | 20 ++++++++-------
 3 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 hb_server/apps/pm/migrations/0011_auto_20211104_1006.py

diff --git a/hb_server/apps/pm/migrations/0011_auto_20211104_1006.py b/hb_server/apps/pm/migrations/0011_auto_20211104_1006.py
new file mode 100644
index 0000000..fafca63
--- /dev/null
+++ b/hb_server/apps/pm/migrations/0011_auto_20211104_1006.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.6 on 2021-11-04 02:06
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0028_auto_20211102_1707'),
+        ('pm', '0010_auto_20211103_1700'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subproductionplan',
+            name='main_count',
+            field=models.IntegerField(default=0, verbose_name='应产出数'),
+        ),
+        migrations.AlterField(
+            model_name='subproductionplan',
+            name='main_product',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='mtm.material', verbose_name='主要产品'),
+        ),
+    ]
diff --git a/hb_server/apps/pm/models.py b/hb_server/apps/pm/models.py
index f528c64..62b02e8 100644
--- a/hb_server/apps/pm/models.py
+++ b/hb_server/apps/pm/models.py
@@ -46,9 +46,9 @@ class SubProductionPlan(CommonAModel):
 
     workshop = models.ForeignKey(Organization, verbose_name='生产车间', on_delete=models.CASCADE)
     process = models.ForeignKey(Process, verbose_name='关联大工序', on_delete=models.CASCADE)
-    
-    main_product = models.ForeignKey(Material, verbose_name='主要产品', on_delete=models.CASCADE)
-    main_count = models.IntegerField('应产出数')
+
+    main_product = models.ForeignKey(Material, verbose_name='主要产品', on_delete=models.CASCADE, null=True, blank=True)
+    main_count = models.IntegerField('应产出数', default=0)
     main_count_real = models.IntegerField('实际产出数', default=0)
 
     steps = models.JSONField('工艺步骤', default=list)
diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py
index 31bd224..57d9548 100644
--- a/hb_server/apps/wpm/models.py
+++ b/hb_server/apps/wpm/models.py
@@ -37,16 +37,18 @@ class WProduct(CommonAModel):
     subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE)
     production_plan = models.ForeignKey(ProductionPlan, verbose_name='关联主生产计划', on_delete=models.CASCADE)
 
-class WProductRecord(CommonAModel):
-    """
-    记录表格
-    """
-    record_form = models.ForeignKey(RecordForm, verbose_name='所用表格', on_delete=models.CASCADE)
-    data = models.JSONField('记录的数据', default=dict, blank=True)
-
-
 class WProductFlow(BaseModel):
     """
     生产操作日志
     """
-    wproducts = models.JSONField('关联产品', default=list)
\ No newline at end of file
+    wproducts = models.JSONField('关联产品ID列表', default=list, blank=True)
+    p_state = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True)
+    remark = models.CharField('操作备注', max_length=200, null=True, blank=True)
+
+class WProductRecord(CommonAModel):
+    """
+    记录表格
+    """
+    form = models.ForeignKey(RecordForm, verbose_name='所用的生产记录表格', on_delete=models.CASCADE)
+    record_data = models.JSONField('记录的数据', default=dict, blank=True)
+    wproduct_flow = models.ForeignKey(WProductFlow, verbose_name='关联的生产操作日志', on_delete=models.CASCADE)