From fcac1d1d78bee73ea2aa979948f1ad30aebbedde Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 13 Jan 2022 09:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/hrm/models.py                  |  2 --
 .../inm/migrations/0025_auto_20220113_0932.py | 25 ++++++++++++++
 hb_server/apps/inm/views.py                   |  2 +-
 .../wpm/migrations/0046_auto_20220113_0932.py | 34 +++++++++++++++++++
 hb_server/apps/wpm/models.py                  |  1 +
 5 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 hb_server/apps/inm/migrations/0025_auto_20220113_0932.py
 create mode 100644 hb_server/apps/wpm/migrations/0046_auto_20220113_0932.py

diff --git a/hb_server/apps/hrm/models.py b/hb_server/apps/hrm/models.py
index 1176416..5e95b7f 100644
--- a/hb_server/apps/hrm/models.py
+++ b/hb_server/apps/hrm/models.py
@@ -35,5 +35,3 @@ class Employee(CommonAModel):
 
     def __str__(self):
         return self.name
-
-
diff --git a/hb_server/apps/inm/migrations/0025_auto_20220113_0932.py b/hb_server/apps/inm/migrations/0025_auto_20220113_0932.py
new file mode 100644
index 0000000..f006c1a
--- /dev/null
+++ b/hb_server/apps/inm/migrations/0025_auto_20220113_0932.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.9 on 2022-01-13 01:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inm', '0024_auto_20211227_0948'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='iproduct',
+            name='is_mtested',
+        ),
+        migrations.RemoveField(
+            model_name='iproduct',
+            name='is_mtestok',
+        ),
+        migrations.RemoveField(
+            model_name='iproduct',
+            name='remark_mtest',
+        ),
+    ]
diff --git a/hb_server/apps/inm/views.py b/hb_server/apps/inm/views.py
index 3fc15d8..a8c6f04 100644
--- a/hb_server/apps/inm/views.py
+++ b/hb_server/apps/inm/views.py
@@ -166,7 +166,7 @@ class IProductViewSet(ListModelMixin, GenericViewSet):
     半成品库存表
     """
     perms_map = {'*': '*'}
-    queryset = IProduct.objects.select_related('material', 'warehouse', 'wproduct__subproduction_plan__production_plan__order').filter(is_saled=False)
+    queryset = IProduct.objects.select_related('material', 'warehouse', 'wproduct__subproduction_plan__production_plan__order')
     serializer_class = IProductListSerializer
     filterset_class = IProductFilterSet
     search_fields = []
diff --git a/hb_server/apps/wpm/migrations/0046_auto_20220113_0932.py b/hb_server/apps/wpm/migrations/0046_auto_20220113_0932.py
new file mode 100644
index 0000000..bed69e1
--- /dev/null
+++ b/hb_server/apps/wpm/migrations/0046_auto_20220113_0932.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.2.9 on 2022-01-13 01:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wpm', '0045_auto_20220107_0917'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='wproduct',
+            name='last_test_result',
+            field=models.BooleanField(blank=True, null=True, verbose_name='最后一次检验结果'),
+        ),
+        migrations.AlterField(
+            model_name='operationmaterial',
+            name='operation',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='om_operation', to='wpm.operation', verbose_name='关联的生产操作'),
+        ),
+        migrations.AlterField(
+            model_name='wproduct',
+            name='child',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='wproduct_child', to='wpm.wproduct'),
+        ),
+        migrations.AlterField(
+            model_name='wproductflow',
+            name='child',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='wproduct_child', to='wpm.wproductflow'),
+        ),
+    ]
diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py
index 9ccf298..ef7e71a 100644
--- a/hb_server/apps/wpm/models.py
+++ b/hb_server/apps/wpm/models.py
@@ -107,6 +107,7 @@ class WProduct(CommonAModel):
     is_mtested = models.BooleanField('是否军检', default=False)
     is_mtestok = models.BooleanField('是否军检合格', null=True, blank=True)
     remark_mtest = models.TextField('军检备注', null=True, blank=True)
+    last_test_result = models.BooleanField('最后一次检验结果', null=True, blank=True)
 
     @property
     def last_process_test(self):