From 6c0ce8ec616ccdcd535ce84d45b92e030936869c Mon Sep 17 00:00:00 2001
From: sychoi <sychoi@kuls.co.kr>
Date: Fri, 26 Apr 2024 17:18:21 +0900
Subject: [PATCH] first commit

---
 home_dir/www/ksvc/inc/js/popup.js                   | 13 ++++++++-----
 .../ksvc/prod/reg_order_result/reg_order_result.js  | 10 ++++++----
 .../ksvc/prod/reg_order_result/reg_order_result.php |  8 ++++----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/home_dir/www/ksvc/inc/js/popup.js b/home_dir/www/ksvc/inc/js/popup.js
index 2798834..ddb2c01 100644
--- a/home_dir/www/ksvc/inc/js/popup.js
+++ b/home_dir/www/ksvc/inc/js/popup.js
@@ -720,8 +720,10 @@ const popRegOrder = function( columns, tabrow ){
     { field: "ITEM_CD",   title: "품목",      width: 100, },
     { field: "ITEM_NM",   title: "품명",      width: 100, },
     { field: "DRAW_NO",   title: "도면번호",      width: 100, },
-    { field: "PRV_OP_CD",   title: "이전공정",      width: 100, },
-    { field: "ORD_QTY", title: "지시수량", width: 150, formatter: "money", formatterParams: { decimal: ",", precision: 0 } },
+    { field: "PRV_OP_CD", title: "이전공정", width: 100, },
+    { field: "MAKE_TM",   title: "등록시간", width: 100, },
+    { field: "FACLT_CD",  title: "설비", width: 100, }, 
+    { field: "ORD_QTY",   title: "지시수량", width: 150, formatter: "money", formatterParams: { decimal: ",", precision: 0 } },
     { field: "OP_WRK_QTY", title: "이전공정양품",  width: 100, formatter: "money", formatterParams: { decimal: ",", precision: 0 } }
   ];
   
@@ -751,9 +753,10 @@ const popRegOrder = function( columns, tabrow ){
  */
 const popRegFacility = function( columns, tabrow ){
   const fields = [
-    { formatter:"rownum",       title: "No",         width: 50,  headerSort: false, hozAlign:'center', },
-    { field: "FACLT_CD",        title: "설비코드",   width: 150, },
-    { field: "FACLT_NM",        title: "설비명",     width: 150, },
+    { formatter:"rownum",       title: "No",       width: 50,  headerSort: false, hozAlign:'center', },
+    { field: "FACLT_CD",        title: "설비코드" , width: 150, },
+    { field: "FACLT_NM",        title: "설비명"   , width: 150, },
+    { field: "OP_CD" ,          title:"공정"       ,width:100}
   ];
 
   const setTableFilter = function(modal){ //검색어 필터 적용
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 dd1da0a..fc20847 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
@@ -262,7 +262,9 @@ 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'
         },tgt.getRow())
       break;
       case "FACLT_CD":
@@ -356,10 +358,10 @@ class Tb_order_class {
       { field: "WO_NO", title: "생산오더", width: 100,cssClass: "editable-cell" },
       { field: "WO_SEQ", width: 50, visible: false },
       { field: "RSLT_NO", width: 50, visible: false },
-      { field: "ITEM_CD", width: 50, visible: false },
+      { field: "ITEM_CD", width: 100, title: "품목"},
       { field: "DEF_NO", width: 50, visible: false },
       { 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 },
@@ -413,7 +415,7 @@ class Tb_order_class {
       },
 
       { field: "EMP_NM", title: "작업자", width: 100 ,cssClass: "editable-cell"},
-      { field: "", title: "실적등록시간", width: 120,cssClass: "editable-cell" },
+      { field: "MAKE_TM", title: "실적등록시간", width: 120 },
       { field: "", title: "실적일자",width: 120,},
 
       // {
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..45b1ccd 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
@@ -113,7 +113,7 @@ include_once _SVC_INC_PATH_ . "/header.php";
             <div class="table-title">
               <p class="title">
                 생산 실적
-                <span> ※더블클릭하면 수정창이 열립니다.</span>
+                <!-- <span> ※더블클릭하면 수정창이 열립니다.</span> -->
               </p>
 
               <!-- 버튼 -->
@@ -126,10 +126,10 @@ include_once _SVC_INC_PATH_ . "/header.php";
                   <?php include _SVC_INC_PATH_ . '/img/delete.php' ?>
                   삭제
                 </button>
-                <button class="update-btn reverse-btn disabled-btn" disabled>
-                  <?php include _SVC_INC_PATH_ . '/img/update.php' ?>
+                <!-- <button class="update-btn reverse-btn disabled-btn" disabled>
+                  
                   수정
-                </button>
+                </button> -->
               </div>
               <!-- 버튼 종료 // -->