+
diff --git a/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.ajax.php b/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.ajax.php
index 208d819..cfbac48 100644
--- a/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.ajax.php
+++ b/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.ajax.php
@@ -15,7 +15,7 @@ if (!_notAuth("R")) {
$params = array(
"date_st" => $_REQUEST["date_st"] ?: "",
"date_ed" => $_REQUEST["date_ed"] ?: "",
- "WO_NO" => $_REQUEST["WO_NO_P"] ?: "",
+ "WO_NO" => $_REQUEST["WO_NO_P"] ?: "",
"ITEM_CD" => $_REQUEST["ITEM_CD"] ?: "",
"OP_CD" => $_REQUEST["OP_CD"] ?: "",
"FACLT_CD " => $_REQUEST["FACLT_CD_P"] ?: ""
diff --git a/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js b/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js
index e13b92c..d7af035 100644
--- a/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js
+++ b/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js
@@ -154,7 +154,6 @@ class Tb_order_class {
*/
addRow() {
this.tbList.addRow({ _STATUS_: "I" });
- this.saveButtonActive(false);
// this.orderModal();
}
/*
@@ -163,15 +162,7 @@ class Tb_order_class {
* @function ì„ íƒëœ ëª¨ë“ í–‰ ì‚ì œ
*/
- saveButtonActive(boolean) {
- if (boolean) {
- document.getElementById("put_btn").classList.add("disabled-btn");
- document.getElementById("put_btn").disabled = true;
- } else {
- document.getElementById("put_btn").classList.remove("disabled-btn");
- document.getElementById("put_btn").disabled = false;
- }
- }
+
submitDateTime() {
let dateTimeValue = document.getElementById("MAKE_TM").value;
@@ -179,41 +170,55 @@ class Tb_order_class {
console.log("서버로 보낼 ë‚ ì§œ ë° ì‹œê°„: " + formattedDateTime);
}
- removeRow() {
- const selectedRows = this.tbList.getSelectedRows(); // ì„ íƒëœ ëª¨ë“ í–‰ ê°€ì ¸ì˜¤ê¸°
- // ì„ íƒëœ ê° í–‰ ì‚ì œ
- selectedRows.forEach((row) => {
- // STAUS D로 바꾸기
- row.getData()._STATUS_ = row.getData()._STATUS_ == "I" ? null : "D";
- const rowElement = row.getElement();
- rowElement.classList.add("remove-row");
+
+ removeRow() {
+ const selectedRows = this.tbList.getRows().filter(row=>{
+ return row.getData().check ==="Y"
});
- this.saveButtonActive(false);
+
+ if(selectedRows.length > 0 ){
+
+ kuls_confirm("ì‚ì œ","í•˜ì‹œê² ìŠµë‹ˆê¹Œ?", ()=>{
+ // ì„ íƒëœ ê° í–‰ ì‚ì œ
+ selectedRows.forEach((row) => {
+ // STAUS D로 바꾸기
+ row.getData()._STATUS_ = row.getData()._STATUS_=="I"?null:"D";
+
+ const rowElement = row.getElement();
+ rowElement.classList.add("remove-row");
+
+ });
+ })
+ }else{
+ kuls_alert("ì‚ì œí• í–‰ì„ ì„ íƒí•´ì£¼ì„¸ìš”.")
+ }
}
- // removeRow() {
- // const selectedRows = this.tbList.getRows().filter(row=>{
- // return row.getData().check ==="Y"
- // });
+ /*
+ * @Overview ì‚ì œ 취소 함수
+ * @Parameter ì‚ì œ í–‰
+ * @function í´ë¦ì‹œ ì‚ì œ 취소 & STATUS를 공란으로 변경
+ */
+ clearRemove(tgt){
+ if(tgt._row.data._STATUS_ == "D"){
+ // console.log();
+ tgt._row.data._STATUS_ = "";
+ tgt._row.getElement().classList.remove("remove-row")
+ // const selectedRows = this.tbList.getSelectedRows(); // ì„ íƒëœ ëª¨ë“ í–‰ ê°€ì ¸ì˜¤ê¸°
+ }
+ }
- // if(selectedRows.length > 0 ){
- // kuls_confirm("ì‚ì œ","í•˜ì‹œê² ìŠµë‹ˆê¹Œ?", ()=>{
- // // ì„ íƒëœ ê° í–‰ ì‚ì œ
- // selectedRows.forEach((row) => {
- // // STAUS D로 바꾸기
- // row.getData()._STATUS_ = row.getData()._STATUS_=="I"?null:"D";
-
- // const rowElement = row.getElement();
- // rowElement.classList.add("remove-row");
-
- // });
- // })
- // }else{
- // kuls_alert("ì‚ì œí• í–‰ì„ ì„ íƒí•´ì£¼ì„¸ìš”.")
- // }
- // }
+ /*
+ * @Overview í…Œì´ë¸” ì…€ ìˆ˜ì • 함수
+ * @Parameter ì…€
+ * @function ì…€ íŽ¸ì§‘ì´ ì´í›„ ì €ìž¥ë 수 있ë„ë¡ _STATUS_:U로 ë°ì´í„° ì—…ë°ì´íЏ
+ */
+ cellEdited(cell) {
+ cell.getData()._STATUS_ = cell.getData()._STATUS_ || "U";
+
+ }
/*
* @Overview í…Œì´ë¸” í–‰ ì„ íƒ í•¨ìˆ˜
@@ -223,14 +228,10 @@ class Tb_order_class {
rowClick(e, tgt) {
if (tgt.isSelected()) {
tgt.deselect();
- this.updateBtn.classList.add("disabled-btn");
- this.updateBtn.disabled = true;
- //this.clearRemove(tgt)
+ this.clearRemove(tgt)
} else {
this.tbList.deselectRow();
tgt.select();
- this.updateBtn.disabled = false;
- this.updateBtn.classList.remove("disabled-btn");
}
}
@@ -262,15 +263,18 @@ class Tb_order_class {
DRAW_NO: 'DRAW_NO',
PRV_OP_CD: 'PRV_OP_CD',
ORD_QTY: 'ORD_QTY',
- OP_WRK_QTY: 'OP_WRK_QTY'
+ OP_WRK_QTY: 'OP_WRK_QTY',
+ MAKE_TM: 'MAKE_TM',
+ FACLT_CD: 'FACLT_CD',
+ FACLT_NM: 'FACLT_NM'
},tgt.getRow())
break;
- case "FACLT_CD":
- popRegFacility({
- FACLT_CD: 'FACLT_CD',
- FACLT_NM:'FACLT_NM'
- },tgt.getRow())
- break;
+ // case "FACLT_CD":
+ // popRegFacility({
+ // FACLT_CD: 'FACLT_CD',
+ // FACLT_NM:'FACLT_NM'
+ // },tgt.getRow())
+ // break;
case "EMP_NM":
popWorker({
EMP_NO:'EMP_NO',
@@ -289,11 +293,6 @@ class Tb_order_class {
// break;
}
}
-
- // ì…€ ìˆ˜ì •
- cellEdited(cell) {
- cell.getData()._STATUS_ = cell.getData()._STATUS_ || "U";
- }
putData() {
const _this = this;
// 기본키 중복 í™•ì¸ ë° ë°©ì§€
@@ -325,9 +324,8 @@ class Tb_order_class {
kuls_alert(error.message);
},
complete: function () {
- this.saveButtonActive(true);
- this.updateBtn.disabled = false;
- this.updateBtn.classList.remove("disabled-btn");
+ window.clearTimeout(talert);
+ this.tbList.clearAlert();
},
});
return true;
@@ -353,13 +351,16 @@ class Tb_order_class {
// ìƒì‚°ì˜¤ë”, 품목, ë„면번호, 거래처, 납기ì¼, 지시ì¼, 지시구분, 지시 수량, 단위, ìƒíƒœ, 작업순서, 비ê³
{ field:"check", title: "ì„ íƒ", width: 50, headerSort: false,formatter: tb_common_funtions.formatterCheckboxIcon,formatterParams: { checkval: "Y" },},
{ formatter: "rownum", title: "NO", width: 50 },
- { field: "WO_NO", title: "ìƒì‚°ì˜¤ë”", width: 100,cssClass: "editable-cell" },
+ { field: "WO_NO", title: "ìƒì‚°ì˜¤ë”", width: 100,editor:tb_custom_editor.upper,
+ editable: (cell) => {
+ const val = cell.getData();
+ return val._STATUS_ === "I";
+ }, },
{ field: "WO_SEQ", width: 50, visible: false },
{ field: "RSLT_NO", width: 50, visible: false },
- { field: "ITEM_CD", width: 50, visible: false },
- { field: "DEF_NO", width: 50, visible: false },
+ { field: "ITEM_CD", width: 100, title: "품목"},
{ field: "EMP_NO", width: 50, visible: false},
- { field: "ITEM_NM", visible: false },
+ { field: "ITEM_NM",title: "품목", width: 200,visible: false },
{ field: "DRAW_NO", title: "ë„면번호", width: 200, hozAlign: "start" },
{ field: "OP_CD", title: "ê³µì •", width: 50 },
{ field: "OP_NM", title: "ê³µì •", width: 50, visible: false },
@@ -367,7 +368,7 @@ class Tb_order_class {
title: "설비",
cssClass: "width-200",
columns: [
- { field: "FACLT_CD", width: 100 ,cssClass: "editable-cell" },
+ { field: "FACLT_CD", width: 100 , },
{ field: "FACLT_NM", width: 100 },
]},
{ field: "ORD_QTY",
@@ -394,48 +395,24 @@ class Tb_order_class {
title: "양품 수량",
width: 80,
formatter: "money",
+ hozAlign:"left",
formatterParams: { decimal: ",", precision: 0 },
editor: "input"
},
{
field: "RSLT_GRP",
- visible: false,
- },
- {
- field: "CODE_VAL",
title: "실ì 그룹",
width: 80,
+ cssClass: "user-list editable-cell",
+ editor: "list",
+ editorParams: { values: varsRSLT_GRP },
+ formatter: tb_common_funtions.formatterSelect,
+ formatterParams:{ values : varsRSLT_GRP },
},
{ field: "EMP_NM", title: "작업ìž", width: 100 ,cssClass: "editable-cell"},
- { field: "", title: "실ì 등ë¡ì‹œê°„", width: 120,cssClass: "editable-cell" },
- { field: "", title: "실ì ì¼ìž",width: 120,},
-
- // {
- // field: "DEF_QTY",
- // width: 100,
- // formatter: "money",
- // formatterParams: { decimal: ",", precision: 0 },
- // visible:false
- // },
- // { field: "WRK_DT", title: "작업 ì¼ìž", width: 80 }, //formatter mm-dd로
- // {
- // field: "ST_TM",
- // title: "시작 시간",
- // width: 120,
- // },
- // {
- // field: "ED_TM",
- // title: "종료 시간",
- // width: 120,
-
- // },
- // {
- // field: "",
- // title: "ê°€ë™ ì‹œê°„(ë¶„)",
- // width: 100,
- // formatter: this.runningTime,
- // },
+ { field: "MAKE_TM", title: "실ì 등ë¡ì‹œê°„", width: 120 },
+ { field: "WRK_DT", title: "실ì ì¼ìž",width: 120,},
];
const commonFieldData = {
headerSort: false,
@@ -519,15 +496,6 @@ class Tb_order_class {
this.putData && this.putData();
});
});
- //ìˆ˜ì •
- ["click", "keypress"].forEach((evt) => {
- this.updateBtn.addEventListener(evt, () => {
- this.orderModal(this.tbList.getSelectedRows()[0]._row);
- });
- });
-
- // FORM ì œì¶œ í´ë¦ì‹œ
- // document.querySelector("form[name=frmPrslt]").addEventListener("submit", orderPop.putData);
}
}
@@ -546,15 +514,15 @@ Tb_order_report.init();
* @Overview 모달 행 추가 함수
*/
-function addFormRow() {
- document.querySelector(".add-row-container").innerHTML += `
-
`;
+// }
diff --git a/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.php b/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.php
index 99114d9..e78ecef 100644
--- a/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.php
+++ b/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.php
@@ -89,7 +89,7 @@ include_once _SVC_INC_PATH_ . "/header.php";
@@ -113,7 +113,7 @@ include_once _SVC_INC_PATH_ . "/header.php";
ìƒì‚° 실ì
- ※ë”블í´ë¦í•˜ë©´ ìˆ˜ì •ì°½ì´ ì—´ë¦½ë‹ˆë‹¤.
+
@@ -126,10 +126,6 @@ include_once _SVC_INC_PATH_ . "/header.php";
ì‚ì œ
-
diff --git a/home_dir/www/ksvc/prod/reg_plan/reg_plan.js b/home_dir/www/ksvc/prod/reg_plan/reg_plan.js
index 3a80826..3c35e87 100644
--- a/home_dir/www/ksvc/prod/reg_plan/reg_plan.js
+++ b/home_dir/www/ksvc/prod/reg_plan/reg_plan.js
@@ -15,296 +15,98 @@ class Tb_main_class {
this.removeBtn = this.container.querySelector(".remove-btn");
}
+
+
+
+
+
+
manageData(data) {
- // let tempGRP = new Object();
- // let tempQTY = new Object();
- let tempArr = new Array();
+ // console.log(data);
- // for(let key in result){
- //
- // for (let i = 0; i <= result[key].length-1; i++) {
- // let temp = result[key][i];
- // let tempGRP = {};
- // tempGRP['WRK_TEAM'] = temp.WRK_TEAM // 설비팀
- // tempGRP['PLAN_FACLT_CD'] = temp.PLAN_FACLT_CD // 설비 코드
- // tempGRP['PLAN_SEQ'] = temp.PLAN_SEQ // group id로 쓸 변수
- // let date = temp.PLAN_DT.date.slice(0, 10);
- // console.log(tempGRP['PLAN_SEQ']);
- //
- // if (temp?.AM_PLAN_QTY !== null) {
- // tempGRP[`AM_PLAN_QTY_${date}`] = temp.ITEM_GRP
- // }
- // if (temp?.PM_PLAN_QTY !== null) {
- // tempGRP[`PM_PLAN_QTY_${date}`] = temp.ITEM_GRP
- // }
- // if (temp?.NI_PLAN_QTY !== null) {
- // tempGRP[`NI_PLAN_QTY_${date}`] = temp.ITEM_GRP
- // }
- // tempGRP['SEPER_ID'] = 'GRP';
- // tempGRP['SEPER'] = '그룹';
- // tempArr.push(tempGRP);
- //
- // }
- //
- //
- // }
+ let arr = new Array();
- // const newObj2 = {};
- // for (let i = 0; i < data.data.length; i++) {
- // let temp = data.data[i]
- // // console.log(temp);
- // let tempGRP = {};
- // let num = 0;
- // let date = temp.PLAN_DT.date.slice(0, 10);
- // tempGRP['WRK_TEAM'] = temp.WRK_TEAM
- // tempGRP['PLAN_FACLT_CD'] = temp.PLAN_FACLT_CD
- // tempGRP['PLAN_SEQ'] = temp.PLAN_SEQ
- // tempGRP['DATE'] = date
- // // if (temp?.AM_PLAN_QTY !== null) {
- // // tempQTY[`AM_PLAN_QTY_${date}`] = temp.AM_PLAN_QTY
- // // }
- // // if (temp?.PM_PLAN_QTY !== null) {
- // // tempQTY[`PM_PLAN_QTY_${date}`] = temp.PM_PLAN_QTY
- // // }
- // // if (temp?.NI_PLAN_QTY !== null) {
- // // tempQTY[`NI_PLAN_QTY_${date}`] = temp.NI_PLAN_QTY
- // // }
- // if (temp?.AM_PLAN_QTY !== null) {
- // tempGRP[`AM_PLAN_QTY`] = temp.AM_PLAN_QTY
- // }
- // if (temp?.PM_PLAN_QTY !== null) {
- // tempGRP[`PM_PLAN_QTY`] = temp.PM_PLAN_QTY
- // }
- // // if (temp?.NI_PLAN_QTY !== null) {
- // tempGRP[`NI_PLAN_QTY`] = temp.NI_PLAN_QTY
- // // }
- // tempGRP['SEPER_ID'] = 'PLAN';
- // tempGRP['SEPER'] = '계íš';
- // console.log(tempGRP);
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- // tempArr2.push(tempGRP);
- // }
+ const result = Object.groupBy(data.data, ({ SEQ_NO }) => SEQ_NO)
- // console.log(mergeObj(tempArr[0], tempArr[1], tempArr[2]));
- for (let i = 0; i < data.data.length; i++) {
- let temp = data.data[i];
- // console.log(temp);
- let tempQTY = {};
- let date = temp.PLAN_DT.date.slice(0, 10);
- tempQTY["WRK_TEAM"] = temp.WRK_TEAM;
- tempQTY["PLAN_FACLT_CD"] = temp.PLAN_FACLT_CD;
- tempQTY["PLAN_SEQ"] = temp.PLAN_SEQ;
- tempQTY["DATE"] = date;
- // if (temp?.AM_PLAN_QTY !== null) {
- // tempQTY[`AM_PLAN_QTY_${date}`] = temp.AM_PLAN_QTY
- // }
- // if (temp?.PM_PLAN_QTY !== null) {
- // tempQTY[`PM_PLAN_QTY_${date}`] = temp.PM_PLAN_QTY
- // }
- // if (temp?.NI_PLAN_QTY !== null) {
- // tempQTY[`NI_PLAN_QTY_${date}`] = temp.NI_PLAN_QTY
- // }
- if (temp?.AM_PLAN_QTY !== null) {
- tempQTY[`AM_PLAN_QTY`] = temp.ITEM_GRP;
- }
- if (temp?.PM_PLAN_QTY !== null) {
- tempQTY[`PM_PLAN_QTY`] = temp.ITEM_GRP;
- }
- if (temp?.NI_PLAN_QTY !== null) {
- tempQTY[`NI_PLAN_QTY`] = temp.ITEM_GRP;
- }
- tempQTY["SEPER_ID"] = "GRP";
- tempQTY["SEPER"] = "그룹";
- // console.log(temp);
- let tempGRP = {};
- tempGRP["WRK_TEAM"] = temp.WRK_TEAM;
- tempGRP["PLAN_FACLT_CD"] = temp.PLAN_FACLT_CD;
- tempGRP["PLAN_SEQ"] = temp.PLAN_SEQ;
- tempGRP["DATE"] = date;
- // if (temp?.AM_PLAN_QTY !== null) {
- // tempQTY[`AM_PLAN_QTY_${date}`] = temp.AM_PLAN_QTY
- // }
- // if (temp?.PM_PLAN_QTY !== null) {
- // tempQTY[`PM_PLAN_QTY_${date}`] = temp.PM_PLAN_QTY
- // }
- // if (temp?.NI_PLAN_QTY !== null) {
- // tempQTY[`NI_PLAN_QTY_${date}`] = temp.NI_PLAN_QTY
- // }
- if (temp?.AM_PLAN_QTY !== null) {
- tempGRP[`AM_PLAN_QTY`] = temp.AM_PLAN_QTY;
- }
- if (temp?.PM_PLAN_QTY !== null) {
- tempGRP[`PM_PLAN_QTY`] = temp.PM_PLAN_QTY;
- }
- if (temp?.NI_PLAN_QTY !== null) {
- tempGRP[`NI_PLAN_QTY`] = temp.NI_PLAN_QTY;
- }
- tempGRP["SEPER_ID"] = "PLAN";
- tempGRP["SEPER"] = "계íš";
- // console.log(tempGRP);
+ for(let i=0; i<=Object.values(result).length; i++){
+ // console.log(Object.values(result)[]);
+ let makingITEM = Object.values(result)[i]?.map(function(rst){
+ let tempITEM ={};
+ let date = rst.PLAN_DT.date.slice(0, 10);
+ let arr = new Array();
+ tempITEM['SEQ_NO'] = rst.SEQ_NO
+ tempITEM['PLAN_FACLT_CD'] = rst.PLAN_FACLT_CD
+ tempITEM['WRK_TEAM'] = rst.WRK_TEAM
+ tempITEM['SEPER'] = "그룹"
+ tempITEM[`AM_PLAN_QTY_${date}`] = rst.AMITEM
+ tempITEM[`PM_PLAN_QTY_${date}`] = rst.PMITEM
+ tempITEM[`NI_PLAN_QTY_${date}`] = rst.NIITEM
+ return tempITEM;
+ })
+
+ let makingQTY = Object.values(result)[i]?.map(function(rst){
+ let tempQTY ={};
+ let date = rst.PLAN_DT.date.slice(0, 10);
+ let arr = new Array();
+ tempQTY['SEQ_NO'] = rst.SEQ_NO
+ tempQTY['SEPER'] = "계íš"
+ tempQTY['PLAN_FACLT_CD'] = rst.PLAN_FACLT_CD
+ tempQTY['WRK_TEAM'] = rst.WRK_TEAM
+ tempQTY[`AM_PLAN_QTY_${date}`] = rst.AMQTY
+ tempQTY[`PM_PLAN_QTY_${date}`] = rst.PMQTY
+ tempQTY[`NI_PLAN_QTY_${date}`] = rst.NIQTY
+ return tempQTY;
+ })
+
+ let makingPRD = Object.values(result)[i]?.map(function(rst){
+ let tempPRD ={};
+ let date = rst.PLAN_DT.date.slice(0, 10);
+ let arr = new Array();
+ tempPRD['SEQ_NO'] = rst.SEQ_NO
+ tempPRD['SEPER'] = "실ì "
+ tempPRD['PLAN_FACLT_CD'] = rst.PLAN_FACLT_CD
+ tempPRD['WRK_TEAM'] = rst.WRK_TEAM
+ tempPRD[`AM_PLAN_QTY_${date}`] = rst.AMPRD
+ tempPRD[`PM_PLAN_QTY_${date}`] = rst.PMPRD
+ tempPRD[`NI_PLAN_QTY_${date}`] = rst.NIPRD
+ return tempPRD;
+ })
+
+ const sumObjItem = {};
+ const sumObjQty = {};
+ const sumObjPrd = {};
+
+
+ if(makingITEM !==undefined){
+ makingITEM.forEach(obj => {
+ Object.keys(obj).forEach(key => {
+ sumObjItem[key] = obj[key];
+ });
+ });
+
+ makingQTY.forEach(obj => {
+ Object.keys(obj).forEach(key => {
+ sumObjQty[key] = obj[key];
+ });
+ });
+
+ makingPRD.forEach(obj => {
+ Object.keys(obj).forEach(key => {
+ sumObjPrd[key] = obj[key];
+ });
+ });
+
+
+ arr.push(sumObjItem);
+ arr.push(sumObjQty);
+ arr.push(sumObjPrd);
+ }
- tempArr.push(tempQTY);
- tempArr.push(tempGRP);
}
- // console.log(tempArr);
- let makingData = Object.groupBy(tempArr, ({ SEPER_ID }) => SEPER_ID);
- const objects = [
- { id: 1, value: 10 },
- { id: 2, value: 20 },
- { id: 1, value: 30 },
- { id: 3, value: 40 },
- ];
-
- const mergedObjects3 = [];
-
- makingData["PLAN"].map((obj) => {
- const existingObjIndex = mergedObjects3.findIndex(
- (item) => item.PLAN_SEQ === obj.PLAN_SEQ
- );
- if (existingObjIndex !== -1) {
- if (obj.AM_PLAN_QTY !== undefined) {
- mergedObjects3[existingObjIndex].AM_PLAN_QTY = obj.AM_PLAN_QTY;
- }
- if (obj.PM_PLAN_QTY !== undefined) {
- mergedObjects3[existingObjIndex].PM_PLAN_QTY = obj.PM_PLAN_QTY;
- }
- if (obj.NI_PLAN_QTY !== undefined) {
- mergedObjects3[existingObjIndex].NI_PLAN_QTY = obj.NI_PLAN_QTY;
- }
-
- // mergedObjects3[existingObjIndex].AM_PLAN_QTY += obj.AM_PLAN_QTY;
- // mergedObjects3[existingObjIndex].PM_PLAN_QTY += obj.PM_PLAN_QTY;
- // mergedObjects3[existingObjIndex].NI_PLAN_QTY += obj.NI_PLAN_QTY;
- } else {
- mergedObjects3.push({ ...obj });
- }
- console.log(obj);
- });
-
- console.log(mergedObjects3);
-
- const mergedObjects4 = [];
- makingData["GRP"].map((obj) => {
- const existingObjIndex = mergedObjects4.findIndex(
- (item) => item.PLAN_SEQ === obj.PLAN_SEQ
- );
- if (existingObjIndex !== -1) {
- // let temp_PM = 'PM_PLAN_QTY_'+obj.DATE
- // let temp_NI = 'NI_PLAN_QTY_'+obj.DATE
- // let temp_AM = 'AM_PLAN_QTY_'+obj.DATE
-
- if (obj.AM_PLAN_QTY !== undefined) {
- mergedObjects4[existingObjIndex].AM_PLAN_QTY = obj.AM_PLAN_QTY;
- }
- if (obj.PM_PLAN_QTY !== undefined) {
- mergedObjects4[existingObjIndex].PM_PLAN_QTY = obj.PM_PLAN_QTY;
- }
- if (obj.NI_PLAN_QTY !== undefined) {
- mergedObjects4[existingObjIndex].NI_PLAN_QTY = obj.NI_PLAN_QTY;
- }
-
- // mergedObjects3[existingObjIndex].AM_PLAN_QTY += obj.AM_PLAN_QTY;
- // mergedObjects3[existingObjIndex].PM_PLAN_QTY += obj.PM_PLAN_QTY;
- // mergedObjects3[existingObjIndex].NI_PLAN_QTY += obj.NI_PLAN_QTY;
- } else {
- mergedObjects4.push({ ...obj });
- }
- });
- console.log(mergedObjects4);
-
- // const mergedObjects2 = makingData['GRP'].reduce((acc, obj) => {
- // const existingObj = acc.find(item => item.PLAN_SEQ === obj.PLAN_SEQ);
- // let temp_PM = 'PM_PLAN_QTY_'+obj.DATE
- // let temp_NI = 'NI_PLAN_QTY_'+obj.DATE
- // let temp_AM = 'AM_PLAN_QTY_'+obj.DATE
- //
- //
- //
- //
- // if (existingObj!== undefined) {
- //
- // if(existingObj[temp_AM]!== undefined){
- // existingObj[temp_AM] = obj.AM_PLAN_QTY;
- // }
- // if(obj.PM_PLAN_QTY !== undefined){
- // existingObj[temp_PM]= obj.PM_PLAN_QTY;
- //
- // }
- // if(obj.NI_PLAN_QTY !== undefined){
- // existingObj[temp_NI]= obj.NI_PLAN_QTY;
- // }
- //
- // } else {
- // acc.push({ ...obj });
- // }
- // return acc;
- // }, []);
- //
- // // console.log(mergedObjects2);
- //
- // const mergedObjects = makingData['PLAN'].reduce((acc, obj) => {
- // const existingObj = acc.find(item => item.PLAN_SEQ === obj.PLAN_SEQ);
- // let temp_AM = 'AM_PLAN_QTY_'+obj.DATE
- // let temp_PM = 'PM_PLAN_QTY_'+obj.DATE
- // let temp_NI = 'NI_PLAN_QTY_'+obj.DATE
- // // existingObj[temp_AM] = 1;
- // if(existingObj !== undefined ){
- // // console.log(existingObj);
- // if(obj.AM_PLAN_QTY !== undefined){
- //
- // // console.log(obj.AM_PLAN_QTY);
- // }
- //
- // }
- //
- // // console.log(existingObj[temp_AM]);
- // if (existingObj !== undefined ) {
- //
- // if(obj.AM_PLAN_QTY !== undefined){
- // // console.log('asdf');
- // existingObj[temp_AM]= obj.AM_PLAN_QTY;
- //
- // }
- // if(obj.PM_PLAN_QTY !== undefined){
- // existingObj[temp_PM]= obj.PM_PLAN_QTY;
- //
- // }
- // if(obj.NI_PLAN_QTY !== undefined){
- // existingObj[temp_NI]= obj.NI_PLAN_QTY;
- // }
- //
- // } else {
- // acc.push({ ...obj });
- // }
- // return acc;
- // }, []);
- //
- // // doubleArr.push(mergedObjects, mergedObjects2);
- //
- let newArr = mergedObjects4.concat(mergedObjects3);
- // let group = Object.groupBy(newArr,({PLAN_SEQ}) => PLAN_SEQ)
-
- // console.log(Object.values(group));
-
- return newArr;
+ return arr;
}
/*
@@ -318,7 +120,7 @@ class Tb_main_class {
let data = new Object();
for (let i = 0; i < arr.length; i++) {
let temp = [arr[i]];
- console.log();
+
if (document.getElementById(arr[i]).type == "checkbox") {
data[temp] = document.getElementById(temp).checked ? "Y" : "N";
} else {
@@ -332,8 +134,7 @@ class Tb_main_class {
data: data,
success: (data) => {
- console.log(data.code);
- console.table(data.data);
+
if (data.code) {
//DBì—서 받아온 ë°ì´í„° 가공하는 manageData 함수 참조
this.tbList.setData(this.manageData(data));
@@ -487,7 +288,7 @@ class Tb_main_class {
* @function _STATUS_ ê°’ì´ ìžˆëŠ” ë°ì´í„°ë§Œ ì¶”ë ¤ì„œ 없으면 ìƒì„±, 있으면 ìˆ˜ì •í•˜ê¸°
*/
putData() {
- console.log(this.tbList.getData());
+
// 기본키 중복 í™•ì¸ ë° ë°©ì§€
// _STATUS_ 있는 ë°ì´í„°ë§Œ ë“¤ê³ ì™€ì„œ PUT하기
}
@@ -510,7 +311,7 @@ class Tb_main_class {
let month = ("0" + (date.getMonth() + 1)).slice(-2); // Adding leading zero
let day = ("0" + date.getDate()).slice(-2); // Adding leading zero
let formattedDate = `${month}ì›” ${day}ì¼`;
- console.log(formattedDate);
+
columns.push({
title: formattedDate,
columns: [
@@ -541,6 +342,7 @@ class Tb_main_class {
width: 50,
editor: "input",
editable: (cell) => {
+ console.log(cell);
return cell.getRow().getPosition() / 3 !== 1;
},
},
@@ -583,7 +385,7 @@ class Tb_main_class {
// { groupId: this.lastGroupId, SEPER: "실ì " },
// ], //기본 ë°ì´í„°
columns: fields, //컬럼 ì„¤ì •
- groupBy: "PLAN_SEQ",
+ groupBy: "SEQ_NO",
columnDefaults: commonFieldData,
groupStartOpen: true,
});
diff --git a/home_dir/www/ksvc/prod/sts_order/sts_order.ajax.php b/home_dir/www/ksvc/prod/sts_order/sts_order.ajax.php
deleted file mode 100644
index e85b6bc..0000000
--- a/home_dir/www/ksvc/prod/sts_order/sts_order.ajax.php
+++ /dev/null
@@ -1,2 +0,0 @@
- { this.tbList.alert("Loading ...") }, 1000);
+ let arr = test;
+ // let testList = new Array();
+ let data = new Object();
+ for(let i=0; i < arr.length; i++){
+ let temp = [arr[i]]
+ console.log();
+ if(document.getElementById(arr[i])?.type !== "checkbox"){
+ data[temp] = document.getElementById(temp)?.value
+ }else{
+ data[temp] = document.getElementById(temp)?.checked?"Y":"N";
+ }
+ }
+ data.mode = mode
+ // let USEFLAG = document.getElementById("USE_FLG").checked?"Y":"N"; //사용여부
+ ajax_json({
+ url: this.ajaxUrl,
+ data: data,
+
+ success: (data) => {
+ if(data.code) {
+ console.log(data.data);
+ this.getCodeList(data.data)
+ }else{
+ kuls_alert(data.mesg);
+ }
+ },
+ error: (req, status, err) => {
+ kuls_alert(err.message);
+ },
+ complete: () => {
+ window.clearTimeout(talert);
+
+ // this.setFilter();
+ // this.tbList.getRows().forEach(row=>{
+ // row.getCell("WO_NO").getElement().addEventListener("click",(e)=>{
+ // this.rowClick(e,row);
+ // })
+ // });
+ },
+ });
+ return true;
+ },
+ getCodeList(temp) {
// ìž„ì˜ì˜ ë°ì´í„° ì§ì ‘ ìž…ë ¥ [ë°ì´í„° ì´ë ‡ê²Œ php로 ì „ì²˜ë¦¬...]
+ console.log(temp);
-
- let temp = [
- {ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 1, ê³µì • : '소재', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 2, ê³µì • : 'M', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 4, ê³µì • : 'G', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 3, ê³µì • : 'F', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
- // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
- // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
- // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 6, ê³µì • : 'M', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
-
- ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 1, ê³µì • : '소재', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 2, ê³µì • : 'M', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 4, ê³µì • : 'G', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 3, ê³µì • : 'F', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 6, ê³µì • : 'M', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 1, ê³µì • : '소재', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 2, ê³µì • : 'M', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 4, ê³µì • : 'G', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
- ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 3, ê³µì • : 'F', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
-
-
- ];
+ // let temp = [
+ // {ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 1, ê³µì • : '소재', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 2, ê³µì • : 'M', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 4, ê³µì • : 'G', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 3, ê³µì • : 'F', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P00000', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 1, ê³µì • : '소재', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ // // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ // // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ // // ,{ìƒì‚°ì˜¤ë”: 'P15998', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 6, ê³µì • : 'M', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'최창í¬'}
+ //
+ // ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 2, ê³µì • : 'M', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 4, ê³µì • : 'G', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 3, ê³µì • : 'F', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 5, ê³µì • : 'H', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 6, ê³µì • : 'M', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 1, ê³µì • : '소재', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 2, ê³µì • : 'M', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 4, ê³µì • : 'G', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
+ // ,{ìƒì‚°ì˜¤ë”: 'P15968', 등ë¡ì¼: '2023.01.02', 품목:'PT01105', ë„면번호:'P9900021580/000', 업체명:'현대로보틱스', íŒë§¤ì˜¤ë”수량:"(20)", 납기ì¼:'2023.01.27', 작업순서: 1, ê³µì •ìˆœì„œ : 3, ê³µì • : 'F', 계íšìˆ˜ëŸ‰ : 20, 실ì 수량 : 20, 투입시간: '01.27 15:00', 종료시간 :'01.27 15:00', 예ìƒì¢…료시간 :'01.27 18:00', 설비:'L5', ìž‘ì—…ìž :'ì´ì°½í¬'}
+ //
+ //
+ // ];
let realTemp = [];
- console.log(Object.values(Object.groupBy(temp,( {ìƒì‚°ì˜¤ë”} )=>ìƒì‚°ì˜¤ë”)));
- let group = Object.values(Object.groupBy(temp,( {ìƒì‚°ì˜¤ë”} )=>ìƒì‚°ì˜¤ë”));
+ console.log(Object.values(Object.groupBy(temp,( {WO_NO} )=>WO_NO)));
+ let group = Object.values(Object.groupBy(temp,( {WO_NO,WO_SEQ} )=>WO_NO && WO_SEQ));
for(let i = 0; i < group.length; i++){
- // delete group[i][0].계íšìˆ˜ëŸ‰;
-
- // delete group[i][0].실ì 수량;
- // delete group[i][0].투입시간;
- // delete group[i][0].종료시간;
- // delete group[i][0].예ìƒì¢…료시간;
- // delete group[i][0].설비;
- // delete group[i][0].작업ìž;
- group[i][0].ê³µì • = group[i].map(function(element){
+ group[i][0].OP_CD = group[i].map(function(element){
return {
- ê³µì •ëª…: element.ê³µì • ,
- 계íšìˆ˜ëŸ‰: element.계íšìˆ˜ëŸ‰,
- 실ì 수량 : element.실ì 수량,
- 투입시간:element.투입시간,
- 종료시간 : element.종료시간,
- 예ìƒì¢…료시간 : element.예ìƒì¢…료시간 ,
- 설비: element.설비,
- 작업ìž: element.ìž‘ì—…ìž }
+ OP_CD: element?.OP_CD ,
+ 계íšìˆ˜ëŸ‰: element?.계íšìˆ˜ëŸ‰,
+ PRD_QTY : element?.PRD_QTY,
+ ST_TM:element?.ST_TM,
+ ED_TM : element?.ED_TM,
+ 예ìƒì¢…료시간 : element?.예ìƒì¢…료시간 ,
+ FACLT_CD: element?.FACLT_CD,
+ EMP_NM: element?.EMP_NM }
});
console.log(group[i][0]);
diff --git a/home_dir/www/ksvc/prod/sts_order/sts_order.php b/home_dir/www/ksvc/prod/sts_order/sts_order.php
index 7a46b0c..7630617 100644
--- a/home_dir/www/ksvc/prod/sts_order/sts_order.php
+++ b/home_dir/www/ksvc/prod/sts_order/sts_order.php
@@ -100,7 +100,7 @@ include_once _SVC_INC_PATH_ . "/header.php";
@@ -156,29 +156,29 @@ include_once _SVC_INC_PATH_ . "/header.php";
- {{code.ìƒì‚°ì˜¤ë”}} {{code.등ë¡ì¼}} |
- {{code.품목}} {{code.ë„면번호}} {{code.업체명}} |
- {{code.납기ì¼}} |
- {{code.작업순서}} |
+ {{code?.WO_NO}} {{code?.ORD_DT.date}} |
+ {{code?.ITEM_CD}} {{code?.DRAW_NO}} {{code?.BP_CD}} |
+ {{code?.DLVY_REQ_DT.date}} |
+ {{code?.WO_SEQ}} |
{{code.완료}} |
- {{ process?.ê³µì •ëª… }} |
+ {{ process?.OP_CD }} |
|
- {{ n % 2 === 0 ? code['ê³µì •'][n/2-1]?.실ì 수량 : code['ê³µì •'][(n-1)/2]?.계íšìˆ˜ëŸ‰ }}
+ {{ n % 2 === 0 ? code['OP_CD'][n/2-1]?.PRD_QTY : code['OP_CD'][(n-1)/2]?.PLAN_QTY }}
|
|
- {{ n % 2 === 0 ? code['ê³µì •'][n/2-1]?.종료시간 : code['ê³µì •'][(n-1)/2]?.투입시간 }}
+ {{ n % 2 === 0 ? code['OP_CD'][n/2-1]?.ED_TM : code['OP_CD'][(n-1)/2]?.ST_TM }}
|
- | {{ process?.예ìƒì¢…료시간 }} |
+ {{ process?.예ìƒì¢…료시간 }} |
|
- {{ n % 2 === 0 ? code['ê³µì •'][n/2-1]?.ìž‘ì—…ìž : code['ê³µì •'][(n-1)/2]?.설비 }}
+ {{ n % 2 === 0 ? code['OP_CD'][n/2-1]?.EMP_NM : code['OP_CD'][(n-1)/2]?.FACLT_CD }}
|
diff --git a/home_dir/www/ksvc/site/sts_order_prod/popComponent/sts_order_pop_util.inc.php b/home_dir/www/ksvc/site/sts_order_prod/popComponent/sts_order_pop_util.inc.php
new file mode 100644
index 0000000..9579a68
--- /dev/null
+++ b/home_dir/www/ksvc/site/sts_order_prod/popComponent/sts_order_pop_util.inc.php
@@ -0,0 +1,59 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js b/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js
index d5338e8..2188600 100644
--- a/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js
+++ b/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.js
@@ -1,15 +1,22 @@
class SimpleTable {
- constructor(fields){
+ constructor(fields, getmode, putmode){
this.field = fields;
this.ajaxUrl = './reg_prod_result.ajax.php';
+ this.getmode = getmode?getmode:'';
+ this.putmode = putmode?putmode:'';
this.container = document.querySelector(".detail-contents");
- console.log(this.container)
this.table = this.container?.querySelector(".hy-table");
}
- getMainList(){}
+ getMainList(){
+ // ajax_json({
+
+ // })
+ }
addRow(){}
- putData(){}
+ putData(){
+ // ajax_json({})
+ }
init(){
const commonFieldData = {
headerSort: false,
@@ -90,6 +97,7 @@ class FieldPop {
},
isComponent : {
+ isDefHst : false,
isWorker : false,
isFacility : false,
isFacltBreak : false,
@@ -104,8 +112,23 @@ class FieldPop {
isInsp: true,
isFile: false
},
+
+ tabs1: [ '작업표준서 조회', 'ë„ë©´ 조회' ], //popup ë„우기
+
+ tabs2: [{ isDefHst : '과거불량ì´ë ¥ 조회' }, { isFacltBreak : '설비 ê³ ìž¥ë“±ë¡' }, {isRun : 'ê°€ë™'}, {isNoRun : '비가ë™'} ],
+
+ activeTab : '',
tableField : {
+ isDefHst : [
+ { field: "DEF_NO", formatter:"rownum", title: "순번", width: 50},
+ { field: "DEF_FACLT_CD", title: "설비", width: '23%'},
+ { field: "DEF_CD", title: "불량ì›ì¸", width: '23%'},
+ { field: "DEF_QTY", title: "불량수량", width: '23%'},
+ { field: "DEF_PRICE", title: "불량단가", width: '23%'},
+
+
+ ],
isWorker : [
{ field: "", formatter:"rownum", title: "순번", width: 50},
{ field: "", title: "실ì ë“±ë¡ ì‹œê°„", minWidth: 150, width:'26%'},
@@ -115,10 +138,10 @@ class FieldPop {
],
isFacility : [
{ field: "", formatter:"rownum", title: "순번", width: 50},
- { field: "", title: "설비코드", minWidth: 100, width:'16%'},
- { field: "", title: "설비명", minWidth: 150, width:'22%'},
- { field: "", title: "소ì†", minWidth: 80, width:'15%'},
- { field: "", title: "ìƒíƒœ", minWidth: 80, width:'15%'},
+ { field: "", title: "설비코드", minWidth: 80, width:'14%'},
+ { field: "", title: "설비명", minWidth: 150, width:'26%'},
+ { field: "", title: "소ì†", minWidth: 80, width:'14%'},
+ { field: "", title: "ìƒíƒœ", minWidth: 80, width:'14%'},
{ field: "", title: "ê°€ë™
시작시간", minWidth: 120, width:'23%'}
],
isFacltBreak : [
@@ -171,7 +194,13 @@ class FieldPop {
{ field: "", title: "1", width: 50},
{ field: "", title: "2", width: 50},
{ field: "", title: "3", width: 50},
-
+ { field: "", title: "4", width: 50},
+ { field: "", title: "5", width: 50},
+ { field: "", title: "6", width: 50},
+ { field: "", title: "7", width: 50},
+ { field: "", title: "8", width: 50},
+ { field: "", title: "9", width: 50},
+ { field: "", title: "10", width: 50},
]
},
],
@@ -188,6 +217,7 @@ class FieldPop {
},
mounted() {
+ this.showComponent('isWorker');
},
computed: {
@@ -208,21 +238,64 @@ class FieldPop {
callTable(com){
this.$nextTick(()=>{
- console.log(com)
+ // 여기서 mode 명 ë™ì 으로 ì •ì˜í• 것 (comì„ ì‚¬ìš©)
+ const getmode = '';
+ const putmode = '';
- const table = new SimpleTable(this.tableField[com]);
+ const table = new SimpleTable(this.tableField[com], getmode, putmode);
table.init();
})
},
-
+ // openDrawPop(){
+ // const process = data['OP_CD'][idx]
+ // const bindingData = {
+ // WO_NO: data['WO_NO'],
+ // // ìƒíƒœ: data[ìƒíƒœ],
+ // DRAW_NO: data['DRAW_NO'],
+ // ITEM_CD: data['ITEM_CD'],
+ // OP_CD: process['OP_CD'],
+ // EMP_NO: process['EMP_NO'],
+ // FACLT_CD: process['FACLT_CD'],
+ // ED_TM: process['ED_TM'],
+ // PRD_QTY: process['PRD_QTY'],
+ // }
+ // console.log(bindingData)
+ // const pop = new FieldPop(bindingData);
+ // pop.init();
+ // },
+ // openGuide(){
+ // const process = data['OP_CD'][idx]
+ // const bindingData = {
+ // WO_NO: data['WO_NO'],
+ // // ìƒíƒœ: data[ìƒíƒœ],
+ // DRAW_NO: data['DRAW_NO'],
+ // ITEM_CD: data['ITEM_CD'],
+ // OP_CD: process['OP_CD'],
+ // EMP_NO: process['EMP_NO'],
+ // FACLT_CD: process['FACLT_CD'],
+ // ED_TM: process['ED_TM'],
+ // PRD_QTY: process['PRD_QTY'],
+ // }
+ // console.log(bindingData)
+ // const pop = new FieldPop(bindingData);
+ // pop.init();
+ // },
// í´ë¦ì‹œ ì»´í¬ë„ŒíЏ ìƒì„± ë° ì‚ì œë¡œ 페ì´ì§€ ë ˆì´ì•„웃 변경
- showComponent(com) {
+ showComponent(com, tab) {
+ this.activeTab = tab;
+
Object.keys(this.isComponent).map((key)=>{
this.isComponent[key] = com == key ? true : false;
});
+ if(com=='isInsp'){
+ this.isTab = {
+ isInsp: true,
+ isFile: false
+ }
+ };
this.callTable(com);
},
@@ -248,5 +321,5 @@ class FieldPop {
}).mount('#popup_field')
}
+}
-}
\ No newline at end of file
diff --git a/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.php b/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.php
index 6264a11..dace372 100644
--- a/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.php
+++ b/home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.php
@@ -13,25 +13,26 @@ include_once "{$_SERVER['DOCUMENT_ROOT']}/common.inc.php";