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

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory

This commit is contained in:
TianyangZhang 2025-12-17 09:58:31 +08:00
parent 4b7e648b13 0c5034683c
commit 5711791a1f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/inm/services.py
View File

@ -373,7 +373,10 @@ class InmService:
ddict["material_ofrom"] = i.material ddict["material_ofrom"] = i.material
if field == "count": if field == "count":
count_change = i.count - i.count_notok if i.test_date is not None:
count_change = i.count - i.count_notok
else:
count_change = i.count
elif field == "count_notok": elif field == "count_notok":
count_change = getattr(i, field) count_change = getattr(i, field)
else: else:

3
apps/mtm/views.py
View File

@ -249,9 +249,12 @@ class RoutePackViewSet(CustomModelViewSet):
@transaction.atomic @transaction.atomic
def destroy(self, request, *args, **kwargs): def destroy(self, request, *args, **kwargs):
from apps.wpm.models import Mlog
obj: RoutePack = self.get_object() obj: RoutePack = self.get_object()
if obj.state != RoutePack.RP_S_CREATE: if obj.state != RoutePack.RP_S_CREATE:
raise ParseError('该状态下不可删除') raise ParseError('该状态下不可删除')
if Mlog.objects.filter(route__routepack=obj).exists():
raise ParseError('该工艺路线包有生产记录,不可删除')
obj.delete() obj.delete()
Ticket.objects.filter(ticket_data__t_id=obj.id, ticket_data__t_model='routepack').delete() Ticket.objects.filter(ticket_data__t_id=obj.id, ticket_data__t_model='routepack').delete()
return Response(status=204) return Response(status=204)