diff --git a/account_juil/list_daily.php b/account_juil/list_daily.php index 96432d8c..0b9efa27 100644 --- a/account_juil/list_daily.php +++ b/account_juil/list_daily.php @@ -124,7 +124,7 @@ $notesReceivableSql = "SELECT END ) as outstanding_balance FROM $tablename -WHERE (dueDate != '0000-00-00' AND dueDate IS NOT NULL AND dueDate != '') +WHERE (dueDate IS NOT NULL) AND (is_deleted IS NULL OR is_deleted = 0) AND bankbook = '전자어음' GROUP BY bill_no diff --git a/output/_request.php b/output/_request.php index 8ef85c85..02bf657f 100644 --- a/output/_request.php +++ b/output/_request.php @@ -64,9 +64,10 @@ $warranty = isset($_REQUEST['warranty']) ? $_REQUEST['warranty'] : ''; $ordersheet = isset($_REQUEST['ordersheet']) ? $_REQUEST['ordersheet'] : '{}'; $ordersheet_slat = isset($_REQUEST['ordersheet_slat']) ? $_REQUEST['ordersheet_slat'] : '{}'; -$ACIregDate = isset($_REQUEST["ACIregDate"]) ? $_REQUEST["ACIregDate"] : ''; // 인정검사 관련 4가지 -$ACIaskDate = isset($_REQUEST["ACIaskDate"]) ? $_REQUEST["ACIaskDate"] : ''; -$ACIdoneDate = isset($_REQUEST["ACIdoneDate"]) ? $_REQUEST["ACIdoneDate"] : ''; +// 인정검사 관련 날짜 필드 - 빈 문자열은 NULL로 처리 (MySQL 8.0 Strict Mode 호환) +$ACIregDate = isset($_REQUEST["ACIregDate"]) && $_REQUEST["ACIregDate"] !== '' ? $_REQUEST["ACIregDate"] : null; +$ACIaskDate = isset($_REQUEST["ACIaskDate"]) && $_REQUEST["ACIaskDate"] !== '' ? $_REQUEST["ACIaskDate"] : null; +$ACIdoneDate = isset($_REQUEST["ACIdoneDate"]) && $_REQUEST["ACIdoneDate"] !== '' ? $_REQUEST["ACIdoneDate"] : null; $ACImemo = isset($_REQUEST["ACImemo"]) ? $_REQUEST["ACImemo"] : ''; $iList = isset($_REQUEST['iList']) ? $_REQUEST['iList'] : '{}'; // 인정검사 자료 diff --git a/output/_row.php b/output/_row.php index 398b03a1..fade1c6c 100644 --- a/output/_row.php +++ b/output/_row.php @@ -49,8 +49,10 @@ $slatlist = isset($row['slatlist']) ? $row['slatlist'] : '{}'; $recordscreen = isset($row['recordscreen']) ? $row['recordscreen'] : '{}'; $recordslat = isset($row['recordslat']) ? $row['recordslat'] : '{}'; $recordbending = isset($row['recordbending']) ? $row['recordbending'] : '{}'; -$estimateList = isset($row['estimateList']) ? $row['estimateList'] : '{}'; -$estimateSlatList = isset($row['estimateSlatList']) ? $row['estimateSlatList'] : '{}'; +$estimateList = isset($row['estimateList']) ? $row['estimateList'] : '{}'; +$estimateSlatList = isset($row['estimateSlatList']) ? $row['estimateSlatList'] : '{}'; +$eList_screen = isset($row['eList_screen']) ? $row['eList_screen'] : '{}'; +$eList_slat = isset($row['eList_slat']) ? $row['eList_slat'] : '{}'; $etcList = isset($row['etcList']) ? $row['etcList'] : '{}'; $screen_unapprovedList = isset($row['screen_unapprovedList']) ? $row['screen_unapprovedList'] : '{}'; $slat_unapprovedList = isset($row['slat_unapprovedList']) ? $row['slat_unapprovedList'] : '{}'; diff --git a/output/insert_iList.php b/output/insert_iList.php index fbec64d3..540f4487 100644 --- a/output/insert_iList.php +++ b/output/insert_iList.php @@ -9,8 +9,9 @@ header("Content-Type: application/json"); $num = isset($_REQUEST['num']) ? $_REQUEST['num'] : ''; $tablename = isset($_REQUEST['tablename']) ? $_REQUEST['tablename'] : 'output'; -$ACIaskDate = isset($_REQUEST['ACIaskDate']) ? $_REQUEST['ACIaskDate'] : ''; -$ACIdoneDate = isset($_REQUEST['ACIdoneDate']) ? $_REQUEST['ACIdoneDate'] : ''; +// 날짜 필드 - 빈 문자열은 NULL로 처리 (MySQL 8.0 Strict Mode 호환) +$ACIaskDate = isset($_REQUEST['ACIaskDate']) && $_REQUEST['ACIaskDate'] !== '' ? $_REQUEST['ACIaskDate'] : null; +$ACIdoneDate = isset($_REQUEST['ACIdoneDate']) && $_REQUEST['ACIdoneDate'] !== '' ? $_REQUEST['ACIdoneDate'] : null; // JSON 데이터를 저장할 경로 설정 $jsonFilePath = "../output/i_json/" . $num . ".json"; diff --git a/output/list_QCsales.php b/output/list_QCsales.php index 75d1c57c..47722249 100644 --- a/output/list_QCsales.php +++ b/output/list_QCsales.php @@ -95,12 +95,12 @@ if ($separate_date == "1") { // 진행상태에 대한 검색 $orderby = " ORDER BY " . $SettingDate . " DESC, num DESC"; // 내림차순 정렬 -if ($existing_status == '전체') { - $where = " WHERE " . $SettingDate . " BETWEEN date('$fromdate') AND date('$Transtodate') AND is_deleted = '0' AND ACIdoneDate IS NOT NULL AND ACIdoneDate != '' " . $orderby; - $searchwhere = " WHERE is_deleted = '0' AND ACIdoneDate IS NOT NULL AND ACIdoneDate != '' AND searchtag LIKE '%$search%'" . $orderby; -} else { - $where = " WHERE " . $SettingDate . " BETWEEN date('$fromdate') AND date('$Transtodate') AND is_deleted = '0' AND regist_state = '$existing_status' AND ACIdoneDate IS NOT NULL AND ACIdoneDate != '' " . $orderby; - $searchwhere = " WHERE is_deleted = '0' AND regist_state = '$existing_status' AND ACIdoneDate IS NOT NULL AND ACIdoneDate != '' AND searchtag LIKE '%$search%'" . $orderby; +if ($existing_status == '전체') { + $where = " WHERE " . $SettingDate . " IS NOT NULL AND " . $SettingDate . " >= '$fromdate' AND " . $SettingDate . " <= '$Transtodate' AND is_deleted = '0' AND ACIdoneDate IS NOT NULL " . $orderby; + $searchwhere = " WHERE is_deleted = '0' AND ACIdoneDate IS NOT NULL AND searchtag LIKE '%$search%'" . $orderby; +} else { + $where = " WHERE " . $SettingDate . " IS NOT NULL AND " . $SettingDate . " >= '$fromdate' AND " . $SettingDate . " <= '$Transtodate' AND is_deleted = '0' AND regist_state = '$existing_status' AND ACIdoneDate IS NOT NULL " . $orderby; + $searchwhere = " WHERE is_deleted = '0' AND regist_state = '$existing_status' AND ACIdoneDate IS NOT NULL AND searchtag LIKE '%$search%'" . $orderby; } // 수정된 쿼리: ACIdoneDate이 존재하고 is_deleted가 0인 자료만 선택 diff --git a/output/list_document.php b/output/list_document.php index 78078cb7..22fba6a1 100644 --- a/output/list_document.php +++ b/output/list_document.php @@ -72,11 +72,11 @@ $orderby = " ORDER BY num DESC"; // 내림차순 정렬 $orderby_with_date = " ORDER BY " . $SettingDate . " DESC, num DESC"; // 날짜+번호 내림차순 정렬 if ($existing_status == '전체') { - $where = " WHERE CAST(" . $SettingDate . " AS CHAR) >= '$fromdate' AND CAST(" . $SettingDate . " AS CHAR) <= '$Transtodate' AND CAST(" . $SettingDate . " AS CHAR) != '' AND CAST(" . $SettingDate . " AS CHAR) != '0000-00-00' AND is_deleted = '0' AND ACIregDate IS NOT NULL AND ACIregDate != '' AND (ACIcheck = '' or ACIcheck IS NULL) " . $orderby; - $searchwhere = " WHERE is_deleted = '0' AND ACIregDate IS NOT NULL AND ACIregDate != '' AND (ACIcheck = '' or ACIcheck IS NULL) AND searchtag LIKE '%$search%'" . $orderby; + $where = " WHERE " . $SettingDate . " IS NOT NULL AND " . $SettingDate . " >= '$fromdate' AND " . $SettingDate . " <= '$Transtodate' AND is_deleted = '0' AND ACIregDate IS NOT NULL AND (ACIcheck = '' OR ACIcheck IS NULL) " . $orderby; + $searchwhere = " WHERE is_deleted = '0' AND ACIregDate IS NOT NULL AND (ACIcheck = '' OR ACIcheck IS NULL) AND searchtag LIKE '%$search%'" . $orderby; } else { - $where = " WHERE CAST(" . $SettingDate . " AS CHAR) >= '$fromdate' AND CAST(" . $SettingDate . " AS CHAR) <= '$Transtodate' AND CAST(" . $SettingDate . " AS CHAR) != '' AND CAST(" . $SettingDate . " AS CHAR) != '0000-00-00' AND is_deleted = '0' AND regist_state = '$existing_status' AND ACIregDate IS NOT NULL AND ACIregDate != '' AND (ACIcheck = '' or ACIcheck IS NULL) " . $orderby; - $searchwhere = " WHERE is_deleted = '0' AND regist_state = '$existing_status' AND ACIregDate IS NOT NULL AND ACIregDate != '' AND (ACIcheck = '' or ACIcheck IS NULL) AND searchtag LIKE '%$search%'" . $orderby; + $where = " WHERE " . $SettingDate . " IS NOT NULL AND " . $SettingDate . " >= '$fromdate' AND " . $SettingDate . " <= '$Transtodate' AND is_deleted = '0' AND regist_state = '$existing_status' AND ACIregDate IS NOT NULL AND (ACIcheck = '' OR ACIcheck IS NULL) " . $orderby; + $searchwhere = " WHERE is_deleted = '0' AND regist_state = '$existing_status' AND ACIregDate IS NOT NULL AND (ACIcheck = '' OR ACIcheck IS NULL) AND searchtag LIKE '%$search%'" . $orderby; } // 수정된 쿼리: ACIregDate이 존재하고 is_deleted가 0인 자료만 선택 diff --git a/output/list_document_except.php b/output/list_document_except.php index a1915d12..f9f05270 100644 --- a/output/list_document_except.php +++ b/output/list_document_except.php @@ -70,12 +70,12 @@ if ($separate_date == "1") { // 진행상태에 대한 검색 $orderby = " ORDER BY " . $SettingDate . " DESC, num DESC"; // 내림차순 정렬 -if ($existing_status == '전체') { - $where = " WHERE " . $SettingDate . " BETWEEN date('$fromdate') AND date('$Transtodate') AND is_deleted = '0' AND ACIregDate IS NOT NULL AND ACIregDate != '' AND ACIcheck = '1' " . $orderby; - $searchwhere = " WHERE is_deleted = '0' AND ACIregDate IS NOT NULL AND ACIregDate != '' AND ACIcheck = '1' AND searchtag LIKE '%$search%'" . $orderby; -} else { - $where = " WHERE " . $SettingDate . " BETWEEN date('$fromdate') AND date('$Transtodate') AND is_deleted = '0' AND regist_state = '$existing_status' AND ACIregDate IS NOT NULL AND ACIregDate != '' AND ACIcheck = '1' " . $orderby; - $searchwhere = " WHERE is_deleted = '0' AND regist_state = '$existing_status' AND ACIregDate IS NOT NULL AND ACIregDate != '' AND ACIcheck = '1' AND searchtag LIKE '%$search%'" . $orderby; +if ($existing_status == '전체') { + $where = " WHERE " . $SettingDate . " IS NOT NULL AND " . $SettingDate . " >= '$fromdate' AND " . $SettingDate . " <= '$Transtodate' AND is_deleted = '0' AND ACIregDate IS NOT NULL AND ACIcheck = '1' " . $orderby; + $searchwhere = " WHERE is_deleted = '0' AND ACIregDate IS NOT NULL AND ACIcheck = '1' AND searchtag LIKE '%$search%'" . $orderby; +} else { + $where = " WHERE " . $SettingDate . " IS NOT NULL AND " . $SettingDate . " >= '$fromdate' AND " . $SettingDate . " <= '$Transtodate' AND is_deleted = '0' AND regist_state = '$existing_status' AND ACIregDate IS NOT NULL AND ACIcheck = '1' " . $orderby; + $searchwhere = " WHERE is_deleted = '0' AND regist_state = '$existing_status' AND ACIregDate IS NOT NULL AND ACIcheck = '1' AND searchtag LIKE '%$search%'" . $orderby; } // 수정된 쿼리: ACIregDate이 존재하고 is_deleted가 0인 자료만 선택