From f85db52ec7fe1811f45f1d80a7ea3474f33280f9 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 17 Oct 2024 15:55:26 +0800 Subject: [PATCH 1/2] fix: get_from_mioitem bug --- apps/cm/views.py | 49 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/apps/cm/views.py b/apps/cm/views.py index 13b0c13d..f05b6a4c 100644 --- a/apps/cm/views.py +++ b/apps/cm/views.py @@ -8,77 +8,60 @@ from rest_framework.response import Response from apps.utils.viewsets import CustomGenericViewSet, RetrieveModelMixin, CustomListModelMixin # Create your views here. + class LableMatViewSet(CustomListModelMixin, RetrieveModelMixin, CustomGenericViewSet): perms_map = {"post": "*", "get": "*"} serializer_class = LabelMatSerializer queryset = LableMat.objects.all() select_related_fields = ["material", "material_origin", "supplier"] - @action(methods=['post'], detail=False, serializer_class=TidSerializer) + @action(methods=["post"], detail=False, serializer_class=TidSerializer) def get_from_mb(self, request, pk=None): """ 从仓库明细获取物料标签 从仓库明细获取物料标签 """ - tid = request.data.get('tid') + tid = request.data.get("tid") try: mb = MaterialBatch.objects.get(id=tid) except MaterialBatch.DoesNotExist: - raise NotFound('仓库明细不存在') - obj, _ = LableMat.objects.get_or_create( - state=10, - material=mb.material, - batch=mb.batch, - defaults={ - "supplier": mb.supplier - } - ) + raise NotFound("仓库明细不存在") + obj, _ = LableMat.objects.get_or_create(state=10, material=mb.material, batch=mb.batch, defaults={"supplier": mb.supplier}) rdata = LabelMatSerializer(obj).data rdata["code_label"] = f"mat:{obj.id}" return Response(rdata) - - @action(methods=['post'], detail=False, serializer_class=TidSerializer) + + @action(methods=["post"], detail=False, serializer_class=TidSerializer) def get_from_wm(self, request, pk=None): """ 从车间库存明细获取物料标签 从车间库存明细获取物料标签 """ - tid = request.data.get('tid') + tid = request.data.get("tid") try: wm = WMaterial.objects.get(id=tid) except WMaterial.DoesNotExist: - raise NotFound('车间库存不存在') - obj, _ = LableMat.objects.get_or_create( - state=wm.state, - material=wm.material, - batch=wm.batch, - notok_sign=wm.notok_sign, - material_origin=wm.material_origin) + raise NotFound("车间库存不存在") + obj, _ = LableMat.objects.get_or_create(state=wm.state, material=wm.material, batch=wm.batch, notok_sign=wm.notok_sign, material_origin=wm.material_origin) rdata = LabelMatSerializer(obj).data rdata["code_label"] = f"mat:{obj.id}" return Response(rdata) - - @action(methods=['post'], detail=False, serializer_class=TidSerializer) + + @action(methods=["post"], detail=False, serializer_class=TidSerializer) def get_from_mioitem(self, request, pk=None): """ 从出入库明细获取物料标签 从出入库明细获取物料标签 """ - tid = request.data.get('tid') + tid = request.data.get("tid") try: mioitem: MIOItem = MIOItem.objects.get(id=tid) except MIOItem.DoesNotExist: - raise NotFound('出入库明细不存在') - obj, _ = LableMat.objects.get_or_create( - state=10, - material=mioitem.material, - batch=mioitem.batch, - defaults={ - "supplier": mioitem.mio.supplier - }) + raise NotFound("出入库明细不存在") + obj, _ = LableMat.objects.get_or_create(state=10, material=mioitem.material, batch=mioitem.batch, defaults={"supplier": mioitem.mio.supplier}) rdata = LabelMatSerializer(obj).data rdata["code_label"] = f"mat:{obj.id}" - return rdata \ No newline at end of file + return Response(rdata) From abeb70d16655345b14fb1530ed9c28763d46affc Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 18 Oct 2024 09:43:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20develop=E6=B7=BB=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=B5=8B=E8=AF=95=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/develop/tasks.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/apps/develop/tasks.py b/apps/develop/tasks.py index 11702a49..4600dee6 100755 --- a/apps/develop/tasks.py +++ b/apps/develop/tasks.py @@ -10,14 +10,11 @@ def backup_database(): 备份数据库 """ import datetime - name = datetime.datetime.now().strftime('%Y%m%d%H%M%S') + + name = datetime.datetime.now().strftime("%Y%m%d%H%M%S") command = 'echo "{}" | sudo -S pg_dump "user={} password={} dbname={}" > {}/bak_{}.sql'.format( - SD_PWD, - DATABASES['default']['USER'], - DATABASES['default']['PASSWORD'], - DATABASES['default']['NAME'], - BACKUP_PATH + '/database', - name) + SD_PWD, DATABASES["default"]["USER"], DATABASES["default"]["PASSWORD"], DATABASES["default"]["NAME"], BACKUP_PATH + "/database", name + ) completed = subprocess.run(command, shell=True, capture_output=True, text=True) if completed.returncode != 0: return completed.stderr @@ -25,7 +22,7 @@ def backup_database(): @shared_task def reload_server_git(): - command = 'bash {}/git_server.sh'.format(SH_PATH) + command = "bash {}/git_server.sh".format(SH_PATH) completed = subprocess.run(command, shell=True, capture_output=True, text=True) if completed.returncode != 0: return completed.stderr @@ -33,7 +30,7 @@ def reload_server_git(): @shared_task def reload_web_git(): - command = 'bash {}/git_web.sh'.format(SH_PATH) + command = "bash {}/git_web.sh".format(SH_PATH) completed = subprocess.run(command, shell=True, capture_output=True, text=True) if completed.returncode != 0: return completed.stderr @@ -48,7 +45,16 @@ def reload_server_only(): @shared_task def backup_media(): - command = 'bash {}/backup_media.sh'.format(SH_PATH) + command = "bash {}/backup_media.sh".format(SH_PATH) completed = subprocess.run(command, shell=True, capture_output=True, text=True) if completed.returncode != 0: return completed.stderr + + +@shared_task +def test_task(): + import time + + while True: + print("test") + time.sleep(10)