From b8495ee431fcbf068866fb3d1e9cd26728f8f5a2 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 18 Nov 2021 16:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E5=8D=8A=E6=88=90=E5=93=81=E9=A2=86?= =?UTF-8?q?=E6=96=99bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wpm/models.py | 2 +- hb_server/apps/wpm/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py index 80e1b0c..6e2f647 100644 --- a/hb_server/apps/wpm/models.py +++ b/hb_server/apps/wpm/models.py @@ -45,7 +45,7 @@ class WProduct(CommonAModel): production_plan = models.ForeignKey(ProductionPlan, verbose_name='关联主生产计划', on_delete=models.CASCADE) warehouse = models.ForeignKey(WareHouse, verbose_name='所在仓库', on_delete=models.SET_NULL, null=True, blank=True) # operation = models.ForeignKey('wpm.operation', verbose_name='关联操作', - # on_delete=models.SET_NULL, null=True, blank=True, related_name='') + # on_delete=models.SET_NULL, null=True, blank=True, related_name='current_operation') class Operation(CommonADModel): """ diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index 91d205d..6244191 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -56,7 +56,7 @@ class WPlanViewSet(ListModelMixin, GenericViewSet): serializer= PickHalfSerializer(data=request.data, many=True) serializer.is_valid(raise_exception=True) vdata = serializer.data - first_step = Step.objects.get(pk=sp.steps[0].id) + first_step = Step.objects.get(pk=sp.steps[0]['id']) for i in vdata: if 'wproducts' in i and len(i['wproducts'])>0: spp = SubProductionProgress.objects.get(pk=i['id'])