diff --git a/public_html/doc/order_driver.php b/public_html/doc/order_driver.php index c690290..5347afb 100644 --- a/public_html/doc/order_driver.php +++ b/public_html/doc/order_driver.php @@ -866,7 +866,7 @@ function printDiv(divName) { - +
diff --git a/public_html/doc/report_daily.php b/public_html/doc/report_daily.php index 707d302..a11839c 100644 --- a/public_html/doc/report_daily.php +++ b/public_html/doc/report_daily.php @@ -19,7 +19,10 @@ else { $startYearMonth = str_replace("-", "", trim($startYearMonth)); $startYear = substr($startYearMonth,0,4); -if ($startYearMonth =="") $startYearMonth = date("Ym"); +if ($startYearMonth =="") { + $startYearMonth = date("Ym"); + $startYear = date("Y"); +} //total record diff --git a/public_html/lib/order_lib_process.php b/public_html/lib/order_lib_process.php index efd0dd5..2050f98 100644 --- a/public_html/lib/order_lib_process.php +++ b/public_html/lib/order_lib_process.php @@ -35,7 +35,7 @@ $columns = array(); $values = array(); $columns[] = "d_orderdate"; -$columns[] = "d_driveruid"; +//$columns[] = "d_driveruid"; $columns[] = "d_inputdate"; $columns[] = "d_modifydate"; $columns[] = "d_quantity"; @@ -58,7 +58,7 @@ $columns[] = "d_is_transfer"; // Integration to ERP $d_visitdate = str_replace("-", "", trim($d_visitdate)); $values[] = $d_visitdate; // d_orderdate -$values[] = $d_driveruid; +//$values[] = $d_driveruid; $values[] = date("YmdHis"); // d_inputdate $values[] = date("YmdHis"); // d_modifydate $values[] = $d_quantity; @@ -114,8 +114,8 @@ if ($putSignFlag == 1) { $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, '.', ',')."]"; -addLog ("add", "ORDER PICKUP - ORDER", "PICKUP", $lguserid, $logSTR, $d_uid); +$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 - ORDER", "PICKUP-LIB", $lguserid, $logSTR, $d_uid); // ==================== // Integration to ERP @@ -190,7 +190,7 @@ $qry_customer = "UPDATE tbl_customer $jdb->nQuery($qry_customer, "update error"); -addLog ("add", "ORDER PICKUP - ORDER", "UPDATE", $lguserid, $qry_customer, $d_customeruid); +addLog ("add", "ORDER PICKUP - ORDER", "UPDATE-LIB", $lguserid, $qry_customer, $d_customeruid); // tbl_daily 의 sludge update