From fc74886461ea12ca100acf61c4514f2c0b7e5aef Mon Sep 17 00:00:00 2001 From: Hyojin Ahn Date: Wed, 5 Nov 2025 08:00:31 -0500 Subject: [PATCH] =?UTF-8?q?[Dustin]=20-=20Tracking=20Log=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20-=20Input=20Pickup=20=EC=8B=9C=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=EB=90=9C=20=EC=98=A4=EB=8D=94=EC=9E=A5?= =?UTF-8?q?=EC=9D=B4=20=EB=8B=B4=EB=8B=B9=EB=93=9C=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B2=84=EA=B0=80=20=EC=95=84=EB=8B=8C=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=ED=94=BD=EC=97=85=ED=95=9C=20=EB=93=9C=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B2=84=EB=A1=9C=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95=20-=20MAP?= =?UTF-8?q?=20=EC=97=90=EC=84=9C=20=EC=98=A4=EB=8D=94=EC=9E=A5=20=EC=8B=A0?= =?UTF-8?q?=EA=B7=9C=20=EC=83=9D=EC=84=B1=EC=8B=9C=20CORSIA=20DATE=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public_html/assets/internal_api.php | 12 ++++++------ public_html/doc/customer_detail.php | 5 +++++ public_html/lib/user_process.php | 5 +++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/public_html/assets/internal_api.php b/public_html/assets/internal_api.php index 6436b3d..45eec92 100644 --- a/public_html/assets/internal_api.php +++ b/public_html/assets/internal_api.php @@ -1009,8 +1009,8 @@ class API extends CONF { public function addOrder(){ try { - qry("INSERT INTO tbl_daily (d_orderdate, d_ordertype, d_ruid, d_driveruid, d_customeruid, d_accountno, d_name, d_paymenttype, d_cycle, d_rate, d_form_eu, d_maincontainer, d_container, d_location, d_status) - SELECT '".$_POST['orderdate']."', '".$_POST['ordertype']."', '".$_POST['ruid']."', '".$_POST['driveruid']."', c_uid, c_accountno, c_name, c_paymenttype, c_paymentcycle, c_rate, c_form_eu, c_maincontainer, c_container, c_location, 'A' + qry("INSERT INTO tbl_daily (d_orderdate, d_ordertype, d_ruid, d_driveruid, d_customeruid, d_accountno, d_name, d_paymenttype, d_cycle, d_rate, d_form_eu, d_form_corsia, d_maincontainer, d_container, d_location, d_status) + SELECT '".$_POST['orderdate']."', '".$_POST['ordertype']."', '".$_POST['ruid']."', '".$_POST['driveruid']."', c_uid, c_accountno, c_name, c_paymenttype, c_paymentcycle, c_rate, c_form_eu, c_form_corsia, c_maincontainer, c_container, c_location, 'A' FROM tbl_customer WHERE c_uid=".(int)$_POST['customer_uid']); @@ -1046,14 +1046,14 @@ class API extends CONF { qry("INSERT INTO tbl_daily ( d_orderdate, d_driveruid, d_customeruid, d_accountno, - d_name, d_paymenttype, d_cycle, d_rate, d_form_eu, d_maincontainer, d_container, d_location, d_address, + d_name, d_paymenttype, d_cycle, d_rate, d_form_eu, d_form_corsia, d_maincontainer, d_container, d_location, d_address, d_city, d_postal, d_oil_2y, d_oil_1y, d_oil_0y, d_fullcycle, d_fullcycleforced, d_fullcycleflag, d_lastpickupdate, d_lastpickupquantity, d_lastpaiddate, d_estquantity, d_createruid, d_createddate, d_status) SELECT '".$_POST['orderdate']."', '".$_POST['driveruid']."', c_uid, c_accountno, - c_name, c_paymenttype, c_paymentcycle, c_rate, c_form_eu, c_maincontainer, c_container, c_location, c_address, + c_name, c_paymenttype, c_paymentcycle, c_rate, c_form_eu, c_form_corsia, c_maincontainer, c_container, c_location, c_address, c_city, c_postal, 0, 0, 0, c_fullcycle, c_fullcycleforced, c_fullcycleflag, c_lastpickupdate, c_lastpickupquantity, c_lastpaiddate, IFNULL((c_fullquantity - c_fullquantitydaily + (".(int)$interval->days." * c_fullquantitydaily)),0), @@ -1282,7 +1282,7 @@ class API extends CONF { qry("INSERT INTO tbl_daily ( d_orderdate, d_driveruid, d_customeruid, d_accountno, d_name, - d_paymenttype, d_cycle, d_rate, d_form_eu, d_maincontainer, d_container, d_location, + d_paymenttype, d_cycle, d_rate, d_form_eu, d_form_corsia, d_maincontainer, d_container, d_location, d_address, d_city, d_postal, d_oil_2y, d_oil_1y, d_oil_0y, d_fullcycle, d_fullcycleforced, d_fullcycleflag, d_lastpickupdate, d_lastpickupquantity, d_lastpaiddate, @@ -1293,7 +1293,7 @@ class API extends CONF { ) SELECT '".$_POST['visitdate']."', '".$_POST['driveruid']."', c_uid, c_accountno, c_name, - c_paymenttype, c_paymentcycle, c_rate, c_form_eu, c_maincontainer, c_container, c_location, + c_paymenttype, c_paymentcycle, c_rate, c_form_eu, c_form_corsia, c_maincontainer, c_container, c_location, c_address, c_city, c_postal, 0, 0, 0, c_fullcycle, c_fullcycleforced, c_fullcycleflag, c_lastpickupdate, c_lastpickupquantity, c_lastpaiddate, diff --git a/public_html/doc/customer_detail.php b/public_html/doc/customer_detail.php index 1a948d5..0766b2b 100644 --- a/public_html/doc/customer_detail.php +++ b/public_html/doc/customer_detail.php @@ -360,6 +360,11 @@ while($lt_driver=mysqli_fetch_array($rt_driver, MYSQLI_ASSOC)) { if ($lt_driver['m_uid'] == $c_driveruid) $selectStr = "selected"; else $selectStr = ""; + if ($d_mode == "update") { + if ($lt_driver['m_uid'] == $d_driveruid) $selectStr = "selected"; + else $selectStr = ""; + } + $c_driveruidSTRM .= " "; diff --git a/public_html/lib/user_process.php b/public_html/lib/user_process.php index 0d6d399..3b0b9b3 100644 --- a/public_html/lib/user_process.php +++ b/public_html/lib/user_process.php @@ -80,6 +80,7 @@ if ($actionStr == "PICKUPORDERCUSTOMER") { $d_mode = "update"; $d_uid = $rt_daily['d_uid']; + $d_driveruid = $rt_daily['d_driveruid']; // d_visitdate가 오늘 일자가 아닌 경우, order date을 변경하려는 것임. // 하지만 변경하려는 일자에 data가 존재하므로 alert 처리후 종료 @@ -250,13 +251,13 @@ if ($actionStr == "PICKUPORDERCUSTOMER") { $d_uid = $rt_max[0]; - $logSTR = "[d_uid=$d_uid][d_quantity=$d_quantity][d_paystatus=$d_paystatus][d_payamount=".number_format(floatval($d_payamount), 2, '.', ',')."]"; + $logSTR = "[d_uid=$d_uid][d_driveruid=$d_driveruid][d_quantity=$d_quantity][d_paystatus=$d_paystatus][d_payamount=".number_format(floatval($d_payamount), 2, '.', ',')."]"; addLog ("add", "ORDER PICKUP - CUSTOMER", "PICKUP-INSERT", $lguserid, $logSTR, $d_uid); } else { $jdb->uQuery("tbl_daily", $columns, $values, " where d_uid = '$d_uid' "); - $logSTR = "[d_uid=$d_uid][d_quantity=$d_quantity][d_paystatus=$d_paystatus][d_payamount=".number_format(floatval($d_payamount), 2, '.', ',')."]"; + $logSTR = "[d_uid=$d_uid][d_driveruid=$d_driveruid][d_quantity=$d_quantity][d_paystatus=$d_paystatus][d_payamount=".number_format(floatval($d_payamount), 2, '.', ',')."]"; addLog ("add", "ORDER PICKUP - CUSTOMER", "PICKUP-UPDATE", $lguserid, $logSTR, $d_uid); }