From 73b1d58b8a2761d37f26dc46b24df9b5a85bbca9 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 2 Jan 2025 09:37:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20base=20=E6=B7=BB=E5=8A=A0wpmw=20app?= =?UTF-8?q?=E4=BB=A5=E8=BF=BD=E8=B8=AA=E5=88=B0=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inm/migrations/0023_auto_20250102_0858.py | 30 +++++++++++++++++++ apps/wpmw/__init__.py | 0 apps/wpmw/admin.py | 3 ++ apps/wpmw/apps.py | 6 ++++ apps/wpmw/migrations/__init__.py | 0 apps/wpmw/models.py | 23 ++++++++++++++ apps/wpmw/tests.py | 3 ++ apps/wpmw/views.py | 3 ++ 8 files changed, 68 insertions(+) create mode 100644 apps/inm/migrations/0023_auto_20250102_0858.py create mode 100644 apps/wpmw/__init__.py create mode 100644 apps/wpmw/admin.py create mode 100644 apps/wpmw/apps.py create mode 100644 apps/wpmw/migrations/__init__.py create mode 100644 apps/wpmw/models.py create mode 100644 apps/wpmw/tests.py create mode 100644 apps/wpmw/views.py diff --git a/apps/inm/migrations/0023_auto_20250102_0858.py b/apps/inm/migrations/0023_auto_20250102_0858.py new file mode 100644 index 00000000..222bb0f0 --- /dev/null +++ b/apps/inm/migrations/0023_auto_20250102_0858.py @@ -0,0 +1,30 @@ +# Generated by Django 3.2.12 on 2025-01-02 00:58 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('qm', '0032_defect_note'), + ('inm', '0022_mioitemw'), + ] + + operations = [ + migrations.AddField( + model_name='materialbatch', + name='defect', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='qm.defect', verbose_name='缺陷'), + ), + migrations.AddField( + model_name='materialbatch', + name='state', + field=models.PositiveSmallIntegerField(choices=[(10, '合格'), (20, '不合格'), (30, '返修'), (40, '检验'), (50, '报废')], default=10, verbose_name='状态'), + ), + migrations.AlterField( + model_name='mioitem', + name='is_testok', + field=models.BooleanField(blank=True, null=True, verbose_name='检验是否合格'), + ), + ] diff --git a/apps/wpmw/__init__.py b/apps/wpmw/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/wpmw/admin.py b/apps/wpmw/admin.py new file mode 100644 index 00000000..8c38f3f3 --- /dev/null +++ b/apps/wpmw/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/apps/wpmw/apps.py b/apps/wpmw/apps.py new file mode 100644 index 00000000..3665f33d --- /dev/null +++ b/apps/wpmw/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class WpmwConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'apps.wpmw' diff --git a/apps/wpmw/migrations/__init__.py b/apps/wpmw/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/wpmw/models.py b/apps/wpmw/models.py new file mode 100644 index 00000000..e063661e --- /dev/null +++ b/apps/wpmw/models.py @@ -0,0 +1,23 @@ +from django.db import models +from apps.utils.models import BaseModel +from apps.mtm.models import Material + +# Create your models here. +class Wp(BaseModel): + """ + 动态半成品表 + """ + + number = models.CharField("编号", max_length=50, unique=True, null=True, blank=True) + state = models.PositiveSmallIntegerField('状态', default=10, choices=((10, '合格'), (20, '不合格'), (30, '返修'), (40, '检验'), (50, '报废'))) + material = models.ForeignKey(Material, verbose_name="当前物料形态", on_delete=models.CASCADE) + defects = models.ManyToManyField("qm.defect", through="wpmw.wpdefect", verbose_name="缺陷项") + + + mb = models.ForeignKey("inm.materialbatch", verbose_name="仓库物料", on_delete=models.CASCADE, null=True, blank=True) + wm = models.ForeignKey("wpm.wmaterial", verbose_name="车间物料", on_delete=models.CASCADE, null=True, blank=True) + +class WpDefect(BaseModel): + wp = models.ForeignKey(Wp, verbose_name="关联产物", on_delete=models.CASCADE) + defect = models.ForeignKey("qm.defect", verbose_name="关联缺陷项", on_delete=models.CASCADE) + is_main = models.BooleanField("是否主要缺陷", default=False) \ No newline at end of file diff --git a/apps/wpmw/tests.py b/apps/wpmw/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/apps/wpmw/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/apps/wpmw/views.py b/apps/wpmw/views.py new file mode 100644 index 00000000..91ea44a2 --- /dev/null +++ b/apps/wpmw/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here.