From ac7e0a84eab156548e2d36815f1d75fddc8e2916 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 21 Jun 2024 15:48:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20pm=20=E6=B7=BB=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pm/migrations/0018_mtask_hour_work.py | 18 ++++++++++++++++++ apps/pm/models.py | 5 +++++ 2 files changed, 23 insertions(+) create mode 100644 apps/pm/migrations/0018_mtask_hour_work.py diff --git a/apps/pm/migrations/0018_mtask_hour_work.py b/apps/pm/migrations/0018_mtask_hour_work.py new file mode 100644 index 00000000..29ea908f --- /dev/null +++ b/apps/pm/migrations/0018_mtask_hour_work.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2024-06-21 07:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pm', '0017_auto_20231205_1724'), + ] + + operations = [ + migrations.AddField( + model_name='mtask', + name='hour_work', + field=models.FloatField(blank=True, null=True, verbose_name='工时'), + ), + ] diff --git a/apps/pm/models.py b/apps/pm/models.py index b518284a..0d6de712 100644 --- a/apps/pm/models.py +++ b/apps/pm/models.py @@ -8,6 +8,10 @@ TASK_TYPE = ( ('mass', '量产'), ('pilot', '中试') ) +SCHEDULE_TYPE = ( + ('to_day', '排产到天'), + ('to_mgroup', '排产到工段') +) class Utask(CommonBDModel): @@ -82,6 +86,7 @@ class Mtask(CommonADModel): end_date = models.DateField('计划完工日期') utask = models.ForeignKey( Utask, verbose_name='关联大任务', on_delete=models.CASCADE, related_name='mtask_utask', null=True, blank=True) + hour_work = models.FloatField('工时', null=True, blank=True) peifen_kg = models.FloatField('配粉料数', default=0) submit_time = models.DateTimeField('提交时间', null=True, blank=True)