zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
shijing 2022-06-14 10:16:38 +08:00
parent c33920bfa3 f4906d4d8b
commit bd527d31c6
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hb_server/apps/develop/views.py
View File

@ -25,12 +25,14 @@ class CleanDataView(APIView):
"""
Order.objects.all().delete(soft=False)
ProductionPlan.objects.all().delete(soft=False)
FIFO.objects.all().delete(soft=False)
FIFO.objects.all().delete()
Material.objects.filter(type__in=[Material.MA_TYPE_GOOD, Material.MA_TYPE_HALFGOOD]).update(count=0)
MaterialBatch.objects.filter(material__type__in=[Material.MA_TYPE_GOOD, Material.MA_TYPE_HALFGOOD]).delete()
Inventory.objects.filter(material__type__in=[Material.MA_TYPE_GOOD, Material.MA_TYPE_HALFGOOD]).delete()
Ticket.objects.all().delete(soft=False)
Operation.objects.all().delete()
from apps.pum.models import PuOrder
PuOrder.objects.all().delete(soft=False)
return Response()

4
hb_server/apps/mtm/views.py
View File

@ -35,8 +35,8 @@ class PackItemViewSet(CreateUpdateModelAMixin, ModelViewSet):
"""
装箱项目-增删改查
"""
perms_map = {'get': '*', 'post': 'packitem_create',
'put': 'packitem_update', 'delete': 'packitem_delete'}
perms_map = {'get': '*', 'post': 'material_update',
'put': 'material_update', 'delete': 'material_update'}
queryset = PackItem.objects.all()
serializer_class = PackItemSerializer
search_fields = ['name', 'number']

6
hb_server/apps/wpm/views.py
View File

@ -49,11 +49,7 @@ class WPlanViewSet(ListModelMixin, GenericViewSet):
"""
perms_map = {'get': '*'}
queryset = SubProductionPlan.objects.select_related(
'process', 'workshop', 'subproduction', 'product').filter(
production_plan__state__in =[
ProductionPlan.PLAN_STATE_WORKING, ProductionPlan.PLAN_STATE_ASSGINED
]
)
'process', 'workshop', 'subproduction', 'product').exclude(state=SubProductionPlan.SUBPLAN_STATE_PLANING)
search_fields = []
serializer_class = SubProductionPlanListSerializer
filterset_fields = ['production_plan',