From c33418f7f5e33077fddbee418a5e74a3341e9531 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 28 Oct 2021 13:35:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inm/migrations/0007_auto_20211028_1331.py | 34 +++++++++++++++++++ hb_server/apps/inm/serializers.py | 2 ++ hb_server/apps/wpm/models.py | 4 +++ 3 files changed, 40 insertions(+) create mode 100644 hb_server/apps/inm/migrations/0007_auto_20211028_1331.py diff --git a/hb_server/apps/inm/migrations/0007_auto_20211028_1331.py b/hb_server/apps/inm/migrations/0007_auto_20211028_1331.py new file mode 100644 index 0000000..d1df175 --- /dev/null +++ b/hb_server/apps/inm/migrations/0007_auto_20211028_1331.py @@ -0,0 +1,34 @@ +# Generated by Django 3.2.6 on 2021-10-28 05:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('inm', '0006_auto_20211027_0941'), + ] + + operations = [ + migrations.RemoveField( + model_name='fifodetail', + name='create_by', + ), + migrations.RemoveField( + model_name='fifodetail', + name='update_by', + ), + migrations.RemoveField( + model_name='iproduct', + name='create_by', + ), + migrations.RemoveField( + model_name='iproduct', + name='update_by', + ), + migrations.AddField( + model_name='fifo', + name='remark', + field=models.CharField(default='', max_length=1000, verbose_name='备注'), + ), + ] diff --git a/hb_server/apps/inm/serializers.py b/hb_server/apps/inm/serializers.py index 88b1e49..f2b3b25 100644 --- a/hb_server/apps/inm/serializers.py +++ b/hb_server/apps/inm/serializers.py @@ -65,6 +65,7 @@ class FIFOInPurSerializer(serializers.ModelSerializer): raise serializers.ValidationError('数目对不上') else: serialier = FIFODetailInPurSerializer(data=i) + serialier.is_valid(raise_exception=True) fifod = serialier.save(fifo=obj) p_list = [] for x in p_details: @@ -77,5 +78,6 @@ class FIFOInPurSerializer(serializers.ModelSerializer): IProduct.objects.bulk_create(p_list) else: serialier = FIFODetailInPurSerializer(data=i) + serialier.is_valid(raise_exception=True) fifod = serialier.save(fifo=obj) diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py index c3e2c6e..d4d0ab3 100644 --- a/hb_server/apps/wpm/models.py +++ b/hb_server/apps/wpm/models.py @@ -8,6 +8,10 @@ from utils.model import SoftModel, BaseModel from simple_history.models import HistoricalRecords from apps.mtm.models import Material, Step, RecordForm +class WorkshopInm(): + """ + 车间库存 + """ class Product(CommonAModel): """ 产品(所有生产过程中出现过的)