zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: base materialbatch添加字段

This commit is contained in:
caoqianming 2025-01-02 09:35:18 +08:00
parent 89cbab8258
commit 796d6e248f
3 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/inm/migrations/0022_mioitemw.py
View File

@ -22,13 +22,8 @@ class Migration(migrations.Migration):
('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
('number', models.TextField(verbose_name='编号')),
('test_json', models.JSONField(blank=True, default=dict, verbose_name='检验情况')),
('defect_json', models.JSONField(blank=True, default=list, verbose_name='缺陷情况')),
('note', models.TextField(blank=True, null=True, verbose_name='备注')),
('test_time', models.DateTimeField(blank=True, null=True, verbose_name='检验时间')),
('is_testok', models.BooleanField(default=True, verbose_name='检验是否合格')),
('mioitem', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='w_mioitem', to='inm.mioitem', verbose_name='关联出入库明细')),
('test_user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='检验人')),
],
options={
'abstract': False,

30
apps/inm/migrations/0023_auto_20241231_1051.py
View File

@ -1,30 +0,0 @@
# Generated by Django 3.2.12 on 2024-12-31 02:51
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='mioitemw',
name='qct',
field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to='qm.qct', verbose_name='所用检验模板'),
),
migrations.AlterField(
model_name='mioitem',
name='is_testok',
field=models.BooleanField(blank=True, null=True, verbose_name='检验是否合格'),
),
migrations.AlterField(
model_name='mioitemw',
name='is_testok',
field=models.BooleanField(blank=True, null=True, verbose_name='检验是否合格'),
),
]

10
apps/inm/models.py
View File

@ -21,6 +21,7 @@ class MaterialBatch(BaseModel):
物料批次
"""
batch = models.TextField('批次号')
state = models.PositiveSmallIntegerField('状态', default=10, choices=((10, '合格'), (20, '不合格'), (30, '返修'), (40, '检验'), (50, '报废')))
material = models.ForeignKey(
Material, on_delete=models.CASCADE, verbose_name='物料')
warehouse = models.ForeignKey(
@ -30,9 +31,10 @@ class MaterialBatch(BaseModel):
expiration_date = models.DateField('有效期', null=True, blank=True)
supplier = models.ForeignKey(
Supplier, verbose_name='供应商', on_delete=models.SET_NULL, null=True, blank=True)
batch_ofrom = models.TextField('原料批次号', null=True, blank=True)
material_ofrom = models.ForeignKey(Material, verbose_name='原料物料', on_delete=models.SET_NULL, null=True, blank=True, related_name='mb_mofrom')
defect = models.ForeignKey('qm.defect', verbose_name='缺陷', on_delete=models.PROTECT, null=True, blank=True)
class Meta:
unique_together = ('material', 'batch', 'warehouse')
@ -173,11 +175,5 @@ class MIOItemw(BaseModel):
"""
number = models.TextField('编号')
mioitem = models.ForeignKey(MIOItem, verbose_name='关联出入库明细', on_delete=models.CASCADE, related_name='w_mioitem')
test_json = models.JSONField('检验情况', default=dict, blank=True)
defect_json = models.JSONField('缺陷情况', default=list, blank=True)
note = models.TextField('备注', null=True, blank=True)
qct = models.ForeignKey('qm.qct', verbose_name='所用检验模板', on_delete=models.SET_NULL, null=True, blank=True, db_constraint=False)
test_user = models.ForeignKey(User, verbose_name='检验人', on_delete=models.SET_NULL, null=True, blank=True)
test_time = models.DateTimeField('检验时间', null=True, blank=True)
is_testok = models.BooleanField('检验是否合格', null=True, blank=True)