fix: 레거시 코드 수정
- instock/list_stock.php 수정 - lib/mydb.php 수정 - output/list_document.php 수정
This commit is contained in:
@@ -55,7 +55,7 @@ if ($fromdate === "" || $fromdate === null || $todate === "" || $todate === null
|
|||||||
|
|
||||||
$SettingDate = "inspection_date"; // 정렬 기준 날짜
|
$SettingDate = "inspection_date"; // 정렬 기준 날짜
|
||||||
|
|
||||||
$order = " ORDER BY prodcode ASC, inspection_date DESC ";
|
$order = " ORDER BY prodcode ASC ";
|
||||||
|
|
||||||
// 재고 계산을 위한 SQL 쿼리
|
// 재고 계산을 위한 SQL 쿼리
|
||||||
// 입고량과 사용량을 계산하여 재고를 구함
|
// 입고량과 사용량을 계산하여 재고를 구함
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ function db_connect(){ //DB연결을 함수로 정의
|
|||||||
$pdo = new PDO($dsn, $db_user, $db_pass, [
|
$pdo = new PDO($dsn, $db_user, $db_pass, [
|
||||||
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
|
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
|
||||||
PDO::ATTR_EMULATE_PREPARES => false,
|
PDO::ATTR_EMULATE_PREPARES => false,
|
||||||
PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8mb4"
|
PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8mb4, sql_mode='NO_ENGINE_SUBSTITUTION'"
|
||||||
]);
|
]);
|
||||||
} catch (PDOException $Exception) {
|
} catch (PDOException $Exception) {
|
||||||
die('오류:'.$Exception->getMessage());
|
die('오류:'.$Exception->getMessage());
|
||||||
|
|||||||
@@ -68,29 +68,30 @@ if ($separate_date == "1") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 진행상태에 대한 검색
|
// 진행상태에 대한 검색
|
||||||
$orderby = " ORDER BY " . $SettingDate . " DESC, num DESC"; // 내림차순 정렬
|
$orderby = " ORDER BY num DESC"; // 내림차순 정렬
|
||||||
|
$orderby_with_date = " ORDER BY " . $SettingDate . " DESC, num DESC"; // 날짜+번호 내림차순 정렬
|
||||||
|
|
||||||
if ($existing_status == '전체') {
|
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 = '' or ACIcheck IS NULL) " . $orderby;
|
$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;
|
$searchwhere = " WHERE is_deleted = '0' AND ACIregDate IS NOT NULL AND ACIregDate != '' AND (ACIcheck = '' or ACIcheck IS NULL) AND searchtag LIKE '%$search%'" . $orderby;
|
||||||
} else {
|
} 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 = '' or ACIcheck IS NULL) " . $orderby;
|
$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;
|
$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;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 수정된 쿼리: ACIregDate이 존재하고 is_deleted가 0인 자료만 선택
|
// 수정된 쿼리: ACIregDate이 존재하고 is_deleted가 0인 자료만 선택
|
||||||
if ($search == "") {
|
if ($search == "") {
|
||||||
$sql = "SELECT * FROM $DB.$tablename " . $where;
|
$sql = "SELECT * FROM $DB.$tablename " . $where;
|
||||||
} else {
|
} else {
|
||||||
$sql = "SELECT * FROM $DB.$tablename " . $searchwhere;
|
$sql = "SELECT * FROM $DB.$tablename " . $searchwhere;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 현재일자 변수지정
|
// 현재일자 변수지정
|
||||||
$today = date("Y-m-d");
|
$today = date("Y-m-d");
|
||||||
|
|
||||||
// SQL 실행 및 데이터 처리
|
// SQL 실행 및 데이터 처리
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$stmh = $pdo->query($sql); // 검색조건에 맞는글 stmh
|
$stmh = $pdo->query($sql); // 검색조건에 맞는글 stmh
|
||||||
$total_row = $stmh->rowCount();
|
$total_row = $stmh->rowCount();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user