feat: log formatted

api_v2/test_external_printing_order_snapshot_sync_api.py

@@ -118,6 +118,7 @@ class PrintingOrderExternalSnapshotSyncAPITest(TestCase):
             'SeHao': '1.51',
             'ShuLiang': quantity,
             'ShuLiangZ': '2.68',
+            'SubID': 1,
             'YanSe': product_name or self.product_keep.name,
             'area': '周边',
             'customer': {
@@ -220,6 +221,7 @@ class PrintingOrderExternalSnapshotSyncAPITest(TestCase):
         self.assertEqual(order.area, '周边')
         self.assertEqual(keep_job.quantity, 25)
         self.assertEqual(keep_job.original_id, 1000008)
+        self.assertEqual(keep_job.sub_id, 1)
         self.assertFalse(printing_models.PrintingJob.objects.filter(id=stale_job.id).exists())
         self.assertEqual(keep_job.business_object.state_logs.filter(is_cancelled=False).count(), 0)
 
@@ -229,6 +231,7 @@ class PrintingOrderExternalSnapshotSyncAPITest(TestCase):
         self.assertTrue(audit.allow_reset_stateflow)
         self.assertEqual(audit.before_snapshot['printing_order']['fabric'], '旧布料')
         self.assertEqual(len(audit.before_snapshot['printing_jobs']), 2)
+        self.assertIn('sub_id', audit.before_snapshot['printing_jobs'][0])
 
     @patch('api_v1.tasks._fetch_external_printing_order_snapshot')
     def test_sync_records_audit_when_external_snapshot_not_found(self, mock_fetch_snapshot):
@@ -246,4 +249,4 @@ class PrintingOrderExternalSnapshotSyncAPITest(TestCase):
         audit = printing_models.PrintingOrderExternalSnapshotSyncAudit.objects.get(id=resp.data['audit_id'])
         self.assertFalse(audit.is_success)
         self.assertEqual(audit.external_order_id, 'KD-NOT-FOUND')
-        self.assertEqual(audit.before_snapshot['exists'], False)
+        self.assertEqual(audit.before_snapshot['exists'], False)

api_v2/tests.py

@@ -188,6 +188,7 @@ class PrintingJobByCustomerAPITest(TestCase):
             product=self.product,
             quantity=10,
             unit='米',
+            sub_id=11,
         )
         printing_models.PrintingJob.objects.filter(id=self.job_in_range.id).update(created_at=in_range)
 
@@ -253,6 +254,7 @@ class PrintingJobByCustomerAPITest(TestCase):
         self.assertEqual(len(resp.data), 1)
         self.assertEqual(resp.data[0]['id'], self.job_in_range.id)
         self.assertEqual(resp.data[0]['external_order_id'], 'KD20410611')
+        self.assertEqual(resp.data[0]['sub_id'], 11)
         self.assertEqual(resp.data[0]['billed_quantity'], '20.00')
 
     def test_filter_by_printing_order(self):

api_v2/views/printing.py

@@ -62,6 +62,7 @@ class PrintingJobV2Serializer(serializers.ModelSerializer):
         fields = [
             'id',
             'original_id',
+            'sub_id',
             'printing_order',
             'external_order_id',
             'product',