Merge branch 'main' of https://dev.rasadyar.com/MNPC/Rasadyar_Marzaki

panel/KillHouse/serializers.py

@@ -4360,6 +4360,8 @@ class ProvinceKillRequestForLetterVetSerializer(serializers.ModelSerializer):
 class PoultryRequestoutProvinceSerializer(serializers.ModelSerializer):
     poultry = PoultryForPoultryRequestLetterSerializer(read_only=True)
     out_province_poultry_request_buyer = OutProvincePoultryRequestBuyerSerializer(read_only=True)
+    vet_farm_name = serializers.CharField(source='vet_farm.user.fullname', read_only=True)
+    vet_farm_mobile = serializers.CharField(source='vet_farm.user.mobile', read_only=True)
     hatching = serializers.SerializerMethodField('get_hatching')
     out_state = serializers.SerializerMethodField('get_out_state')
     total_system_quarantine_quantity = serializers.SerializerMethodField('get_total_system_quarantine_quantity')
@@ -4375,10 +4377,11 @@ class PoultryRequestoutProvinceSerializer(serializers.ModelSerializer):
                   'payer_fullname', 'out_province_poultry_request_buyer', 'buyer_mobile', 'buyer_fullname',
                   'buyer_city', 'buyer_province', 'agent', 'killer_kill_house_unit_name', 'killer_kill_house_city',
                   'killer_kill_house_province', 'kill_house_unique_id', 'payment_link', 'quarantine_quantity',
-                  'total_system_quarantine_quantity']
+                  'total_system_quarantine_quantity','vet_farm_name','vet_farm_mobile','interface_number']
 
     def get_hatching(self, obj):
 
+
         # if ProvinceKillRequest.objects.filter(
         #         province_request__city_request_Poultry__poultry_request=obj,
         #         state='accepted').exists():

panel/KillHouse/views.py

@@ -3177,7 +3177,8 @@ class KillRequestViewSet(viewsets.ModelViewSet):
                         recive_date = datetime.strptime(str(request.data['recive_date']), '%Y-%m-%d %H:%M:%S').date()
                     total_unpaid_wage = get_finance_info(kill_house)['total_price']
                     slaughter_transactions = InternalTransaction.objects.filter(
-                        kill_house=kill_house, status='completed',
+                        Q(kill_house=kill_house) | Q(parent_kill_house=kill_house),
+                        status='completed',
                         trash=False)
 
                     total_paid_wage += slaughter_transactions.aggregate(total=Sum('amount'))[
@@ -3540,6 +3541,8 @@ class KillRequestViewSet(viewsets.ModelViewSet):
                             send_date=kill_request.recive_date,
                             amount=kill_request.amount,
                         )
+                        if kill_request.freezing:
+                            poultry_request.freezing = True
                         poultry_request.save()
                         kill_request.poultry_request = poultry_request
                         if kill_request.export_status == True:
@@ -4266,6 +4269,8 @@ class KillRequestViewSet(viewsets.ModelViewSet):
                         free_sale_in_province=free_sale_in_province,
                         send_date=kill_request.recive_date
                     )
+                    if kill_request.freezing:
+                        poultry_request.freezing = True
 
                     poultry_request.save()
                     kill_request.poultry_request = poultry_request
@@ -4605,6 +4610,8 @@ class KillRequestViewSet(viewsets.ModelViewSet):
                             free_sale_in_province=free_sale_in_province,
                             send_date=kill_request.recive_date
                         )
+                        if kill_request.freezing:
+                            poultry_request.freezing = True
 
                         poultry_request.save()
                         kill_request.poultry_request = poultry_request

panel/ProvinceOperator/views.py

@@ -683,6 +683,8 @@ class ProvinceCheckDirectBuyingViewSet(viewsets.ModelViewSet):
                 free_sale_in_province=free_sale_in_province,
                 send_date=kill_request.recive_date
             )
+            if kill_request.freezing:
+                poultry_request.freezing = True
             poultry_request.save()
             kill_request.poultry_request = poultry_request
             poultry_prediction(poultry_request.poultry)

panel/migrations/0386_auto_20260119_1506.py

@@ -0,0 +1,74 @@
+# Generated by Django 3.2.13 on 2026-01-19 15:06
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('panel', '0385_auto_20251221_1045'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='killrequest',
+            name='freezing',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='functionexecutor',
+            name='compare_time',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 507756)),
+        ),
+        migrations.AlterField(
+            model_name='operatorlasttimeenter',
+            name='assignment_last_time_check',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 440262)),
+        ),
+        migrations.AlterField(
+            model_name='operatorlasttimeenter',
+            name='city_operator_last_time_check',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 440262)),
+        ),
+        migrations.AlterField(
+            model_name='operatorlasttimeenter',
+            name='kill_house_last_time_check',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 440262)),
+        ),
+        migrations.AlterField(
+            model_name='operatorlasttimeenter',
+            name='province_operator_last_time_check',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 440262)),
+        ),
+        migrations.AlterField(
+            model_name='posdevicesession',
+            name='session_create_date',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 597713)),
+        ),
+        migrations.AlterField(
+            model_name='posdevicesession',
+            name='session_last_seen_date',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 597713)),
+        ),
+        migrations.AlterField(
+            model_name='poultry',
+            name='date_of_register',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 445822)),
+        ),
+        migrations.AlterField(
+            model_name='poultry',
+            name='hatching_date',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 445822)),
+        ),
+        migrations.AlterField(
+            model_name='poultry',
+            name='last_party_date',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 445822)),
+        ),
+        migrations.AlterField(
+            model_name='totalpoultryrequestquantity',
+            name='date',
+            field=models.DateTimeField(default=datetime.datetime(2026, 1, 19, 15, 6, 27, 458521)),
+        ),
+    ]

panel/models.py

@@ -1799,6 +1799,7 @@ class KillRequest(BaseModel):
     market_code = models.CharField(max_length=20, null=True)
     input_market_code = models.CharField(max_length=20, null=True)
     expire_time_ten_minute = models.DateTimeField(null=True)
+    freezing = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):
         super(KillRequest, self).save(*args, **kwargs)