盘点log

container/filter.py

@@ -1,5 +1,32 @@
 from django_filters import FilterSet, NumberFilter, CharFilter
-from .models import ContainerListModel,ContainerDetailModel,ContainerOperationModel,TaskModel,ContainerWCSModel
+from .models import ContainerListModel,ContainerDetailModel,ContainerOperationModel,TaskModel,ContainerWCSModel,ContainerDetailLogModel
+
+from django_filters import rest_framework as filters
+
+class ContainerDetailLogFilter(filters.FilterSet):
+    goods_code = filters.CharFilter(field_name='container_detail__goods_code', lookup_expr='exact')
+    goods_code__icontains = filters.CharFilter(field_name='container_detail__goods_code', lookup_expr='icontains')
+    
+    container_code = filters.CharFilter(field_name='container_detail__container__container_code', lookup_expr='exact')
+    
+    batch = filters.CharFilter(field_name='container_detail__batch__bound_number', lookup_expr='exact')
+    batch__icontains = filters.CharFilter(field_name='container_detail__batch__bound_number', lookup_expr='icontains')
+    class Meta:
+        model = ContainerDetailLogModel
+        fields = {
+            "id": ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
+            "container_detail": ['exact'],
+            "log_type": ['exact', 'icontains'],
+            "old_goods_qty": ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
+            "old_goods_out_qty": ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
+            "old_status": ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
+            "new_goods_qty": ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
+            "new_goods_out_qty": ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
+            "new_status": ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
+            "creater": ['exact', 'icontains'],
+            "create_time": ['exact', 'gt', 'gte', 'lt', 'lte', 'range'],
+         
+        }
 
 class ContainerListFilter(FilterSet):
 

container/models.py

@@ -154,6 +154,9 @@ class ContainerDetailModel(models.Model):
         self.batch.goods_in_location_qty = (stats['total_qty'] or 0) - (stats['total_out_qty'] or 0)
         self.batch.goods_out_qty = stats['total_out_qty'] or 0
         self.batch.save()
+
+    def get_container_code(self):
+        return self.container.container_code
         
 
 
@@ -167,6 +170,7 @@ class ContainerDetailLogModel(models.Model):
         ('update', '更新'),
         ('delete', '删除'),
         ('out', '出库'),
+        ('cancel_out', '取消出库'),
         ('status_change', '状态变更'),
     )
     
@@ -242,9 +246,13 @@ def container_detail_pre_save(sender, instance, **kwargs):
             
         # 检查出库数量变化
         if old_instance.goods_out_qty != instance.goods_out_qty:
+
             log.old_goods_out_qty = old_instance.goods_out_qty
             log.new_goods_out_qty = instance.goods_out_qty
-            log.log_type = 'out'
+            if log.old_goods_out_qty < log.new_goods_out_qty:
+                log.log_type = 'out'
+            else:
+                log.log_type = 'cancel_out'
             log.save()
 
             

container/serializers.py

@@ -1,10 +1,10 @@
 from rest_framework import serializers
 
-from .models import ContainerListModel,ContainerDetailModel,ContainerOperationModel,TaskModel,ContainerWCSModel,out_batch_detail
+from .models import ContainerListModel,ContainerDetailModel,ContainerOperationModel,TaskModel,ContainerWCSModel,out_batch_detail,ContainerDetailLogModel
 from bound.models import BoundBatchModel,BoundDetailModel
 
 from utils import datasolve
-
+from decimal import Decimal
 class WCSTaskGetSerializer(serializers.ModelSerializer):
     class Meta:
         # 指定模型和排除字段
@@ -12,7 +12,73 @@ class WCSTaskGetSerializer(serializers.ModelSerializer):
         fields= '__all__'
         read_only_fields = ['id']
 
+class ContainerDetailLogSerializer(serializers.ModelSerializer):
+    batch = serializers.SerializerMethodField()
+    container_code = serializers.SerializerMethodField()
+    goods_code = serializers.SerializerMethodField()
+    goods_desc = serializers.SerializerMethodField()
+    detail_goods_qty = serializers.SerializerMethodField()
+    goods_qty = serializers.SerializerMethodField()
+    goods_out_qty = serializers.SerializerMethodField()
+
+    batch_goods_qty = serializers.SerializerMethodField() #计划入库数量 
+    batch_goods_in_qty = serializers.SerializerMethodField() #实际入库数量 
+    batch_goods_in_location_qty = serializers.SerializerMethodField() #实际在库数量 
+    batch_goods_out_qty = serializers.SerializerMethodField()
+    create_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', required=False)
+    class Meta:
+        # 指定模型和排除字段
+        model = ContainerDetailLogModel
+        fields= '__all__'
+        read_only_fields = ['id']
 
+    def get_batch(self, obj):
+        """ 动态序列化关联的批次数据 """
+        return obj.container_detail.batch.bound_number if obj.container_detail.batch else 'N/A'
+    def get_container_code(self, obj):
+        return obj.container_detail.container.container_code if obj.container_detail.container.container_code else 'N/A'
+    def get_goods_code(self, obj):
+        return obj.container_detail.goods_code if obj.container_detail.goods_code else 'N/A'
+    def get_goods_desc(self, obj):
+        return obj.container_detail.goods_desc if obj.container_detail.goods_desc else 'N/A'
+    
+    # 获取托盘最小单元detail的入库数量
+    def get_detail_goods_qty(self, obj):
+        return obj.container_detail.goods_qty if obj.container_detail.goods_qty else Decimal('0')
+    
+    # 获取托盘最小单元detail的 入库操作数量
+    def get_goods_qty(self, obj):
+       
+        new_goods_qty = obj.new_goods_qty if obj.new_goods_qty else Decimal('0')
+        old_goods_qty = obj.old_goods_qty if obj.old_goods_qty else Decimal('0')
+
+        goods_qty = new_goods_qty - old_goods_qty
+        return goods_qty if goods_qty else Decimal('0')
+    
+    # 获取托盘最小单元detail的 出库操作数量
+    def get_goods_out_qty(self, obj):
+        
+        new_goods_out_qty = obj.new_goods_out_qty if obj.new_goods_out_qty else Decimal('0')
+        old_goods_out_qty = obj.old_goods_out_qty if obj.old_goods_out_qty else Decimal('0')
+        goods_out_qty = new_goods_out_qty - old_goods_out_qty
+        return goods_out_qty if goods_out_qty else Decimal('0')
+    
+    # 获取批次的计划入库数量
+    def get_batch_goods_qty(self, obj):
+        return obj.container_detail.batch.goods_qty if obj.container_detail.batch.goods_qty else Decimal('0')
+    # 获取批次的实际入库数量
+    def get_batch_goods_in_qty(self, obj):
+        return obj.container_detail.batch.goods_in_qty if obj.container_detail.batch.goods_in_qty else Decimal('0')
+    # 获取批次的实际在库数量
+    def get_batch_goods_in_location_qty(self, obj):
+        return obj.container_detail.batch.goods_in_location_qty if obj.container_detail.batch.goods_in_location_qty else Decimal('0')
+    # 获取批次的出库数量
+    def get_batch_goods_out_qty(self, obj):
+        return obj.container_detail.batch.goods_out_qty if obj.container_detail.batch.goods_out_qty else Decimal('0')
+    
+
+    
+    
 class ContainerListGetSerializer(serializers.ModelSerializer):
     # 定义主单列表的序列化器，用于获取操作，字段只读
     container_code = serializers.IntegerField(read_only=True, required=False)

container/urls.py

@@ -58,4 +58,6 @@ re_path(r'^out_detail/(?P<pk>\d+)/$', views.OutDetailViewSet.as_view({
     'patch': 'partial_update',
 }), name="Task_1"),
 
+path(r'detaillog/', views.ContainerDetailLogModelViewSet.as_view({"get": "list", "post": "create"}), name="Task"),
+
 ]

container/views.py

@@ -14,7 +14,7 @@ import requests
 from django.db import transaction
 import logging
 from rest_framework import status
-from .models import ContainerListModel,ContainerDetailModel,ContainerOperationModel,ContainerWCSModel,TaskModel,out_batch_detail
+from .models import ContainerListModel,ContainerDetailModel,ContainerOperationModel,ContainerWCSModel,TaskModel,out_batch_detail,ContainerDetailLogModel
 from bound.models import BoundDetailModel,BoundListModel,OutBoundDetailModel
 from bin.views import LocationAllocation,base_location
 from bin.models import LocationModel,LocationContainerLink,LocationGroupModel
@@ -26,7 +26,8 @@ from .serializers import ContainerOperationGetSerializer,ContainerOperationPostS
 from .serializers import TaskGetSerializer,TaskPostSerializer
 from .serializers import WCSTaskGetSerializer
 from .serializers import OutBoundFullDetailSerializer,OutBoundDetailSerializer
-from .filter import ContainerDetailFilter,ContainerListFilter,ContainerOperationFilter,TaskFilter,WCSTaskFilter
+from .serializers import ContainerDetailLogSerializer
+from .filter import ContainerDetailFilter,ContainerListFilter,ContainerOperationFilter,TaskFilter,WCSTaskFilter,ContainerDetailLogFilter
 
 from rest_framework.permissions import AllowAny
 import threading
@@ -36,6 +37,64 @@ from collections import defaultdict
 from django.db.models import Sum
 from staff.models import ListModel as StaffListModel
 logger = logging.getLogger(__name__)
+
+# 进出库log查看
+class ContainerDetailLogModelViewSet(viewsets.ModelViewSet):
+    """
+        retrieve:
+            Response a data list（get）
+        list:
+            Response a data list（all）
+        create:
+            Create a data line（post）
+
+        delete:
+            Delete a data line（delete)
+
+    """
+    # authentication_classes = []  # 禁用所有认证类
+    # permission_classes = [AllowAny]  # 允许任意访问
+    pagination_class = MyPageNumberPagination   
+    filter_backends = [DjangoFilterBackend, OrderingFilter, ]
+    ordering_fields = ['id', "create_time", "update_time", ]
+    filter_class = ContainerDetailLogFilter
+
+    def get_project(self):
+        try:
+            id = self.kwargs.get('pk')
+            return id
+        except:
+            return None
+
+    def get_queryset(self):
+        id = self.get_project()
+        if self.request.user:
+            if id is None:
+                return ContainerDetailLogModel.objects.filter()
+            else:
+                return ContainerDetailLogModel.objects.filter(id=id)
+        else:
+            return ContainerDetailLogModel.objects.none()
+
+    def get_serializer_class(self):
+        if self.action in ['list', 'destroy','retrieve']:
+            return ContainerDetailLogSerializer
+        else:
+            return self.http_method_not_allowed(request=self.request)
+
+    def create(self, request, *args, **kwargs):
+        data = self.request.data
+        return Response(data, status=200, headers=headers)
+    
+    def update(self, request, pk):
+        qs = self.get_object()
+        data = self.request.data
+        serializer = self.get_serializer(qs, data=data)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        headers = self.get_success_headers(serializer.data)  
+        return Response(serializer.data, status=200, headers=headers)   
+
 # 托盘列表视图
 class ContainerListViewSet(viewsets.ModelViewSet):
     """

templates/dist/spa/css/6.335f665c.css

@@ -0,0 +1 @@
+.q-date__calendar-item--selected[data-v-6ee299e8]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-6ee299e8]{background-color:rgba(25,118,210,0.1)}

templates/dist/spa/css/7.05ad646d.css

@@ -0,0 +1 @@
+.q-date__calendar-item--selected[data-v-52e2073a]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-52e2073a]{background-color:rgba(25,118,210,0.1)}.custom-title[data-v-52e2073a]{font-size:0.9rem;font-weight:500}.custom-timeline[data-v-52e2073a]{--q-timeline-color:#e0e0e0}.custom-node .q-timeline__dot[data-v-52e2073a]{background:#485573!important;border:2px solid #5c6b8c!important}.custom-node .q-timeline__content[data-v-52e2073a]{color:#485573}

templates/dist/spa/css/8.12d7043d.css

@@ -0,0 +1 @@
+.q-date__calendar-item--selected[data-v-02fe74f8]{transition:all 0.3s ease;background-color:#1976d2!important}.q-date__range[data-v-02fe74f8]{background-color:rgba(25,118,210,0.1)}.custom-title[data-v-02fe74f8]{font-size:0.9rem;font-weight:500}.custom-timeline[data-v-02fe74f8]{--q-timeline-color:#e0e0e0}.custom-node .q-timeline__dot[data-v-02fe74f8]{background:#485573!important;border:2px solid #5c6b8c!important}.custom-node .q-timeline__content[data-v-02fe74f8]{color:#485573}