diff --git a/tcp_server/src/main.rs b/tcp_server/src/main.rs index 8a6e6f3..61a05f7 100644 --- a/tcp_server/src/main.rs +++ b/tcp_server/src/main.rs @@ -774,7 +774,9 @@ struct ErpTotalShippingPlan { #[serde(deserialize_with = "deserialize_option_date")] berthing_time: Option, supplier_id: Option, - material_id: Option + material_id: Option, + #[serde(deserialize_with = "deserialize_string_to_bool")] + delete_flag: bool, } #[derive(Debug, Deserialize)] @@ -1517,8 +1519,9 @@ async fn insert_erp_total_shipping_plan(client: &tokio_postgres::Client, info: & material_name = $11, shipping_station_code = $12, shipping_station_name = $13, departure_port = $14, departure_time = $15, port_destination = $16, berthing_time = $17, - supplier_id = $18, material_id = $19,order_number = $20 - WHERE id = $21", + supplier_id = $18, material_id = $19,order_number = $20, + delete_flag = $21 + WHERE id = $22", &[ &info.start_time, &info.end_time, &info.finish, &info.ship_name, &info.voyage, &info.total_quantity, &info.deviation_quantity, @@ -1526,7 +1529,7 @@ async fn insert_erp_total_shipping_plan(client: &tokio_postgres::Client, info: & &info.material_name, &info.shipping_station_code, &info.shipping_station_name, &info.departure_port, &info.departure_time, &info.port_destination, &info.berthing_time, - &info.supplier_id, &info.material_id, &info.order_number, + &info.supplier_id, &info.material_id, &info.order_number,&info.delete_flag, &info.id ], ).await?; @@ -1539,9 +1542,9 @@ async fn insert_erp_total_shipping_plan(client: &tokio_postgres::Client, info: & supplier_name, material_code, material_name, shipping_station_code, shipping_station_name, departure_port, departure_time, port_destination, berthing_time, - supplier_id, material_id + supplier_id, material_id,delete_flag ) 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)", + $13, $14, $15, $16, $17, $18, $19, $20, $21,$22)", &[ &info.id, &info.order_number, &info.start_time, &info.end_time, &info.finish, @@ -1550,7 +1553,7 @@ async fn insert_erp_total_shipping_plan(client: &tokio_postgres::Client, info: & &info.material_code, &info.material_name, &info.shipping_station_code, &info.shipping_station_name, &info.departure_port, &info.departure_time, &info.port_destination, &info.berthing_time, &info.supplier_id, - &info.material_id + &info.material_id, &info.delete_flag ], ).await?; } diff --git a/tcp_server/target/.rustc_info.json b/tcp_server/target/.rustc_info.json index 88b1e62..bba1d7b 100644 --- a/tcp_server/target/.rustc_info.json +++ b/tcp_server/target/.rustc_info.json @@ -1 +1 @@ -{"rustc_fingerprint":3807311574931242264,"outputs":{"13331785392996375709":{"success":true,"status":"","code":0,"stdout":"___.exe\nlib___.rlib\n___.dll\n___.dll\n___.lib\n___.dll\nC:\\Users\\qq101\\.rustup\\toolchains\\stable-x86_64-pc-windows-msvc\npacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"msvc\"\ntarget_family=\"windows\"\ntarget_feature=\"cmpxchg16b\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_feature=\"sse3\"\ntarget_has_atomic=\"128\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"windows\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"pc\"\nwindows\n","stderr":""},"17747080675513052775":{"success":true,"status":"","code":0,"stdout":"rustc 1.85.0 (4d91de4e4 2025-02-17)\nbinary: rustc\ncommit-hash: 4d91de4e48198da2e33413efdcd9cd2cc0c46688\ncommit-date: 2025-02-17\nhost: x86_64-pc-windows-msvc\nrelease: 1.85.0\nLLVM version: 19.1.7\n","stderr":""}},"successes":{}} \ No newline at end of file +{"rustc_fingerprint":3807311574931242264,"outputs":{"17747080675513052775":{"success":true,"status":"","code":0,"stdout":"rustc 1.85.0 (4d91de4e4 2025-02-17)\nbinary: rustc\ncommit-hash: 4d91de4e48198da2e33413efdcd9cd2cc0c46688\ncommit-date: 2025-02-17\nhost: x86_64-pc-windows-msvc\nrelease: 1.85.0\nLLVM version: 19.1.7\n","stderr":""},"13331785392996375709":{"success":true,"status":"","code":0,"stdout":"___.exe\nlib___.rlib\n___.dll\n___.dll\n___.lib\n___.dll\nC:\\Users\\qq101\\.rustup\\toolchains\\stable-x86_64-pc-windows-msvc\npacked\n___\ndebug_assertions\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"msvc\"\ntarget_family=\"windows\"\ntarget_feature=\"cmpxchg16b\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_feature=\"sse3\"\ntarget_has_atomic=\"128\"\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_os=\"windows\"\ntarget_pointer_width=\"64\"\ntarget_vendor=\"pc\"\nwindows\n","stderr":""}},"successes":{}} \ No newline at end of file diff --git a/tcp_server/target/debug/tcp_server.exe b/tcp_server/target/debug/tcp_server.exe index 284ca87..7d5522b 100644 Binary files a/tcp_server/target/debug/tcp_server.exe and b/tcp_server/target/debug/tcp_server.exe differ diff --git a/tcp_server/target/debug/tcp_server.pdb b/tcp_server/target/debug/tcp_server.pdb index 620f1e4..ecc73a3 100644 Binary files a/tcp_server/target/debug/tcp_server.pdb and b/tcp_server/target/debug/tcp_server.pdb differ