车辆表和计划表更加字段

tcp_server/src/main.rs

@@ -568,7 +568,11 @@ struct ErpShippingPlan {
     cust_name: Option<String>,
     material_name: Option<String>,
     plan_name: Option<String>,
-    warehouse_name: Option<String>
+    warehouse_name: Option<String>,
+    #[serde(deserialize_with = "deserialize_string_to_bool")]
+    hy_upload_status:bool,
+    #[serde(deserialize_with = "deserialize_string_to_bool")]
+    zl_upload_status: bool,
 }
 
 #[derive(Debug, Deserialize)]
@@ -853,6 +857,7 @@ struct CommBmVehicleinfo {
     supplier_name: Option<String>,
     material_id: Option<i32>,
     material_name: Option<String>,
+    group_type: Option<String>
 }
 
 #[derive(Debug, Deserialize)]
@@ -1189,7 +1194,8 @@ async fn insert_erp_shipping_plan(client: &tokio_postgres::Client, info: &ErpShi
                 review = $17, review_by = $18, review_date = $19, cancel = $20,
                 cancel_by = $21, cancel_time = $22, remarks = $23, plan_number = $24,
                 order_number = $25, warehouse_id = $26, order_type = $27, cust_name = $28,
-                material_name = $29, plan_name = $30, warehouse_name = $31
+                material_name = $29, plan_name = $30, warehouse_name = $31, hy_upload_status = $32,
+                zl_upload_status = $33
             WHERE id = $1",
             &[
                 &info.id, &info.cust_id, &info.material_id, &info.plan_type,
@@ -1200,7 +1206,7 @@ async fn insert_erp_shipping_plan(client: &tokio_postgres::Client, info: &ErpShi
                 &info.review_by, &info.review_date, &info.cancel, &info.cancel_by,
                 &info.cancel_time, &info.remarks, &info.plan_number, &info.order_number,
                 &info.warehouse_id, &info.order_type, &info.cust_name, &info.material_name,
-                &info.plan_name, &info.warehouse_name
+                &info.plan_name, &info.warehouse_name, &info.hy_upload_status, &info.zl_upload_status
             ],
         ).await?;
     } else {
@@ -1214,10 +1220,11 @@ async fn insert_erp_shipping_plan(client: &tokio_postgres::Client, info: &ErpShi
                 review, review_by, review_date, cancel,
                 cancel_by, cancel_time, remarks, plan_number,
                 order_number, warehouse_id, order_type, cust_name,
-                material_name, plan_name, warehouse_name
+                material_name, plan_name, warehouse_name, hy_upload_status,
+                zl_upload_status
             ) OVERRIDING SYSTEM VALUE VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13,
                      $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24,
-                     $25, $26, $27, $28, $29, $30,$31)",
+                     $25, $26, $27, $28, $29, $30,$31,$32,$33)",
             &[
                 &info.id, &info.cust_id, &info.material_id, &info.plan_type,
                 &info.plan_start_date, &info.plan_end_date, &info.plan_days,
@@ -1227,7 +1234,7 @@ async fn insert_erp_shipping_plan(client: &tokio_postgres::Client, info: &ErpShi
                 &info.review_by, &info.review_date, &info.cancel, &info.cancel_by,
                 &info.cancel_time, &info.remarks, &info.plan_number, &info.order_number,
                 &info.warehouse_id, &info.order_type, &info.cust_name, &info.material_name,
-                &info.plan_name, &info.warehouse_name
+                &info.plan_name, &info.warehouse_name, &info.hy_upload_status, &info.zl_upload_status
             ],
         ).await?;
     }
@@ -1629,7 +1636,7 @@ async fn insert_vehicle_info(client: &tokio_postgres::Client, info: &CommBmVehic
                  carriagewidth = $34, carriageheight = $35, underbodyheight = $36,
                  frontsampling = $37, backsampling = $38, rod1 = $39, rod2 = $40, rod3 = $41,
                  rod4 = $42, rod5 = $43, rod6 = $44, supplier_id = $45, supplier_name = $46,
-                 material_id = $47
+                 material_id = $47, group_type = $48
              WHERE id = $1",
             &[
                 &info.id, &info.licenseplate, &info.r#type, &info.grosswt, &info.tarewt,
@@ -1643,7 +1650,7 @@ async fn insert_vehicle_info(client: &tokio_postgres::Client, info: &CommBmVehic
                 &info.carriagewidth, &info.carriageheight, &info.underbodyheight,
                 &info.frontsampling, &info.backsampling, &info.rod1, &info.rod2, &info.rod3,
                 &info.rod4, &info.rod5, &info.rod6, &info.supplier_id, &info.supplier_name,
-                &info.material_id
+                &info.material_id, &info.group_type
             ],
         ).await?;
     } else {
@@ -1657,11 +1664,12 @@ async fn insert_vehicle_info(client: &tokio_postgres::Client, info: &CommBmVehic
                 rfidmodifiedtime, rfidstop, rfidstopby, rfidstoptime, rfidgrantby,
                 rfidgranttime, samplingpoints, drawbar, carriagelength, carriagewidth,
                 carriageheight, underbodyheight, frontsampling, backsampling, rod1, rod2,
-                rod3, rod4, rod5, rod6, supplier_id, supplier_name, material_id, material_name
+                rod3, rod4, rod5, rod6, supplier_id, supplier_name, material_id, material_name,
+                group_type
             ) OVERRIDING SYSTEM VALUE VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,
                       $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28,
                       $29, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $40, $41,
-                      $42, $43, $44, $45, $46, $47)",
+                      $42, $43, $44, $45, $46, $47, $48)",
             &[
                 &info.id, &info.licenseplate, &info.r#type, &info.grosswt, &info.tarewt,
                 &info.owner, &info.dl, &info.supervision, &info.outage, &info.insurancedate,
@@ -1674,7 +1682,7 @@ async fn insert_vehicle_info(client: &tokio_postgres::Client, info: &CommBmVehic
                 &info.carriagewidth, &info.carriageheight, &info.underbodyheight,
                 &info.frontsampling, &info.backsampling, &info.rod1, &info.rod2, &info.rod3,
                 &info.rod4, &info.rod5, &info.rod6, &info.supplier_id, &info.supplier_name,
-                &info.material_id, &info.material_name
+                &info.material_id, &info.material_name, &info.group_type
             ],
         ).await?;
     }