diff --git a/apps/mtm/migrations/0037_material_into_wm.py b/apps/mtm/migrations/0037_material_into_wm.py new file mode 100644 index 00000000..5fdb9695 --- /dev/null +++ b/apps/mtm/migrations/0037_material_into_wm.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2024-07-25 05:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0036_material_unit_price'), + ] + + operations = [ + migrations.AddField( + model_name='material', + name='into_wm', + field=models.BooleanField(default=True, verbose_name='是否进入车间库存'), + ), + ] diff --git a/apps/mtm/models.py b/apps/mtm/models.py index 31ab88cf..8fb0078d 100644 --- a/apps/mtm/models.py +++ b/apps/mtm/models.py @@ -73,6 +73,7 @@ class Material(CommonAModel): components = models.JSONField('组件', default=dict, null=False, blank=True) brothers = models.JSONField('兄弟件', default=list, null=False, blank=True) unit_price = models.PositiveIntegerField('单价', null=True, blank=True) + into_wm = models.BooleanField('是否进入车间库存', default=True) class Meta: verbose_name = '物料表' diff --git a/apps/wpm/services.py b/apps/wpm/services.py index 913423cb..652d6b46 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -98,10 +98,12 @@ def do_out(mio: MIO): do_user = mio.do_user mioitems = MIOItem.objects.filter(mio=mio) for item in mioitems: - # 用于混料的原料不与车间库存交互 material = item.material - if material.type in [Material.MA_TYPE_MAINSO, Material.MA_TYPE_HELPSO]: # hard code + if material.into_wm is False: continue + # 用于混料的原料不与车间库存交互 + # if material.type in [Material.MA_TYPE_MAINSO, Material.MA_TYPE_HELPSO]: # hard code + # continue action_list = [] mias = MIOItemA.objects.filter(mioitem=item) if mias.exists(): @@ -138,10 +140,12 @@ def do_in(mio: MIO): do_user = mio.do_user mioitems = MIOItem.objects.filter(mio=mio) for item in mioitems: - # 用于混料的原料不与车间库存交互 material = item.material - if material.type in [Material.MA_TYPE_MAINSO, Material.MA_TYPE_HELPSO]: # hard code + if material.into_wm is False: continue + # 用于混料的原料不与车间库存交互 + # if material.type in [Material.MA_TYPE_MAINSO, Material.MA_TYPE_HELPSO]: # hard code + # continue action_list = [] mias = MIOItemA.objects.filter(mioitem=item) if mias.exists(): # 组合件入库