From 33ea769ad4eb9f2137870984d4f56b8cb61e0dc7 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 5 Dec 2023 17:25:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20mass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pm/migrations/0017_auto_20231205_1724.py | 23 +++++++++++++++++++ apps/pm/models.py | 9 ++++++++ apps/pm/services.py | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 apps/pm/migrations/0017_auto_20231205_1724.py diff --git a/apps/pm/migrations/0017_auto_20231205_1724.py b/apps/pm/migrations/0017_auto_20231205_1724.py new file mode 100644 index 00000000..6cd1a9ca --- /dev/null +++ b/apps/pm/migrations/0017_auto_20231205_1724.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.12 on 2023-12-05 09:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pm', '0016_auto_20231130_1628'), + ] + + operations = [ + migrations.AddField( + model_name='mtask', + name='type', + field=models.CharField(default='mass', help_text="(('mass', '量产'), ('pilot', '中试'))", max_length=10, verbose_name='任务类型'), + ), + migrations.AddField( + model_name='utask', + name='type', + field=models.CharField(default='mass', help_text="(('mass', '量产'), ('pilot', '中试'))", max_length=10, verbose_name='任务类型'), + ), + ] diff --git a/apps/pm/models.py b/apps/pm/models.py index b3022d7c..1973ff3d 100644 --- a/apps/pm/models.py +++ b/apps/pm/models.py @@ -4,6 +4,11 @@ from apps.mtm.models import Material, Mgroup # Create your models here. +TASK_TYPE = ( + ('mass', '量产'), + ('pilot', '中试') +) + class Utask(CommonBDModel): """ @@ -23,6 +28,8 @@ class Utask(CommonBDModel): (UTASK_STOP, '已停止'), (UTASK_DONE, '已提交') ) + type = models.CharField('任务类型', max_length=10, + help_text=str(TASK_TYPE), default='mass') state = models.PositiveIntegerField( '状态', choices=UTASK_STATES, default=UTASK_CREATED, help_text=str(UTASK_STATES)) number = models.CharField('编号', max_length=50, unique=True) @@ -55,6 +62,8 @@ class Mtask(CommonADModel): (MTASK_STOP, '已停止'), (MTASK_DONE, '已提交') ) + type = models.CharField('任务类型', max_length=10, + help_text=str(TASK_TYPE), default='mass') state = models.PositiveIntegerField( '状态', choices=MTASK_STATES, default=MTASK_CREATED, help_text=str(MTASK_STATES)) number = models.CharField('编号', max_length=50, unique=True) diff --git a/apps/pm/services.py b/apps/pm/services.py index fce4ff6a..7f73e07c 100644 --- a/apps/pm/services.py +++ b/apps/pm/services.py @@ -71,6 +71,7 @@ class PmService: for i in range(rela_days): task_date = start_date + timedelta(days=i) Mtask.objects.create(**{ + 'type': utask.type, 'number': f'{number}_{i+1}', 'material_out': utask.material, 'material_in': utask.material_in, @@ -124,6 +125,7 @@ class PmService: task_date = start_date + timedelta(days=i) Mtask.objects.create(**{ 'number': f'{number}_r{ind+1}_{i+1}', + 'type': utask.type, 'material_out': halfgood, 'material_in': material_in, 'mgroup': mgroup,