Compare commits
No commits in common. "96f5133152c1197c225b55de0ff98818f57ad7c5" and "d4805954152dab21819fe21b4cf50d2c519b99f3" have entirely different histories.
96f5133152
...
d480595415
|
|
@ -0,0 +1,23 @@
|
||||||
|
# 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='打码器端口'),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
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='打码器用户区名'),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -19,9 +19,9 @@ class Tid2Serializer(serializers.Serializer):
|
||||||
|
|
||||||
class CoderSendSerializer(serializers.Serializer):
|
class CoderSendSerializer(serializers.Serializer):
|
||||||
tdata = serializers.JSONField(label='模板数据', required=False, default=dict)
|
tdata = serializers.JSONField(label='模板数据', required=False, default=dict)
|
||||||
coder_ip = serializers.IPAddressField(label='打码器IP')
|
coder_ip = serializers.IPAddressField(label='打码器IP(可覆盖模板)', required=False, allow_null=True)
|
||||||
coder_port = serializers.IntegerField(label='打码器端口', 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_field = serializers.CharField(label='用户区名(可覆盖模板)', required=False, allow_null=True)
|
||||||
|
|
||||||
|
|
||||||
class LabelMatSerializer(serializers.ModelSerializer):
|
class LabelMatSerializer(serializers.ModelSerializer):
|
||||||
|
|
@ -43,7 +43,11 @@ class LabelMatSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
|
|
||||||
class LabelTemplateSerializer(CustomModelSerializer):
|
class LabelTemplateSerializer(CustomModelSerializer):
|
||||||
|
coder_ip = serializers.IPAddressField(required=False, allow_null=True, allow_blank=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = LabelTemplate
|
model = LabelTemplate
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
|
|
||||||
|
def validate_coder_ip(self, value):
|
||||||
|
return value or None
|
||||||
|
|
@ -128,9 +128,9 @@ class LabelTemplateViewSet(CustomModelViewSet):
|
||||||
vdata = sr.validated_data
|
vdata = sr.validated_data
|
||||||
lt: LabelTemplate = self.get_object()
|
lt: LabelTemplate = self.get_object()
|
||||||
|
|
||||||
ip = vdata.get("coder_ip")
|
ip = vdata.get("coder_ip") or lt.coder_ip
|
||||||
port = vdata.get("coder_port") or 3000
|
port = vdata.get("coder_port") or lt.coder_port
|
||||||
field = vdata.get("coder_field") or "1"
|
field = vdata.get("coder_field") or lt.coder_field or "1"
|
||||||
if not ip:
|
if not ip:
|
||||||
raise ParseError("模板未配置打码器IP, 也未在请求中提供 coder_ip")
|
raise ParseError("模板未配置打码器IP, 也未在请求中提供 coder_ip")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue