소스 검색

托盘数据修改

flower_bs 1 개월 전
부모
커밋
587df67bf6
100개의 변경된 파일45개의 추가작업 그리고 28개의 파일을 삭제
  1. 1 0
      container/filter.py
  2. 15 2
      container/serializers.py
  3. 4 3
      container/views.py
  4. 1 0
      templates/dist/spa/css/10.888183b4.css
  5. 0 0
      templates/dist/spa/css/11.955fcd1c.css
  6. 0 0
      templates/dist/spa/css/12.676916e5.css
  7. 0 0
      templates/dist/spa/css/13.be283b5e.css
  8. 0 0
      templates/dist/spa/css/14.285d986e.css
  9. 0 0
      templates/dist/spa/css/15.bec12cd9.css
  10. 0 0
      templates/dist/spa/css/16.819dd245.css
  11. 0 0
      templates/dist/spa/css/17.f57b1220.css
  12. 0 0
      templates/dist/spa/css/18.3c7078c1.css
  13. 0 0
      templates/dist/spa/css/19.296f042c.css
  14. 0 0
      templates/dist/spa/css/20.710ed6db.css
  15. 0 0
      templates/dist/spa/css/21.712d6cf2.css
  16. 0 0
      templates/dist/spa/css/22.bb6b4a4d.css
  17. 0 0
      templates/dist/spa/css/23.601677c3.css
  18. 0 0
      templates/dist/spa/css/24.71123cd8.css
  19. 0 0
      templates/dist/spa/css/25.f721cf95.css
  20. 0 0
      templates/dist/spa/css/26.ed8e81e9.css
  21. 0 0
      templates/dist/spa/css/27.eed22a1c.css
  22. 0 0
      templates/dist/spa/css/28.98f0278c.css
  23. 0 0
      templates/dist/spa/css/29.1bb0db04.css
  24. 0 0
      templates/dist/spa/css/30.01a9029f.css
  25. 0 0
      templates/dist/spa/css/31.9b0c5133.css
  26. 0 0
      templates/dist/spa/css/32.0d4c4716.css
  27. 0 0
      templates/dist/spa/css/33.326b06df.css
  28. 0 0
      templates/dist/spa/css/34.8f3f6188.css
  29. 0 0
      templates/dist/spa/css/35.6dbcf0b0.css
  30. 0 0
      templates/dist/spa/css/36.efd62105.css
  31. 0 0
      templates/dist/spa/css/37.12670fd1.css
  32. 0 0
      templates/dist/spa/css/38.9478c981.css
  33. 0 0
      templates/dist/spa/css/39.c4652654.css
  34. 0 0
      templates/dist/spa/css/40.7a23b7fb.css
  35. 0 0
      templates/dist/spa/css/41.2594d0b9.css
  36. 0 0
      templates/dist/spa/css/42.0faa4aeb.css
  37. 1 1
      templates/dist/spa/index.html
  38. 1 0
      templates/dist/spa/js/10.1b3b425b.js
  39. BIN
      templates/dist/spa/js/10.1b3b425b.js.gz
  40. BIN
      templates/dist/spa/js/10.ff0b5b2c.js.gz
  41. BIN
      templates/dist/spa/js/11.3bc8a128.js.gz
  42. 1 1
      templates/dist/spa/js/10.ff0b5b2c.js
  43. BIN
      templates/dist/spa/js/11.ec255e84.js.gz
  44. BIN
      templates/dist/spa/js/12.0737aae8.js.gz
  45. 1 1
      templates/dist/spa/js/11.3bc8a128.js
  46. BIN
      templates/dist/spa/js/12.106e9a2a.js.gz
  47. 1 1
      templates/dist/spa/js/12.0737aae8.js
  48. BIN
      templates/dist/spa/js/13.1e53bf7d.js.gz
  49. BIN
      templates/dist/spa/js/13.fe7ceaa6.js.gz
  50. BIN
      templates/dist/spa/js/14.1a7ade46.js.gz
  51. 1 1
      templates/dist/spa/js/13.fe7ceaa6.js
  52. BIN
      templates/dist/spa/js/14.8aad49d1.js.gz
  53. 1 1
      templates/dist/spa/js/14.1a7ade46.js
  54. BIN
      templates/dist/spa/js/15.330a5295.js.gz
  55. 1 1
      templates/dist/spa/js/15.552dc187.js
  56. BIN
      templates/dist/spa/js/15.552dc187.js.gz
  57. BIN
      templates/dist/spa/js/16.e849ec62.js.gz
  58. 1 1
      templates/dist/spa/js/16.e849ec62.js
  59. BIN
      templates/dist/spa/js/17.35a9a046.js.gz
  60. BIN
      templates/dist/spa/js/18.69c421f9.js.gz
  61. 1 1
      templates/dist/spa/js/17.8eb19249.js
  62. BIN
      templates/dist/spa/js/17.8eb19249.js.gz
  63. 1 1
      templates/dist/spa/js/18.69c421f9.js
  64. BIN
      templates/dist/spa/js/19.4e20799a.js.gz
  65. BIN
      templates/dist/spa/js/19.a082dcdc.js.gz
  66. BIN
      templates/dist/spa/js/20.48892ff3.js.gz
  67. 1 1
      templates/dist/spa/js/19.a082dcdc.js
  68. BIN
      templates/dist/spa/js/20.ea0af978.js.gz
  69. BIN
      templates/dist/spa/js/21.73153f72.js.gz
  70. 1 1
      templates/dist/spa/js/20.48892ff3.js
  71. BIN
      templates/dist/spa/js/21.bcad4888.js.gz
  72. BIN
      templates/dist/spa/js/22.49d10a94.js.gz
  73. 1 1
      templates/dist/spa/js/21.73153f72.js
  74. BIN
      templates/dist/spa/js/22.6644b430.js.gz
  75. 1 1
      templates/dist/spa/js/22.49d10a94.js
  76. BIN
      templates/dist/spa/js/23.7d6e0d41.js.gz
  77. BIN
      templates/dist/spa/js/23.a1802db8.js.gz
  78. 1 1
      templates/dist/spa/js/23.a1802db8.js
  79. BIN
      templates/dist/spa/js/24.663cf4fc.js.gz
  80. BIN
      templates/dist/spa/js/24.a9a807fb.js.gz
  81. BIN
      templates/dist/spa/js/25.259bf8d2.js.gz
  82. 1 1
      templates/dist/spa/js/24.a9a807fb.js
  83. BIN
      templates/dist/spa/js/25.2de0f4a3.js.gz
  84. 1 1
      templates/dist/spa/js/25.259bf8d2.js
  85. BIN
      templates/dist/spa/js/26.7d399143.js.gz
  86. 1 1
      templates/dist/spa/js/26.cef8f85d.js
  87. BIN
      templates/dist/spa/js/26.cef8f85d.js.gz
  88. 1 1
      templates/dist/spa/js/27.8fc1d7aa.js
  89. BIN
      templates/dist/spa/js/27.8fc1d7aa.js.gz
  90. 1 1
      templates/dist/spa/js/28.88566e27.js
  91. BIN
      templates/dist/spa/js/28.88566e27.js.gz
  92. BIN
      templates/dist/spa/js/29.fa7ce73b.js.gz
  93. BIN
      templates/dist/spa/js/30.28e04135.js.gz
  94. 1 1
      templates/dist/spa/js/29.fa7ce73b.js
  95. BIN
      templates/dist/spa/js/30.c3a6316f.js.gz
  96. 1 1
      templates/dist/spa/js/30.28e04135.js
  97. BIN
      templates/dist/spa/js/31.e3853a64.js.gz
  98. 1 1
      templates/dist/spa/js/31.7d0da0d9.js
  99. BIN
      templates/dist/spa/js/32.dd0b28ee.js.gz
  100. 0 0
      templates/dist/spa/js/32.dd0b28ee.js

+ 1 - 0
container/filter.py

@@ -77,6 +77,7 @@ class ContainerDetailFilter(FilterSet):
             "creater": ['exact', 'icontains'],
             "create_time": ['exact', 'gt', 'gte', 'lt', 'lte', 'range'],
             "update_time": ['exact', 'gt', 'gte', 'lt', 'lte', 'range'],
+            "is_delete": ['exact', 'gt', 'gte', 'lt', 'lte', 'isnull', 'in', 'range'],
         }
 
 class ContainerOperationFilter(FilterSet):

+ 15 - 2
container/serializers.py

@@ -171,9 +171,22 @@ class ContainerDetailGetSerializer(serializers.ModelSerializer):
     class Meta:
         # 指定模型和排除字段
         model = ContainerDetailModel
-        exclude = ['id', 'is_delete', ]
+        fields= '__all__'
         read_only_fields = ['id']
-    
+class ContainerDetailPutSerializer(serializers.ModelSerializer):
+    # 定义明细单列表的序列化器,用于创建操作,允许部分字段写入
+    month = serializers.IntegerField(read_only=False, required=False, validators=[datasolve.data_validate])
+    goods_code = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
+    goods_desc = serializers.CharField(read_only=False, required=True, validators=[datasolve.data_validate])
+    goods_qty = serializers.DecimalField(read_only=False, required=True, max_digits=10, decimal_places=3,validators=[datasolve.data_validate])
+    goods_out_qty = serializers.DecimalField(read_only=False, required=True, max_digits=10, decimal_places=3,validators=[datasolve.data_validate])
+
+    class Meta:
+        # 指定模型和排除字段
+        model = ContainerDetailModel
+        fields= ['month','goods_code','goods_desc','goods_qty','goods_out_qty']
+        read_only_fields = ['id']
+
 class ContainerDetailPostSerializer(serializers.ModelSerializer):
     # 定义明细单列表的序列化器,用于创建操作,允许部分字段写入
     month = serializers.IntegerField(read_only=False, required=False, validators=[datasolve.data_validate])

+ 4 - 3
container/views.py

@@ -20,7 +20,7 @@ from bin.views import LocationAllocation,base_location
 from bin.models import LocationModel,LocationContainerLink,LocationGroupModel
 from bound.models import BoundBatchModel,OutBatchModel,BatchOperateLogModel
 
-from .serializers import ContainerDetailGetSerializer,ContainerDetailPostSerializer,ContainerDetailSimpleGetSerializer
+from .serializers import ContainerDetailGetSerializer,ContainerDetailPostSerializer,ContainerDetailSimpleGetSerializer,ContainerDetailPutSerializer
 from .serializers import ContainerListGetSerializer,ContainerListPostSerializer
 from .serializers import ContainerOperationGetSerializer,ContainerOperationPostSerializer
 from .serializers import TaskGetSerializer,TaskPostSerializer
@@ -1412,9 +1412,10 @@ class ContainerDetailViewSet(viewsets.ModelViewSet):
     def get_serializer_class(self):
         if self.action in ['list', 'destroy','retrieve']:
             return ContainerDetailGetSerializer
-        elif self.action in ['create', 'update']:
+        elif self.action in ['create']:
             return ContainerDetailPostSerializer
-
+        elif self.action in ['update']:
+            return ContainerDetailPutSerializer
         else:
             return self.http_method_not_allowed(request=self.request)
 

+ 1 - 0
templates/dist/spa/css/10.888183b4.css

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

templates/dist/spa/css/10.955fcd1c.css → templates/dist/spa/css/11.955fcd1c.css


templates/dist/spa/css/11.676916e5.css → templates/dist/spa/css/12.676916e5.css


templates/dist/spa/css/12.be283b5e.css → templates/dist/spa/css/13.be283b5e.css


templates/dist/spa/css/13.285d986e.css → templates/dist/spa/css/14.285d986e.css


templates/dist/spa/css/14.bec12cd9.css → templates/dist/spa/css/15.bec12cd9.css


templates/dist/spa/css/15.819dd245.css → templates/dist/spa/css/16.819dd245.css


templates/dist/spa/css/16.f57b1220.css → templates/dist/spa/css/17.f57b1220.css


templates/dist/spa/css/17.3c7078c1.css → templates/dist/spa/css/18.3c7078c1.css


templates/dist/spa/css/18.296f042c.css → templates/dist/spa/css/19.296f042c.css


templates/dist/spa/css/19.710ed6db.css → templates/dist/spa/css/20.710ed6db.css


templates/dist/spa/css/20.712d6cf2.css → templates/dist/spa/css/21.712d6cf2.css


templates/dist/spa/css/21.bb6b4a4d.css → templates/dist/spa/css/22.bb6b4a4d.css


templates/dist/spa/css/22.601677c3.css → templates/dist/spa/css/23.601677c3.css


templates/dist/spa/css/23.71123cd8.css → templates/dist/spa/css/24.71123cd8.css


templates/dist/spa/css/24.f721cf95.css → templates/dist/spa/css/25.f721cf95.css


templates/dist/spa/css/25.ed8e81e9.css → templates/dist/spa/css/26.ed8e81e9.css


templates/dist/spa/css/26.eed22a1c.css → templates/dist/spa/css/27.eed22a1c.css


templates/dist/spa/css/27.98f0278c.css → templates/dist/spa/css/28.98f0278c.css


templates/dist/spa/css/28.1bb0db04.css → templates/dist/spa/css/29.1bb0db04.css


templates/dist/spa/css/29.01a9029f.css → templates/dist/spa/css/30.01a9029f.css


templates/dist/spa/css/30.9b0c5133.css → templates/dist/spa/css/31.9b0c5133.css


templates/dist/spa/css/31.0d4c4716.css → templates/dist/spa/css/32.0d4c4716.css


templates/dist/spa/css/32.326b06df.css → templates/dist/spa/css/33.326b06df.css


templates/dist/spa/css/33.8f3f6188.css → templates/dist/spa/css/34.8f3f6188.css


templates/dist/spa/css/34.6dbcf0b0.css → templates/dist/spa/css/35.6dbcf0b0.css


templates/dist/spa/css/35.efd62105.css → templates/dist/spa/css/36.efd62105.css


templates/dist/spa/css/36.12670fd1.css → templates/dist/spa/css/37.12670fd1.css


templates/dist/spa/css/37.9478c981.css → templates/dist/spa/css/38.9478c981.css


templates/dist/spa/css/38.c4652654.css → templates/dist/spa/css/39.c4652654.css


templates/dist/spa/css/39.7a23b7fb.css → templates/dist/spa/css/40.7a23b7fb.css


templates/dist/spa/css/40.2594d0b9.css → templates/dist/spa/css/41.2594d0b9.css


templates/dist/spa/css/41.0faa4aeb.css → templates/dist/spa/css/42.0faa4aeb.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/index.html


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
templates/dist/spa/js/10.1b3b425b.js


BIN
templates/dist/spa/js/10.1b3b425b.js.gz


BIN
templates/dist/spa/js/10.ff0b5b2c.js.gz


BIN
templates/dist/spa/js/11.3bc8a128.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/10.ff0b5b2c.js


BIN
templates/dist/spa/js/11.ec255e84.js.gz


BIN
templates/dist/spa/js/12.0737aae8.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/11.3bc8a128.js


BIN
templates/dist/spa/js/12.106e9a2a.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/12.0737aae8.js


BIN
templates/dist/spa/js/13.1e53bf7d.js.gz


BIN
templates/dist/spa/js/13.fe7ceaa6.js.gz


BIN
templates/dist/spa/js/14.1a7ade46.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/13.fe7ceaa6.js


BIN
templates/dist/spa/js/14.8aad49d1.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/14.1a7ade46.js


BIN
templates/dist/spa/js/15.330a5295.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/15.552dc187.js


BIN
templates/dist/spa/js/15.552dc187.js.gz


BIN
templates/dist/spa/js/16.e849ec62.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/16.e849ec62.js


BIN
templates/dist/spa/js/17.35a9a046.js.gz


BIN
templates/dist/spa/js/18.69c421f9.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/17.8eb19249.js


BIN
templates/dist/spa/js/17.8eb19249.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/18.69c421f9.js


BIN
templates/dist/spa/js/19.4e20799a.js.gz


BIN
templates/dist/spa/js/19.a082dcdc.js.gz


BIN
templates/dist/spa/js/20.48892ff3.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/19.a082dcdc.js


BIN
templates/dist/spa/js/20.ea0af978.js.gz


BIN
templates/dist/spa/js/21.73153f72.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/20.48892ff3.js


BIN
templates/dist/spa/js/21.bcad4888.js.gz


BIN
templates/dist/spa/js/22.49d10a94.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/21.73153f72.js


BIN
templates/dist/spa/js/22.6644b430.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/22.49d10a94.js


BIN
templates/dist/spa/js/23.7d6e0d41.js.gz


BIN
templates/dist/spa/js/23.a1802db8.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/23.a1802db8.js


BIN
templates/dist/spa/js/24.663cf4fc.js.gz


BIN
templates/dist/spa/js/24.a9a807fb.js.gz


BIN
templates/dist/spa/js/25.259bf8d2.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/24.a9a807fb.js


BIN
templates/dist/spa/js/25.2de0f4a3.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/25.259bf8d2.js


BIN
templates/dist/spa/js/26.7d399143.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/26.cef8f85d.js


BIN
templates/dist/spa/js/26.cef8f85d.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/27.8fc1d7aa.js


BIN
templates/dist/spa/js/27.8fc1d7aa.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/28.88566e27.js


BIN
templates/dist/spa/js/28.88566e27.js.gz


BIN
templates/dist/spa/js/29.fa7ce73b.js.gz


BIN
templates/dist/spa/js/30.28e04135.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/29.fa7ce73b.js


BIN
templates/dist/spa/js/30.c3a6316f.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/30.28e04135.js


BIN
templates/dist/spa/js/31.e3853a64.js.gz


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
templates/dist/spa/js/31.7d0da0d9.js


BIN
templates/dist/spa/js/32.dd0b28ee.js.gz


+ 0 - 0
templates/dist/spa/js/32.dd0b28ee.js


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.