增加技术文档接口
This commit is contained in:
parent
7ed06d8b40
commit
20a89f3d3f
|
|
@ -10,4 +10,5 @@ celerybeat.pid
|
|||
celerybeat-schedule.bak
|
||||
celerybeat-schedule.dat
|
||||
celerybeat-schedule.dir
|
||||
db.sqlite3
|
||||
db.sqlite3
|
||||
temp/
|
||||
|
|
@ -5,6 +5,7 @@ from django.db.models.query import QuerySet
|
|||
from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File
|
||||
from utils.model import SoftModel, BaseModel
|
||||
from simple_history.models import HistoricalRecords
|
||||
from apps.mtm.models import Material
|
||||
|
||||
|
||||
|
||||
|
|
@ -20,4 +21,29 @@ class WareHouse(CommonAModel):
|
|||
verbose_name_plural = verbose_name
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
return self.name
|
||||
|
||||
class Inventory(CommonAModel):
|
||||
"""
|
||||
库存表
|
||||
"""
|
||||
material = models.ForeignKey(Material, on_delete=models.CASCADE, verbose_name='物料信息')
|
||||
count = models.IntegerField('数量', default=0)
|
||||
warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
|
||||
class Meta:
|
||||
verbose_name = '库存表'
|
||||
verbose_name_plural = verbose_name
|
||||
|
||||
|
||||
|
||||
class FIFO(CommonAModel):
|
||||
"""
|
||||
出入库记录
|
||||
"""
|
||||
type_choices = (
|
||||
(1, '生产领料'),
|
||||
(2, '销售提货'),
|
||||
(3, '采购入库'),
|
||||
(4, '生产入库')
|
||||
)
|
||||
type = models.IntegerField('出入库类型', default=1)
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
# Generated by Django 3.2.6 on 2021-09-06 08:58
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
import django.utils.timezone
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('system', '0003_auto_20210812_0909'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('mtm', '0008_auto_20210901_1620'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='TechDoc',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, 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.CharField(max_length=50, verbose_name='名称')),
|
||||
('content', models.TextField(blank=True, null=True, verbose_name='内容')),
|
||||
('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='techdoc_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
|
||||
('file', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='system.file', verbose_name='技术文件')),
|
||||
('process', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.process', verbose_name='关联工序')),
|
||||
('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.material', verbose_name='关联产品')),
|
||||
('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='techdoc_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': '技术文件',
|
||||
'verbose_name_plural': '技术文件',
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
@ -174,3 +174,18 @@ class UsedStep(CommonAModel):
|
|||
class Meta:
|
||||
verbose_name = '产品生产子工序'
|
||||
verbose_name_plural = verbose_name
|
||||
|
||||
|
||||
class TechDoc(CommonAModel):
|
||||
"""
|
||||
技术文件
|
||||
"""
|
||||
name = models.CharField('名称', max_length=50)
|
||||
file = models.ForeignKey(File, verbose_name='技术文件', on_delete=models.CASCADE)
|
||||
product = models.ForeignKey(Material, verbose_name='关联产品', on_delete=models.CASCADE)
|
||||
process = models.ForeignKey(Process, verbose_name='关联工序', on_delete=models.CASCADE)
|
||||
content = models.TextField('内容', null=True, blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = '技术文件'
|
||||
verbose_name_plural = verbose_name
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
from apps.em.serializers import EquipmentSerializer, EquipmentSimpleSerializer
|
||||
from rest_framework import serializers
|
||||
from rest_framework.exceptions import ValidationError
|
||||
from .models import InputMaterial, Material, OutputMaterial, Process, ProductProcess, RecordForm, RecordFormField, Step, UsedStep
|
||||
from .models import InputMaterial, Material, OutputMaterial, Process, ProductProcess, RecordForm, RecordFormField, Step, TechDoc, UsedStep
|
||||
from apps.system.serializers import FileSimpleSerializer, OrganizationSimpleSerializer
|
||||
|
||||
|
||||
|
|
@ -187,3 +187,19 @@ class RecordFormFieldSimpleSerializer(serializers.ModelSerializer):
|
|||
class Meta:
|
||||
model = RecordFormField
|
||||
fields = '__all__'
|
||||
|
||||
class TechDocListSerializer(serializers.ModelSerializer):
|
||||
file_ = FileSimpleSerializer(source='file', read_only=True)
|
||||
class Meta:
|
||||
model = TechDoc
|
||||
exclude = ['content']
|
||||
|
||||
class TechDocCreateSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = TechDoc
|
||||
fields = ['file', 'product', 'process', 'name', 'content']
|
||||
|
||||
class TechDocUpdateSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = TechDoc
|
||||
fields = ['file', 'name', 'content']
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
from django.db.models import base
|
||||
from rest_framework import urlpatterns
|
||||
from apps.mtm.views import InputMaterialViewSet, MaterialViewSet, OutputMaterialViewSet, ProcessViewSet, RecordFormFieldViewSet, RecordFormViewSet, StepViewSet, UsedStepViewSet
|
||||
from apps.mtm.views import InputMaterialViewSet, MaterialViewSet, OutputMaterialViewSet, ProcessViewSet, RecordFormFieldViewSet, RecordFormViewSet, StepViewSet, TechDocViewSet, UsedStepViewSet
|
||||
from django.urls import path, include
|
||||
from rest_framework.routers import DefaultRouter
|
||||
|
||||
|
|
@ -14,6 +14,7 @@ router.register('outputmaterial', OutputMaterialViewSet, basename='outputmateria
|
|||
router.register('usedstep', UsedStepViewSet, basename='usedstep')
|
||||
router.register('recordform', RecordFormViewSet, basename='recordform')
|
||||
router.register('recordform-field', RecordFormFieldViewSet, basename='recordform-field')
|
||||
router.register('techdoc', TechDocViewSet, basename='techdoc')
|
||||
urlpatterns = [
|
||||
path('', include(router.urls)),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ from django.shortcuts import render
|
|||
from rest_framework.viewsets import ModelViewSet, GenericViewSet
|
||||
from rest_framework.mixins import CreateModelMixin, ListModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin
|
||||
|
||||
from apps.mtm.models import InputMaterial, Material, OutputMaterial, Process, ProductProcess, RecordForm, RecordFormField, Step, UsedStep
|
||||
from apps.mtm.serializers import InputMaterialListSerializer, InputMaterialSerializer, InputMaterialUpdateSerializer, MaterialDetailSerializer, MaterialSerializer, MaterialSimpleSerializer, OutputMaterialListSerializer, OutputMaterialSerializer, OutputMaterialUpdateSerializer, ProductProcessListSerializer, ProductProcessUpdateSerializer, ProcessSerializer, RecordFormCreateSerializer, RecordFormFieldCreateSerializer, RecordFormFieldSerializer, RecordFormFieldUpdateSerializer, RecordFormSerializer, RecordFormUpdateSerializer, StepDetailSerializer, StepSerializer, UsedStepCreateSerializer, UsedStepListSerializer
|
||||
from apps.mtm.models import InputMaterial, Material, OutputMaterial, Process, ProductProcess, RecordForm, RecordFormField, Step, TechDoc, UsedStep
|
||||
from apps.mtm.serializers import InputMaterialListSerializer, InputMaterialSerializer, InputMaterialUpdateSerializer, MaterialDetailSerializer, MaterialSerializer, MaterialSimpleSerializer, OutputMaterialListSerializer, OutputMaterialSerializer, OutputMaterialUpdateSerializer, ProductProcessListSerializer, ProductProcessUpdateSerializer, ProcessSerializer, RecordFormCreateSerializer, RecordFormFieldCreateSerializer, RecordFormFieldSerializer, RecordFormFieldUpdateSerializer, RecordFormSerializer, RecordFormUpdateSerializer, StepDetailSerializer, StepSerializer, TechDocCreateSerializer, TechDocListSerializer, TechDocUpdateSerializer, UsedStepCreateSerializer, UsedStepListSerializer
|
||||
from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
|
||||
from rest_framework.decorators import action
|
||||
from rest_framework.response import Response
|
||||
|
|
@ -181,4 +181,21 @@ class RecordFormFieldViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelVi
|
|||
return RecordFormFieldCreateSerializer
|
||||
elif self.action == 'update':
|
||||
return RecordFormFieldUpdateSerializer
|
||||
return RecordFormFieldSerializer
|
||||
return RecordFormFieldSerializer
|
||||
|
||||
class TechDocViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet):
|
||||
"""
|
||||
技术文件增删改查
|
||||
"""
|
||||
perms_map = {'*':'*'}
|
||||
queryset = TechDoc.objects.all()
|
||||
filterset_fields = ['process', 'product']
|
||||
search_fields = ['name']
|
||||
ordering = ['-id']
|
||||
|
||||
def get_serializer_class(self):
|
||||
if self.action =='create':
|
||||
return TechDocCreateSerializer
|
||||
elif self.action == 'update':
|
||||
return TechDocUpdateSerializer
|
||||
return TechDocListSerializer
|
||||
|
|
@ -197,3 +197,7 @@ class UserCreateSerializer(serializers.ModelSerializer):
|
|||
if User.objects.filter(phone=phone):
|
||||
raise serializers.ValidationError('手机号已经被注册')
|
||||
return phone
|
||||
|
||||
|
||||
class FaceLoginSerializer(serializers.Serializer):
|
||||
base64 = serializers.CharField()
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
from django.urls import path, include
|
||||
from .views import TaskList, UserViewSet, OrganizationViewSet, PermissionViewSet, RoleViewSet, PositionViewSet, TestView, DictTypeViewSet, DictViewSet, PTaskViewSet
|
||||
from .views import FaceLogin, TaskList, UserViewSet, OrganizationViewSet, PermissionViewSet, RoleViewSet, PositionViewSet, TestView, DictTypeViewSet, DictViewSet, PTaskViewSet
|
||||
from rest_framework import routers
|
||||
|
||||
|
||||
|
|
@ -15,5 +15,6 @@ router.register('ptask', PTaskViewSet, basename="ptask")
|
|||
urlpatterns = [
|
||||
path('', include(router.urls)),
|
||||
path('task/', TaskList.as_view()),
|
||||
path('test/', TestView.as_view())
|
||||
path('test/', TestView.as_view()),
|
||||
path('facelogin/', FaceLogin.as_view())
|
||||
]
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ from django_filters.rest_framework import DjangoFilterBackend
|
|||
from rest_framework import serializers, status
|
||||
from rest_framework.decorators import action
|
||||
from rest_framework.filters import OrderingFilter, SearchFilter
|
||||
from rest_framework.generics import CreateAPIView
|
||||
from rest_framework.mixins import (CreateModelMixin, DestroyModelMixin,
|
||||
ListModelMixin, RetrieveModelMixin,
|
||||
UpdateModelMixin)
|
||||
|
|
@ -28,7 +29,7 @@ from .models import (Dict, DictType, File, Organization, Permission, Position,
|
|||
Role, User)
|
||||
from .permission import RbacPermission, get_permission_list
|
||||
from .permission_data import RbacFilterSet
|
||||
from .serializers import (DictSerializer, DictTypeSerializer, FileSerializer,
|
||||
from .serializers import (DictSerializer, DictTypeSerializer, FaceLoginSerializer, FileSerializer,
|
||||
OrganizationSerializer, PermissionSerializer,
|
||||
PositionSerializer, RoleSerializer, PTaskSerializer,PTaskCreateUpdateSerializer,
|
||||
UserCreateSerializer, UserListSerializer,
|
||||
|
|
@ -349,3 +350,45 @@ class FileViewSet(CreateModelMixin, DestroyModelMixin, RetrieveModelMixin, ListM
|
|||
instance = serializer.save(create_by = self.request.user, name=name, size=size, type=type, mime=mime)
|
||||
instance.path = settings.MEDIA_URL + instance.file.name
|
||||
instance.save()
|
||||
|
||||
|
||||
|
||||
import face_recognition
|
||||
import uuid
|
||||
import base64
|
||||
import os
|
||||
|
||||
def tran64(s):
|
||||
missing_padding = len(s) % 4
|
||||
if missing_padding != 0:
|
||||
s = s+'='* (4 - missing_padding)
|
||||
return s
|
||||
|
||||
class FaceLogin(CreateAPIView):
|
||||
authentication_classes = []
|
||||
permission_classes = []
|
||||
serializer_class = FaceLoginSerializer
|
||||
|
||||
|
||||
def create(self, request, *args, **kwargs):
|
||||
"""
|
||||
人脸识别登录
|
||||
"""
|
||||
# serializer = FaceLoginSerializer(data=request.data)
|
||||
# serializer.is_valid(raise_exception=True)
|
||||
filename = str(uuid.uuid4())
|
||||
filepath = settings.BASE_DIR +'/temp/' + filename +'.png'
|
||||
with open(filepath, 'wb') as f:
|
||||
data = tran64(request.data.get('base64').replace(' ', '+'))
|
||||
# data = request.data.get('base64')
|
||||
f.write(base64.urlsafe_b64decode(data))
|
||||
picture_of_me = face_recognition.load_image_file(settings.BASE_DIR +'/temp/me.png')
|
||||
my_face_encoding = face_recognition.face_encodings(picture_of_me)[0]
|
||||
unknown_picture = face_recognition.load_image_file(filepath)
|
||||
unknown_face_encoding = face_recognition.face_encodings(unknown_picture)[0]
|
||||
results = face_recognition.compare_faces([my_face_encoding], unknown_face_encoding)
|
||||
# os.remove(filepath)
|
||||
if results[0] == True:
|
||||
return Response('这是曹前明')
|
||||
else:
|
||||
return Response('这不是曹前明')
|
||||
|
|
@ -10,3 +10,4 @@ drf-yasg==1.20.0
|
|||
psutil==5.8.0
|
||||
pillow==8.3.1
|
||||
opencv-python==4.5.3.56
|
||||
face-gecognition==1.3.0
|
||||
|
|
|
|||
Loading…
Reference in New Issue