From 2d834246fab55895bfe58ff4352c7c85cb045256 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 1 Mar 2022 10:27:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9Bbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/pm/views.py | 2 +- hb_server/apps/wpm/serializers.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hb_server/apps/pm/views.py b/hb_server/apps/pm/views.py index cb02d67..4257e9f 100644 --- a/hb_server/apps/pm/views.py +++ b/hb_server/apps/pm/views.py @@ -98,7 +98,7 @@ class ProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, CreateModel for index, i in enumerate(subps): steps = Step.objects.filter(usedstep__subproduction=i, usedstep__subproduction__is_deleted=False, usedstep__is_deleted=False, is_deleted=False - ).values('id', 'number', 'name', 'usedstep__remark', need_test=F('usedstep__need_test')) + ).order_by('number').values('id', 'number', 'name', 'usedstep__remark', need_test=F('usedstep__need_test')) instance = SubProductionPlan.objects.create(production_plan=production_plan, subproduction=i, start_date=production_plan.start_date, end_date=production_plan.end_date, workshop=i.process.workshop, process=i.process, create_by=request.user, diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py index b5c702f..61ae4b5 100644 --- a/hb_server/apps/wpm/serializers.py +++ b/hb_server/apps/wpm/serializers.py @@ -64,6 +64,8 @@ class PickSerializer(serializers.Serializer): fifo = FIFO.objects.create(type=FIFO.FIFO_TYPE_DO_OUT, inout_date=timezone.now(), create_by=self.context['request'].user, number = 'CK' + ranstr(7)) + if len(picks)<=0: + raise exceptions.APIException('没有领料项目') for i in picks: isLowLevel = False # 更新出库详情 @@ -116,8 +118,9 @@ class PickSerializer(serializers.Serializer): subproduction_plan=sp) sp.is_picked=True sp.state = SubProductionPlan.SUBPLAN_STATE_WORKING #生产中 - sp.state_date_real = timezone.now() #实际开工日期 - sp.save() + if sp.start_date_real is None: + sp.start_date_real = timezone.now()#实际开工日期 + sp.save() # 创建领料记录 pick = Pick() pick.subproduction_plan = sp