diff --git a/hb_server/apps/pm/views.py b/hb_server/apps/pm/views.py index e8cdeac..db48d64 100644 --- a/hb_server/apps/pm/views.py +++ b/hb_server/apps/pm/views.py @@ -23,6 +23,7 @@ from rest_framework.exceptions import APIException, ParseError, ValidationError from rest_framework.response import Response from rest_framework.decorators import action from django.db.models import F +from apps.system.serializers import UserSimpleSerializer from utils.tools import ranstr from django.db import transaction from rest_framework import status @@ -294,7 +295,7 @@ class SubProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, UpdateMo obj.leader_3 = request.user obj.first_sign_time = timezone.now() obj.save() - return Response() + return Response(UserSimpleSerializer(instance=request.user).data) diff --git a/hb_server/apps/sam/models.py b/hb_server/apps/sam/models.py index a922770..e839950 100644 --- a/hb_server/apps/sam/models.py +++ b/hb_server/apps/sam/models.py @@ -7,7 +7,7 @@ from django.db.models.query import QuerySet from utils.model import SoftModel, BaseModel -from apps.mtm.models import Material +from apps.mtm.models import Material, PackItem @@ -103,11 +103,21 @@ class SaleProduct(BaseModel): number = models.CharField('物品编号', max_length=50) iproduct = models.ForeignKey('inm.iproduct', verbose_name='关联库存产品', on_delete=models.CASCADE, related_name='sale_iproduct') remark = models.TextField('备注', null=True, blank=True) - + packnum = models. class Meta: unique_together = ( ('sale','iproduct'), # 联合唯一 ) +class SalePack(BaseModel): + """ + 销售打包 + """ + sale_product = models.ForeignKey(SaleProduct, verbose_name='关联销售产品', + on_delete=models.CASCADE) + packitem = models.ForeignKey(PackItem, verbose_name='打包项目', + on_delete=models.CASCADE) + +