diff --git a/hb_server/apps/inm/migrations/0026_alter_fifo_inout_date.py b/hb_server/apps/inm/migrations/0026_alter_fifo_inout_date.py new file mode 100644 index 0000000..f086ed3 --- /dev/null +++ b/hb_server/apps/inm/migrations/0026_alter_fifo_inout_date.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.9 on 2022-01-14 07:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('inm', '0025_auto_20220113_0932'), + ] + + operations = [ + migrations.AlterField( + model_name='fifo', + name='inout_date', + field=models.DateField(blank=True, null=True, verbose_name='出入库日期'), + ), + ] diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py index 21105c0..6d179f6 100644 --- a/hb_server/apps/inm/models.py +++ b/hb_server/apps/inm/models.py @@ -76,7 +76,7 @@ class FIFO(CommonADModel): is_audited = models.BooleanField('是否审核', default=False) auditor = models.ForeignKey( User, verbose_name='审核人', on_delete=models.CASCADE, null=True, blank=True) - inout_date = models.DateField('出入库日期') + inout_date = models.DateField('出入库日期', null=True, blank=True) remark = models.CharField('备注', max_length=1000, default='') diff --git a/hb_server/apps/inm/views.py b/hb_server/apps/inm/views.py index 2b3af52..0aa9d0f 100644 --- a/hb_server/apps/inm/views.py +++ b/hb_server/apps/inm/views.py @@ -7,7 +7,9 @@ from rest_framework.viewsets import GenericViewSet, ModelViewSet from apps.inm.filters import IProductFilterSet, MbFilterSet from apps.inm.models import FIFO, FIFOItem, IProduct, MaterialBatch, WareHouse, Inventory -from apps.inm.serializers import FIFOItemSerializer, FIFOInPurSerializer, FIFOListSerializer, IProductListSerializer, InmTestRecordCreateSerializer, MaterialBatchQuerySerializer, MaterialBatchSerializer, WareHouseSerializer, WareHouseCreateUpdateSerializer, InventorySerializer +from apps.inm.serializers import FIFOItemSerializer, FIFOInPurSerializer, FIFOListSerializer, IProductListSerializer, \ + InmTestRecordCreateSerializer, MaterialBatchQuerySerializer, MaterialBatchSerializer, WareHouseSerializer, \ + WareHouseCreateUpdateSerializer, InventorySerializer from apps.inm.signals import update_inm from apps.mtm.models import Material from apps.pm.services import PmService @@ -20,6 +22,7 @@ from django.utils import timezone from apps.wpm.services import WpmServies + # Create your views here. @@ -173,7 +176,7 @@ class FIFOViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet): with transaction.atomic(): obj.is_audited = True obj.auditor = request.user - obj.inout_date = timezone.now() # 也是审核日期 + obj.inout_date = timezone.now() # 也是审核日期 obj.save() update_inm(obj) # 更新库存 return Response()