...

2022-11-28 15:35:55 +09:00
parent 78bf436089
commit 7c23db2ee1
8 changed files with 2221 additions and 2204 deletions
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("22.11.28.1100")]
-[assembly: AssemblyFileVersion("22.11.28.1100")]
+[assembly: AssemblyVersion("22.11.28.1530")]
+[assembly: AssemblyFileVersion("22.11.28.1530")]
--- a/Project/fMain.resx
+++ b/Project/fMain.resx
@@ -450,16 +450,16 @@
  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
-        h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84XqLzg2GJpidQ83UU8aVaT4CGSkB1QcFSLRuQpMBay/9+
-        J3P+p1yu/597suL/vDnxH2p25v9LvdzwP/Jc2X/VbV5QQ7T7oDqhYJnOBP415sdyrrd/K77V87/kZs//
-        QzNz/j/qTPt/dVLmT5AYDJvsCTsBdN01qE4oWKorWHyruw6mqONQ/f/rpRH/77Ym/r1e6PW5Z1sh3IDi
-        W10XQOqhOhGg+Gb3XJiiyksdy84Xhhy8nO7x7WKQ2v9tFU57i290fQTJFd7seQfVggpgLii62VMC4r9o
-        jRB/XOb5/3aG1Z8n2TZqhTd79YG2fy661XMerAEdFN/pMQbachzKZXhc7On5qNTjPxiXeHmAxICuLAVa
-        1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/Ee6F
-        Uo8NUGHiwP/99Rwvu6JOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/QewZI/wbS/5ExVAwk1/d/f48G
-        VBtQ47aJ7EDB+X/3df9D14QLg9T+PdAzD6SX4e/+3l5siojBIL1Ap/fZAk1bDhRYRQoG6fl3oM8WAB0F
-        rC9gZdVAAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
+        h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
+        /U7m/E+5XP8/92TF/3lz4j7U7Mj/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPZV9r+1Z8q+d/yc2e
+        /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf/vtCb8vV7o9blnWyHc
+        gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc5v7tYpDa/20VTnuLr3d+BMkV3Ox5B9WCCmAuKLrZUwLi
+        v2iNEH9c5vn/VoblnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu
+        LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/
+        Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bPgd7fQPo/MoaKnQGr
+        2d+jAdUG1LhtIjtQcP6fvV3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz
+        BQDgIKwUgNNiRgAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
--- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
+++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
@@ -128,7 +128,11 @@ namespace FPJ0000.OtConfirm
                tbCate.DropDownStyle = ComboBoxStyle.DropDownList;
            }

+            
+
            binit = true;
+
+                cmbUser_SelectedIndexChanged(null, null);
        }

        private void button1_Click(object sender, EventArgs e)
@@ -205,7 +209,7 @@ namespace FPJ0000.OtConfirm
                    var 발생 = float.Parse(data[3]);
                    var 사용 = float.Parse(data[4]);
                    var 잔량 = float.Parse(data[5]);
-                    if (vTime < 잔량) oktime = true;
+                    if (vTime <= 잔량) oktime = true;
                    else minmsg = minmsg.Replace("{1}", 잔량.ToString());
                }
                else minmsg = minmsg.Replace("{1}", "(자료없음)");
@@ -220,7 +224,7 @@ namespace FPJ0000.OtConfirm
                    var 발생 = float.Parse(data[0]);
                    var 사용 = float.Parse(data[1]);
                    var 잔량 = float.Parse(data[2]);
-                    if (vDay < 잔량) oktime = true;
+                    if (vDay <= 잔량) oktime = true;
                    else minmsg = minmsg.Replace("{1}", 잔량.ToString());
                }
                else minmsg = minmsg.Replace("{1}", "(자료없음)");
@@ -420,11 +424,15 @@ namespace FPJ0000.OtConfirm

        Dictionary<string, string> holydata = new Dictionary<string, string>();

+        string updateuserinfo = string.Empty;
        private void cmbUser_SelectedIndexChanged(object sender, EventArgs e)
        {
            var uiddt = this.cmbUser.SelectedValue;
            if (uiddt == null) return;
            var uid = uiddt.ToString();
+            if (uid.isEmpty()) return;
+
+            
            holydata = FCOMMON.DBM.GetUserHolidayJan(FCOMMON.info.Login.gcode, uid, DateTime.Now.AddDays(-1).ToShortDateString());

            this.richTextBox1.Clear();
@@ -447,6 +455,8 @@ namespace FPJ0000.OtConfirm
                }

            }
+            if(holydata.Any())
+                updateuserinfo = uid; //업데이트한 사용자 id 기록
        }
    }
 }
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs
@@ -200,6 +200,7 @@ namespace FPJ0000
                var value_supply = string.Empty;
                if (db_supply != null) value_supply = db_supply.ToString().Trim();
                var value_poready = this.fpSpread1.ActiveSheet.GetValue(i, col_poReady);
+          //      var value_sid = this.fpSpread1.ActiveSheet.GetValue(i, col_sid).ToString();

                Boolean bPR = false;
                Boolean bPO = false;
@@ -249,7 +250,7 @@ namespace FPJ0000
                        {
                            구매요청건C += 1;
                            row.ForeColor = Color.Black;
-                            row.BackColor = Color.LightSkyBlue;
+                  
                        }
                    }
                    else if (bPO == false) //PO 입력대기 (발주완율)
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx
+++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx
@@ -331,20 +331,20 @@
  <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL0pzNjWw
-        m6mYeZtzaGqiC4NsMSeZl9JEhQpRil5UaBed2tQ553TDLTKXqem8C16Wuss5ujP99pyzpQZCP/jwvHjO
-        98P5fc/hsSO4r0m4VKJXRZTqf4fI9BQ5aY4y9jTQESV9dNhjnfmsVFvhF/l2HxfaPaGFPdpFG71sNpvd
-        Vsc6rPYdlm0sNH7O25D/aRoxpcNOYYZyvzfqmfAi3SIb7pt0wTDFwDDNQD/JQDexAc2vdbQOObDOAE3D
-        FPI/TCH5mZn6RxIia6XWnBswzbjxdYYhJ4N+TrKB7rF1fBlyEsEmTPNuGOZcUCinEXSv8w0Xji4LtNyQ
-        RW6Jq68hueo6qtrqUdBQhiCZPwIJQsUZCOQnUd5Uzq1ipxksrDghiO9mOEFUSdD7zsFmNI++RJU+l5PE
-        V4Yh93UcMutjIKq5jKSaJDQNLKDZbMfn72tYJT2FyHtoTiCsEO73k2W59SNdeDUoR7Emg5MkVIeT8BVI
-        nqdCO+bgVukYpaAiPaw4XAgp6PUI2Akt6qazaxNhHNOhxnAXj9pzEF12AQmVkTBOOmEkxbIFa8c9nViJ
-        QCDfJTj3QOY6lXcYcRVCmMb7oOhKg1yZjZgnwajXfMS3WQZGUmzfhAu9hEWbC0EPvYLjUh8xX3oImXWx
-        uFkditjyi5wkWxkHaUMqeZNgsPemaTf62U9MsJEiA7J0HgFfemCWLz1IHvIBP9cHV4uDkf4iEdohFRSq
-        PKS9S4SoOgpGIjCQf0NPBLRrkwg0Oyucz+qh51dpDMy6ObpH5nCnVoIUEhTXxCCn7vb2HYtzw00EjTsC
-        1jZj3RH8Dwe7QuouwelstVNW+HRrr4f3Qq1Wbx6Nb7J746RISbtlas1pYy8sSxQsixTGvCzZXRxs83ba
-        E6YoatX3VssPb5zHOyFpSw8QtbYfE6usAeJGepsUD/5/ETXSvqKWlSNJLR3+icpkHo/H+wPRHp3K4syh
-        yAAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL0pTmxrY
+        zVTMdDqnaGpDFwbZYi4ydaGJChWiFL2o0C46talzzumGW2QuU5v3C3hZ6i7n6M7023POlhoI/eDD8+I5
+        3w/n9z2Hx07YfW3ypVKDOrrM8DtcZqDISXMo2dNIR5f20ZFP9JazUl1FQMzbfVxo90Q86tEt2ulli8Xi
+        sTnXYXPssGxnofFz3o7CT9OILxt2CbJV+31R70QV6xfZcN+kG8YpBsZpBoZJBvqJDWh/raN1yIl1Bmga
+        plD4YQqpzyzUP5JwWSu15tqAecaDrzMMORn0c5INdFvX8WXIRQSbMM97YJxzQ6GaRsi9zjdcOE4ZPH5D
+        FrMlrr6G1KrrqGqrR1GDEiGyQAQTBIozCJOfRHlTObeKg2awsOJCWFI3wwliS0Pedw42o3n0JaoM+Zwk
+        qTIS+a8TkVMfD1HNZaTUpKBpYAHNFgc+f1/DKukpXN5DcwJBhWB/gCzXYxjpwqtBOUq02ZwkuTqKhK8g
+        43k6dFYnt0rHKAU16WHF6UZ4Ua9XwE5EcTctqRXCZNWjxngXj9vzEKe8gOTKGJgmXTCRYtmCdWPeTmxE
+        ECbfJTj3QOY+VXAYiRUCmMf6oOjKhFwlQfzTUNRrP+LbLAMTKbZvwo1ewqLdjZCHPsFxqZ+YLz2EnLoE
+        3KyOQEL5RU4iUSVC2pBO3iQU7L152oN+9hMT7KTIoFy9V8CXHpjlSw+Sh/zAz/fD1ZJQZL0QQjekhkJd
+        gMx3QoiqY2EiAiP5NwxEQLs3iUC7s8L53B56fpXGwKyHo3tkDndqM5BGguKaeOTV3d6+Y3FteIigcUfA
+        2mZsO4L/4WRXSN8lOC3RuGRFyq29Ht4LjUazeTSpyeGLkyIz2sen1lx29mJ8icL4IgWrjyWHm4Nt3kF7
+        wxRFrfrfavnhi/N4JzLasoJEre3HxGpbkLiR3ibNS+BfRI20v6hl5UhKS0egUJXK4/F4fwDOPJ3GTY2P
+        twAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/SubProject/FPJ0000/Project/fPartList.cs
+++ b/SubProject/FPJ0000/Project/fPartList.cs
@@ -221,6 +221,7 @@ namespace FPJ0000
                var db_cancel = this.fpSpread1.ActiveSheet.GetValue(i, col_cancel);
                var db_supply = this.fpSpread1.ActiveSheet.GetValue(i, col_supply);
                var value_supply = string.Empty;
+                var value_sid = this.fpSpread1.ActiveSheet.GetValue(i, col_sid);
                if (db_supply != null) value_supply = db_supply.ToString().Trim();

                Boolean b_cancel = false;
@@ -267,7 +268,12 @@ namespace FPJ0000
                        {
                            구매요청 += 1;
                            row.ForeColor = Color.Black;
-                            row.BackColor = Color.SkyBlue;
+
+                            if (value_sid == null || value_sid.ToString().isEmpty()) row.BackColor = Color.CornflowerBlue;
+                            else row.BackColor = Color.LightSkyBlue;
+
+
+                            //row.BackColor = Color.SkyBlue;
                        }
                    }
                    else if (bPO == false)