diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py index 153971f..f00b95d 100644 --- a/hb_server/apps/mtm/serializers.py +++ b/hb_server/apps/mtm/serializers.py @@ -209,13 +209,13 @@ class RecordFormDetailSerializer(serializers.ModelSerializer): def get_form_fields(self, obj): serializer = RecordFormFieldSerializer(instance=RecordFormField.objects.filter(form=obj, is_deleted=False), many=True) - vdata = serializer.data + data = serializer.data if obj.type == RecordForm.RF_TYPE_TEST: - for i in vdata: + for i in data: if i['need_judge']: i['is_testok'] = False i['is_teskok_robot'] = False - return serializer.data + return data class RecordFormFieldCreateSerializer(serializers.ModelSerializer): diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index 9d3b427..40b4b93 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -58,7 +58,7 @@ class WPlanViewSet(ListModelMixin, GenericViewSet): elif request.method=='POST': serializer= PickHalfsSerializer(data=request.data) serializer.is_valid(raise_exception=True) - vdata = serializer.data + vdata = serializer.validated_data first_step = Step.objects.get(pk=sp.steps[0]['id']) # 创建领料记录 pick = Pick() @@ -68,12 +68,12 @@ class WPlanViewSet(ListModelMixin, GenericViewSet): pick.save() for i in vdata: if 'wproducts' in i and len(i['wproducts'])>0: - spp = SubProductionProgress.objects.get(pk=i['id']) + spp = i['id'] spp.count_pick = spp.count_pick + len(i['wproducts']) # if spp.count_pick > spp.count: # raise exceptions.APIException('超过计划数') spp.save() - wps = WProduct.objects.filter(pk__in=[x for x in i['wproducts']], act_state=WProduct.WPR_ACT_STATE_OK) + wps = WProduct.objects.filter(pk__in=[x.id for x in i['wproducts']], act_state=WProduct.WPR_ACT_STATE_OK) wps.update(step=first_step, act_state=WProduct.WPR_ACT_STATE_TORETEST, is_hidden=False, warehouse=None, subproduction_plan=sp, update_by=request.user, update_time=timezone.now()) @@ -99,11 +99,11 @@ class WPlanViewSet(ListModelMixin, GenericViewSet): """ serializer= WplanPutInSerializer(data=request.data) serializer.is_valid(raise_exception=True) - vdata = serializer.data + vdata = serializer.validated_data subplan = self.get_object() material = subplan.main_product batch = subplan.number - warehouse = WareHouse.objects.get(id=vdata['warehouse']) + warehouse = vdata['warehouse'] wproducts = WProduct.objects.filter(subproduction_plan=subplan, act_state=WProduct.WPR_ACT_STATE_OK, material=material, is_deleted=False) if wproducts.exists(): @@ -253,9 +253,9 @@ class WProductViewSet(ListModelMixin, GenericViewSet): """ serializer= WproductPutInsSerializer(data=request.data) serializer.is_valid(raise_exception=True) - vdata = serializer.data - wproducts = WProduct.objects.filter(pk__in=[x for x in vdata['wproducts']]) - warehouse = WareHouse.objects.get(id=vdata['warehouse']) + vdata = serializer.validated_data + wproducts = WProduct.objects.filter(pk__in=[x.id for x in vdata['wproducts']]) + warehouse = vdata['warehouse'] for i in wproducts: if i.act_state is not WProduct.WPR_ACT_STATE_OK: raise exceptions.APIException('存在不可入库半成品') @@ -267,12 +267,12 @@ class WProductViewSet(ListModelMixin, GenericViewSet): is_audited=True, auditor=request.user, inout_date=timezone.now(), create_by=request.user, remark=remark) # 创建入库明细 for i in wproducts_a: - spi = SubProductionPlan.objects.get(pk=i['subproduction_plan']) + spi = i['subproduction_plan'] fifoitem = FIFOItem() fifoitem.is_tested = True fifoitem.is_testok = True fifoitem.warehouse = warehouse - fifoitem.material = Material.objects.get(pk=i['material']) + fifoitem.material = i['material'] fifoitem.count = i['total'] fifoitem.batch = spi.number fifoitem.fifo = fifo @@ -303,9 +303,9 @@ class WProductViewSet(ListModelMixin, GenericViewSet): """ serializer= WproductPutInSerializer(data=request.data) serializer.is_valid(raise_exception=True) - vdata = serializer.data + vdata = serializer.validated_data wproduct = self.get_object() - warehouse = WareHouse.objects.get(id=vdata['warehouse']) + warehouse = vdata['warehouse'] if wproduct.act_state != WProduct.WPR_ACT_STATE_OK: raise exceptions.APIException('半成品不可入库') material = wproduct.material @@ -598,11 +598,11 @@ class OperationRecordViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet): def submit(self, request, pk=None): serializer = OperationRecordSubmitSerializer(data=request.data, context={'request':self.request}) serializer.is_valid(raise_exception=True) - vdata = serializer.data + vdata = serializer.validated_data opr = self.get_object() wrds = [] for m in vdata['record_data']: # 保存记录详情 - form_field = RecordFormField.objects.get(pk=m['form_field']) + form_field = m['form_field'] m['form_field'] = form_field m['field_name'] = form_field.field_name m['field_key'] = form_field.field_key