Merge remote-tracking branch 'origin/lin-task' into dev

src/types/api/billOrder.ts

@@ -12,8 +12,8 @@ export interface AccountStatementNoteSearchForm {
   billNumber?: string
   subOrderNumber?: string
   shipmentNumber?: string
-  recNumber?: string
-  orderNumber?: string
+  rec_number?: string
+  order_number?: string
   factory_status?: string
   erp_status?: string
   startTime?: string
@@ -29,6 +29,7 @@ export interface AccountStatementNote {
   pass_num?: number
   factory_code?: string
   total_amount?: string | number
+  totalAmount?: string | number
   actual_amount?: string | number
   num?: number
   end_time?: string
@@ -96,143 +97,143 @@ export interface ItemList {
   factory_order_number?: string
 }
 export interface OrderDetails {
-  pass_num: number;
-  num: number;
-  not_pass_num: number;
-  erp_order_number: string | null;
-  product_total_amount: number;
-  carriage_total_amount: number;
-  craft_total_price: number;
-  info_id: number;
-  template_total_price: number;
-  id: number;
-  order_id: string;
-  factory_order_number: string;
+  pass_num: number
+  num: number
+  not_pass_num: number
+  erp_order_number: string | null
+  product_total_amount: number
+  carriage_total_amount: number
+  craft_total_price: number
+  info_id: number
+  template_total_price: number
+  id: number
+  order_id: string
+  factory_order_number: string
   order: {
-    receiver_post_code: string;
-    payment_time: string | null;
-    actual_amount: number;
-    adjusted_amount: number;
-    factory_no: number;
-    factory_online_id: string | null;
-    total_product_amount: number | null;
-    process_number: string;
-    track_status: number;
-    id: string;
-    receiver_country: string;
-    factory_order_number: string;
-    prepaid_amount: number;
-    receiver_province: string;
-    create_time: string;
-    weight: number;
-    product_num: number;
-    version: number;
-    finish_time: string;
-    start_stocking_time: string;
-    payment_type: string | null;
-    warehouse_name: string;
-    total_amount: number;
-    logistics_way_code: string;
-    third_order_number: string;
-    shop_number: string;
-    express_sheet: string;
-    status: string;
-    production_client: string;
-    statusStr: string;
-    receiver_city: string;
-    remark: string | null;
-    exception_reason: string | null;
-    platform: string;
-    update_time: string;
-    receiver_address2: string;
-    receiver_address1: string;
-    receiver_name: string;
-    tracking_number: string;
-    product_amount: number;
-    carriage_amount: number | null;
-    pay_freight: number;
-    logistics_way_name: string;
-    factory_code: string;
-    receiver_district: string | null;
-    temu_logistics_way_id: string | null;
-    logistics_way_id: number;
-    user_mark: string;
-    namespace: string;
-    receiver_phone: string;
-    exception_handling: number;
-    shipment_type: number;
-    warehouse_id: number;
-  };
+    receiver_post_code: string
+    payment_time: string | null
+    actual_amount: number
+    adjusted_amount: number
+    factory_no: number
+    factory_online_id: string | null
+    total_product_amount: number | null
+    process_number: string
+    track_status: number
+    id: string
+    receiver_country: string
+    factory_order_number: string
+    prepaid_amount: number
+    receiver_province: string
+    create_time: string
+    weight: number
+    product_num: number
+    version: number
+    finish_time: string
+    start_stocking_time: string
+    payment_type: string | null
+    warehouse_name: string
+    total_amount: number
+    logistics_way_code: string
+    third_order_number: string
+    shop_number: string
+    express_sheet: string
+    status: string
+    production_client: string
+    statusStr: string
+    receiver_city: string
+    remark: string | null
+    exception_reason: string | null
+    platform: string
+    update_time: string
+    receiver_address2: string
+    receiver_address1: string
+    receiver_name: string
+    tracking_number: string
+    product_amount: number
+    carriage_amount: number | null
+    pay_freight: number
+    logistics_way_name: string
+    factory_code: string
+    receiver_district: string | null
+    temu_logistics_way_id: string | null
+    logistics_way_id: number
+    user_mark: string
+    namespace: string
+    receiver_phone: string
+    exception_handling: number
+    shipment_type: number
+    warehouse_id: number
+  }
 }
 export interface ProductDetails {
-  diy_id: string;
-  diy_bianma: string;
-  base_sku: string;
-  sub_order_number: string;
-  price_update_remark: string | null;
-  price_status: boolean;
-  template_item_sku: string | null;
-  product_id: string;
-  id: number;
-  shipment_num: number;
-  product_item_id: string | null;
-  template_price: number;
+  diy_id: string
+  diy_bianma: string
+  base_sku: string
+  sub_order_number: string
+  price_update_remark: string | null
+  price_status: boolean
+  template_item_sku: string | null
+  product_id: string
+  id: number
+  shipment_num: number
+  product_item_id: string | null
+  template_price: number
   product: {
-    diy_id: string;
-    end_product_id: string;
-    category_name: string;
-    craft_name: string;
-    base_sku: string;
-    num: number;
-    is_production: boolean;
-    pick_finish: number;
-    remark: string | null;
-    product_price: number;
-    third_stock_sku: string | null;
-    customized_quantity: number;
-    template_price: number;
-    tag_ids: string | null;
-    create_time: string;
-    third_sub_order_number: string;
-    factory_sub_order_number: string;
-    variant_image: string;
-    craft_code: string;
-    pass_num: number;
-    factory_code: string;
-    pay_amount: number;
-    weight: number;
-    is_replenishment: number;
-    image_ary: Array<{ title: string; url: string }>;
+    diy_id: string
+    end_product_id: string
+    category_name: string
+    craft_name: string
+    base_sku: string
+    num: number
+    is_production: boolean
+    pick_finish: number
+    remark: string | null
+    product_price: number
+    third_stock_sku: string | null
+    customized_quantity: number
+    template_price: number
+    tag_ids: string | null
+    create_time: string
+    third_sub_order_number: string
+    factory_sub_order_number: string
+    variant_image: string
+    craft_code: string
+    pass_num: number
+    factory_code: string
+    pay_amount: number
+    weight: number
+    is_replenishment: number
+    image_ary: Array<{ title: string; url: string }>
     design_images: Array<{
-      imageUrl: string;
-      fileUrl: string;
-      id: string;
-      title: string;
-      materialId: string;
-      materialImage: string;
-    }>;
-    not_pass_num: number;
-    version: number;
-    supplier_product_no: string | null;
-    pod_jomall_order_us_id: string;
-    craft_price: number;
-    customs_value: number;
-    variant_sku: string;
-    batch_arrange_number: string;
-    trim_design_images: string | null;
-  };
-  product_item_sku: string | null;
-  item_id: number;
-  variant_image: string;
-  pass_num: number;
-  not_pass_num: number | null;
-  craft_price: number;
-  price_update_time: string | null;
-  variant_sku: string;
-  info_id: number;
-  shop_number: string;
-  template_item_id: string | null;
-  order_id: string;
+      imageUrl: string
+      fileUrl: string
+      id: string
+      title: string
+      materialId: string
+      materialImage: string
+    }>
+    not_pass_num: number
+    version: number
+    supplier_product_no: string | null
+    pod_jomall_order_us_id: string
+    craft_price: number
+    customs_value: number
+    variant_sku: string
+    batch_arrange_number: string
+    trim_design_images: string | null
+  }
+  product_item_sku: string | null
+  item_id: number
+  variant_image: string
+  pass_num: number
+  not_pass_num: number | null
+  craft_price: number
+  price_update_time: string | null
+  variant_sku: string
+  info_id: number
+  shop_number: string
+  template_item_id: string | null
+  order_id: string
 }
 
 export interface ConfirmOrderForm {

src/types/api/deliveryNote.ts

@@ -189,55 +189,55 @@ export interface DbFactory {
 }
 
 export interface IDetailData {
-  statusStr?: string;
-  id: string;
-  erp_id?: string;
-  namespace?: string;
-  dbFactory?: DbFactory | null;
-  factory?: DbFactory | null;
-  productList?: Product[];
-  order_number?: string;
-  factory_order_number?: string;
-  erp_order_number?: string;
-  third_order_number?: string;
-  shop_number?: string;
-  product_num?: string | number;
-  start_stocking_time?: string;
-  finish_time?: string;
-  delivery_type?: string;
-  logistics_way_name?: string;
-  lanshou_name?: string;
-  receiver_name?: string;
-  lanshou_phone?: string;
-  receiver_phone?: string;
-  lanshou_region?: string;
-  receiver_province?: string;
-  lanshou_address?: string;
-  receiver_city?: string;
-  receiver_district?: string;
-  receiver_address1?: string;
-  lanshou_post?: string;
-  receiver_post_code?: string;
-  user_mark?: string;
+  statusStr?: string
+  id: string
+  erp_id?: string
+  namespace?: string
+  dbFactory?: DbFactory | null
+  factory?: DbFactory | null
+  productList?: Product[]
+  order_number?: string
+  factory_order_number?: string
+  erp_order_number?: string
+  third_order_number?: string
+  shop_number?: string
+  product_num?: string | number
+  start_stocking_time?: string
+  finish_time?: string
+  delivery_type?: string
+  logistics_way_name?: string
+  lanshou_name?: string
+  receiver_name?: string
+  lanshou_phone?: string
+  receiver_phone?: string
+  lanshou_region?: string
+  receiver_province?: string
+  lanshou_address?: string
+  receiver_city?: string
+  receiver_district?: string
+  receiver_address1?: string
+  lanshou_post?: string
+  receiver_post_code?: string
+  user_mark?: string
   price?: number
   customized_quantityStr?: string
-  product_price?:string
-  customized_quantity:number
-  image_ary?:string | null
-  [propName: string]: string | number | boolean | undefined | unknown;
+  product_price?: string
+  customized_quantity: number
+  image_ary?: string | null
+  [propName: string]: string | number | boolean | undefined | unknown
 }
 
 export interface PodUsDetailData {
   id: number
-  erp_id?: string;
-  price?: number;
-  customized_quantityStr?: string;
-  product_price?: number;
+  erp_id?: string
+  price?: number
+  customized_quantityStr?: string
+  product_price?: number
   // 其他已有属性...
-  customized_quantity: number; // 添加缺失属性
-  image_ary?: string | null;    // 添加缺失属性
-  productList:IDetailData[]
-  [propName: string]: string | number | boolean | undefined | unknown;
+  customized_quantity: number // 添加缺失属性
+  image_ary?: string | null // 添加缺失属性
+  productList: IDetailData[]
+  [propName: string]: string | number | boolean | undefined | unknown
 }
 export interface LogListsData {
   id: number
@@ -259,17 +259,18 @@ export interface LogListData {
   employee_account?: string
 }
 export interface DetailForm {
+  shop_number?: string
   billNumber?: string
-  orderNumber?: string
-  craftCode?: string
-  baseSku?: string
-  shipmentNumber?: string
+  order_number?: string
+  craft_code?: string
+  base_sku?: string
+  shipment_number?: string
   process?: string
   supplierItemNo?: string
   dateRange?: string[]
   endTime?: string
   startTime?: string
-  subOrderNumber?: string
+  sub_order_number?: string
   rows?: number
   page?: number
   currentPage?: number