zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server

This commit is contained in:
zty 2024-12-11 12:18:11 +08:00
parent 44af9bc494 d349970a47
commit 4791716ec9
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/edu/views.py
View File

@ -124,7 +124,6 @@ class ExamViewSet(CustomModelViewSet):
AnswerDetail.objects.bulk_create(details) AnswerDetail.objects.bulk_create(details)
sr = ExamRecordInitSerizlier(er) sr = ExamRecordInitSerizlier(er)
res_data = sr.data res_data = sr.data
print(res_data)
res_data.update({"chance_used": chance_used}) res_data.update({"chance_used": chance_used})
return Response(sr.data, status=201) return Response(sr.data, status=201)
raise ParseError('暂不支持') raise ParseError('暂不支持')

4
apps/inm/services.py
View File

@ -337,8 +337,4 @@ def daoru_mb(path: str):
material=material, batch=batch, warehouse=warehouse, defaults={"material": material, "batch": batch, "warehouse": warehouse, "count": count, "id": idWorker.get_id()} material=material, batch=batch, warehouse=warehouse, defaults={"material": material, "batch": batch, "warehouse": warehouse, "count": count, "id": idWorker.get_id()}
) )
cal_material_count([material.id]) cal_material_count([material.id])
# if not is_created:
# mb.count += count
# mb.save()
print(f"第{i}行数据导入成功")
i = i + 1 i = i + 1

4
server/settings.py
View File

@ -221,6 +221,10 @@ REST_FRAMEWORK = {
'user': '200/second' 'user': '200/second'
} }
} }
# session配置
SESSION_ENGINE = 'django.contrib.sessions.backends.cache'
CSRF_COOKIE_NAME = 'csrftoken'
# simplejwt配置 # simplejwt配置
SIMPLE_JWT = { SIMPLE_JWT = {
'ACCESS_TOKEN_LIFETIME': timedelta(days=7), 'ACCESS_TOKEN_LIFETIME': timedelta(days=7),