diff --git a/apps/cm/migrations/0007_labeltemplate_coder.py b/apps/cm/migrations/0007_labeltemplate_coder.py deleted file mode 100644 index b250948d..00000000 --- a/apps/cm/migrations/0007_labeltemplate_coder.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated for coder fields on LabelTemplate - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cm', '0006_alter_lablemat_batch'), - ] - - operations = [ - migrations.AddField( - model_name='labeltemplate', - name='coder_ip', - field=models.GenericIPAddressField(blank=True, null=True, verbose_name='打码器IP'), - ), - migrations.AddField( - model_name='labeltemplate', - name='coder_port', - field=models.PositiveIntegerField(default=3100, verbose_name='打码器端口'), - ), - ] diff --git a/apps/cm/migrations/0008_labeltemplate_coder_field.py b/apps/cm/migrations/0008_labeltemplate_coder_field.py deleted file mode 100644 index df87507c..00000000 --- a/apps/cm/migrations/0008_labeltemplate_coder_field.py +++ /dev/null @@ -1,16 +0,0 @@ -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('cm', '0007_labeltemplate_coder'), - ] - - operations = [ - migrations.AddField( - model_name='labeltemplate', - name='coder_field', - field=models.CharField(default='1', max_length=32, verbose_name='打码器用户区名'), - ), - ] diff --git a/apps/cm/serializers.py b/apps/cm/serializers.py index fe431539..d80db2d4 100644 --- a/apps/cm/serializers.py +++ b/apps/cm/serializers.py @@ -19,9 +19,9 @@ class Tid2Serializer(serializers.Serializer): class CoderSendSerializer(serializers.Serializer): tdata = serializers.JSONField(label='模板数据', required=False, default=dict) - coder_ip = serializers.IPAddressField(label='打码器IP(可覆盖模板)', required=False, allow_null=True) - coder_port = serializers.IntegerField(label='打码器端口(可覆盖模板)', required=False, allow_null=True) - coder_field = serializers.CharField(label='用户区名(可覆盖模板)', required=False, allow_null=True) + coder_ip = serializers.IPAddressField(label='打码器IP') + coder_port = serializers.IntegerField(label='打码器端口', required=False, allow_null=True) + coder_field = serializers.CharField(label='用户区名', required=False, allow_null=True) class LabelMatSerializer(serializers.ModelSerializer): @@ -43,11 +43,7 @@ class LabelMatSerializer(serializers.ModelSerializer): class LabelTemplateSerializer(CustomModelSerializer): - coder_ip = serializers.IPAddressField(required=False, allow_null=True, allow_blank=True) class Meta: model = LabelTemplate - fields = '__all__' - - def validate_coder_ip(self, value): - return value or None \ No newline at end of file + fields = '__all__' \ No newline at end of file diff --git a/apps/cm/views.py b/apps/cm/views.py index b8e562d8..d4dc0816 100644 --- a/apps/cm/views.py +++ b/apps/cm/views.py @@ -128,9 +128,9 @@ class LabelTemplateViewSet(CustomModelViewSet): vdata = sr.validated_data lt: LabelTemplate = self.get_object() - ip = vdata.get("coder_ip") or lt.coder_ip - port = vdata.get("coder_port") or lt.coder_port - field = vdata.get("coder_field") or lt.coder_field or "1" + ip = vdata.get("coder_ip") + port = vdata.get("coder_port") or 3000 + field = vdata.get("coder_field") or "1" if not ip: raise ParseError("模板未配置打码器IP, 也未在请求中提供 coder_ip")