diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py index 8cdde3a..d4b20d2 100644 --- a/hb_server/apps/mtm/models.py +++ b/hb_server/apps/mtm/models.py @@ -140,6 +140,10 @@ class RecordFormField(CommonAModel): FIELD_RADIO = 'radio' FIELD_CHECKBOX = 'checkbox' FIELD_SELECT = 'select' + FIELD_SELECTS = 'selects' + FIELD_TEXTAREA = 'textarea' + FIELD_DRAW = 'draw' + FIELD_FROMSYSTEM = 'fromsystem' field_type_choices = ( ('string', '字符串'), ('int', '整型'), diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index b4160b4..bcc507a 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -276,7 +276,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet): fifoitem.is_tested = True fifoitem.is_testok = True fifoitem.warehouse = warehouse - fifoitem.material = i['material'] + fifoitem.material = Material.objects.get(pk=i['material']) fifoitem.count = i['total'] fifoitem.batch = spi.number fifoitem.fifo = fifo