diff --git a/apps/cm/migrations/0004_labeltemplate.py b/apps/cm/migrations/0004_labeltemplate.py new file mode 100644 index 00000000..862fb412 --- /dev/null +++ b/apps/cm/migrations/0004_labeltemplate.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.12 on 2025-04-30 05:17 + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('cm', '0003_alter_lablemat_state'), + ] + + operations = [ + migrations.CreateModel( + name='LabelTemplate', + fields=[ + ('id', models.CharField(editable=False, help_text='主键ID', max_length=20, primary_key=True, serialize=False, verbose_name='主键ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.TextField(verbose_name='名称')), + ('commands', models.JSONField(blank=True, default=list, verbose_name='指令模板')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/apps/cm/models.py b/apps/cm/models.py index e080d261..3329dcfe 100644 --- a/apps/cm/models.py +++ b/apps/cm/models.py @@ -13,4 +13,9 @@ class LableMat(BaseModel): supplier = models.ForeignKey(Supplier, verbose_name='外协供应商', on_delete=models.SET_NULL, null=True, blank=True) notok_sign = models.CharField('不合格标记', max_length=10, null=True, blank=True) defect = models.ForeignKey("qm.defect", verbose_name='缺陷', on_delete=models.SET_NULL, null=True, blank=True) - material_origin = models.ForeignKey(Material, verbose_name='原始物料', on_delete=models.SET_NULL, null=True, blank=True, related_name='lm_mo') \ No newline at end of file + material_origin = models.ForeignKey(Material, verbose_name='原始物料', on_delete=models.SET_NULL, null=True, blank=True, related_name='lm_mo') + + +class LabelTemplate(BaseModel): + name = models.TextField("名称") + commands = models.JSONField("指令模板", default=list, blank=True) \ No newline at end of file diff --git a/apps/cm/serializers.py b/apps/cm/serializers.py index ba6976a4..075c7f0f 100644 --- a/apps/cm/serializers.py +++ b/apps/cm/serializers.py @@ -1,7 +1,8 @@ from rest_framework import serializers -from .models import LableMat +from .models import LableMat, LabelTemplate from apps.qm.models import NotOkOption from apps.wpm.models import WmStateOption +from apps.utils.serializers import CustomModelSerializer class TidSerializer(serializers.Serializer): @@ -23,4 +24,10 @@ class LabelMatSerializer(serializers.ModelSerializer): return getattr(NotOkOption, obj.notok_sign, NotOkOption.qt).label if obj.notok_sign else None def get_state_name(self, obj): - return getattr(WmStateOption, str(obj.state), WmStateOption.OK).label if obj.state else None \ No newline at end of file + return getattr(WmStateOption, str(obj.state), WmStateOption.OK).label if obj.state else None + + +class LabelTemplateSerializer(CustomModelSerializer): + class Meta: + model = LabelTemplate + fields = '__all__' \ No newline at end of file diff --git a/apps/cm/urls.py b/apps/cm/urls.py index cf30518d..087b32d4 100644 --- a/apps/cm/urls.py +++ b/apps/cm/urls.py @@ -1,12 +1,13 @@ from django.urls import path, include from rest_framework.routers import DefaultRouter -from apps.cm.views import LableMatViewSet +from apps.cm.views import LableMatViewSet, LabelTemplateViewSet API_BASE_URL = 'api/cm/' HTML_BASE_URL = 'dhtml/cm/' router = DefaultRouter() router.register('labelmat', LableMatViewSet, basename='labelmat') +router.register('labeltemplate', LabelTemplateViewSet, basename='labeltemplate') urlpatterns = [ path(API_BASE_URL, include(router.urls)), ] \ No newline at end of file diff --git a/apps/cm/views.py b/apps/cm/views.py index ccc4f90f..2ab8c35d 100644 --- a/apps/cm/views.py +++ b/apps/cm/views.py @@ -1,11 +1,11 @@ -from apps.cm.models import LableMat +from apps.cm.models import LableMat, LabelTemplate from rest_framework.decorators import action -from apps.cm.serializers import TidSerializer, LabelMatSerializer +from apps.cm.serializers import TidSerializer, LabelMatSerializer, LabelTemplateSerializer from apps.inm.models import MaterialBatch, MIOItem from apps.wpm.models import WMaterial from rest_framework.exceptions import ParseError, NotFound from rest_framework.response import Response -from apps.utils.viewsets import CustomGenericViewSet, RetrieveModelMixin, CustomListModelMixin +from apps.utils.viewsets import CustomGenericViewSet, RetrieveModelMixin, CustomListModelMixin, CustomModelViewSet # Create your views here. SPLIT_FIELD = "#" @@ -68,3 +68,13 @@ class LableMatViewSet(CustomListModelMixin, RetrieveModelMixin, CustomGenericVie rdata = LabelMatSerializer(obj).data rdata["code_label"] = f"mat{SPLIT_FIELD}{obj.id}" return Response(rdata) + + +class LabelTemplateViewSet(CustomModelViewSet): + """ + list: 标签模板 + + 标签模板 + """ + queryset = LabelTemplate.objects.all() + serializer_class = LabelTemplateSerializer \ No newline at end of file