..

2021-07-16 13:53:52 +09:00
parent 7b7c5d1f4f
commit 9e64a0d603
37 changed files with 2215 additions and 140 deletions
--- a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs
+++ b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs
@@ -95,7 +95,7 @@
            this.cmbPlant = new System.Windows.Forms.ComboBox();
            this.label6 = new System.Windows.Forms.Label();
            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
+            this.btImport = new System.Windows.Forms.ToolStripButton();
            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
            this.toolStripButton2 = new System.Windows.Forms.ToolStripDropDownButton();
            this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
@@ -720,7 +720,7 @@
            // 
            this.toolStrip1.AutoSize = false;
            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripButton5,
+            this.btImport,
            this.toolStripSeparator3,
            this.toolStripButton2,
            this.toolStripButton4,
@@ -736,14 +736,14 @@
            this.toolStrip1.TabIndex = 3;
            this.toolStrip1.Text = "toolStrip1";
            // 
-            // toolStripButton5
+            // btImport
            // 
-            this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
-            this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton5.Name = "toolStripButton5";
-            this.toolStripButton5.Size = new System.Drawing.Size(63, 27);
-            this.toolStripButton5.Text = "Import";
-            this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
+            this.btImport.Image = ((System.Drawing.Image)(resources.GetObject("btImport.Image")));
+            this.btImport.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btImport.Name = "btImport";
+            this.btImport.Size = new System.Drawing.Size(63, 27);
+            this.btImport.Text = "Import";
+            this.btImport.Click += new System.EventHandler(this.toolStripButton5_Click);
            // 
            // toolStripSeparator3
            // 
@@ -988,7 +988,7 @@
        private System.Windows.Forms.ToolStripButton btFind;
        private System.Windows.Forms.ToolStrip toolStrip1;
        private System.Windows.Forms.ToolStripButton toolStripButton4;
-        private System.Windows.Forms.ToolStripButton toolStripButton5;
+        private System.Windows.Forms.ToolStripButton btImport;
        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
        private System.Windows.Forms.ToolStripButton btRefresh;
        private System.Windows.Forms.ToolStripComboBox cmbDate;
--- a/SubProject/FEQ0000/Equipment/fEquipment.resx
+++ b/SubProject/FEQ0000/Equipment/fEquipment.resx
@@ -264,7 +264,7 @@
  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>662, 17</value>
  </metadata>
-  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC7SURBVDhPY8AFvCu2KMV3H9sMwiA2VJh4EFCxxbh+1ZP/
@@ -276,12 +276,12 @@
  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95rSQFq1rqoi3dmi
-        laaCRJ0U1J26ak2TVX5BShaC6NIHhTH3OlMa8zB64MBlzv3OMDAkS5yTlfF5SR9b5TrM4riYAPBGqjnz
-        m3OwN1LMwiW6rq+6bO0s9Lfn/KXPwTDDGWRiLV0I23F4ucSxlWFmCQTeFR2G/k4CloYS2Ek8B9/MVDMP
-        loadKaODRQkMU5sOisDSWBIxWDKxyloYbH3K8OF2lzcbVZz7XY2f9mo4N4wqZnLvKTj8eLyobBLnMl5w
-        d93ihig4PtL4Sfe7wDDW+f1NK15gVTbwGS6j7ddZ+02Gvxl2gUFYymXq3nPQeU8Dlp0KS7k23c8rgQwu
-        EuvpyipBOMrEWr5+lvwJlvKYcgDgv2AQfJKJVao50T9Z/LqECPkCQFvo8kh4xsQAAAAASUVORK5CYII=
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95piIKlSV1URd7Zo
+        pakgUScFdaeuWtNklV8Q20Wh6NIHhTH3OlMa8zB64MBlzv3OMDAkS5yTlcFFSR/Y5S2YxXExAeD3VSsM
+        zDnY7ytW4RJd11c9tnY+Drbn/KXDwTDDGWRiLV0IO3F4ucR1lF5mCQT+Ne2Ng50ELA0lsJN4Dr6ZqVYe
+        LA07I0a7ixIYRg7tFoGlsSRisGRol7VJWP+U4ePdLq+bVZw7LY2ftWs4m0YVM7k3DQ8/ni4rm8S9ihfc
+        3zS4IQpOjjV+2vouMIx1/nDbiBfYlQ18hsdo8/W5+SbD3wy7wCAs5TF1bxYevacBy06FpTyH7ueVQAYX
+        ifV0ZZUgHGViLV8/S/4ES/lMOQDwXzAIPsnQLtXc6J8sfl1ChHwB8t3o2JbHURQAAAAASUVORK5CYII=
 </value>
  </data>
  <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -291,11 +291,11 @@
        s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6
        Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef
        /oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjlx//ByEtxy+GcQQ23N4YufW
-        d/+7t3/4X7/u2p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
+        d/+7t3/4X7/u6p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
        IC+0zli9rr6+ngksiQVEdxwNKZh/42nx7CtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb
        qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv
        O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY
-        APJdLweoPgUPAAAAAElFTkSuQmCC
+        AO4qLwXbx/l9AAAAAElFTkSuQmCC
 </value>
  </data>
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -313,14 +313,14 @@
  <data name="btRefresh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV+i7BNGlU0S3
-        BqQwSzN1W9vW2nLNLLfN3VazVhNDs+gFDTsVSBFFmXWJKDKn3RixtSXtgd9lfv9nmGEYTTl01EaPxb2N
-        W+gtp8UVMOpxbyeq/kaHL7dhTMgfSN2/JrMQykk85iF3cpGVNiIBADVo9DdSWW3ziKHTh9y3WJrw2c3n
-        tGsLR+O/mXLy/fvp6w81uRDhJJ3RkitdSFFCclFWTfqZROYTmpb9BqQoWQwchtWk0uDrIQopSub5fUFN
-        +JmEFIt7B0OKEqPDrz26fVMVCxHPL190Nk8PUpQMmOlmkhGf1EQ58uvMuEUWjSsBgKqfpFgfthPP2bx7
-        z8d37wo5lrrKzawGg8PjRAtSigAMazQucZEFLpyfsHs8fQTRYF0JjNiFmG+ej8ZnuQhrdPp7NRBWIaUI
-        MFGtJge/y0WTcHKB2ZTkWlSVZxB3tJtp/oCPnUEDxYoArNWhqjyjU3SHld48FeIpKB0/PKS3N6GqMvQk
-        MyccnEP5BPIHQsuVo7U5uscINyFfAy39A43mC+KPl0d6N00oAAAAAElFTkSuQmCC
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNbLwNBGIZLEBHHG4lfIK78hf4XibhxJeLO
+        JA2p6kkPtta2lm5V6Vrd7aqy2qbSA6HSSl2RIBLifCNCVMeujOjqRutJ3pt5v2cyk8moKqEl19RW3yZm
+        pTY8Vm/YqMMC3aj6Gy222GGnI6Fw/uYl9wChlOx9EbKZkwdxIwIAUIdGyxHLWodfiBzeFr7E34nlLj+m
+        vBsYGi/H5OEGUmcX70ryd/jM2Z2GWOpBihyCTTBKUmmydx/QvBgyIEXOfHgvpiT9DrYaIZEix8WleCWh
+        NFkxVt+WHSlyjO6QZv/qVVH8jnB8+qx1+NVIkTNooVoJWnhUEqVIrzPtExg0LgcAslFPMuu2rXTBEdh5
+        Orh+k8nJ/Hlhenl7e2QCb0PKD8BubzYusHFXIFqcdPr9/TjeZFsKjzr55LqLS6Rn2Dhj9IT6VBDWIOUH
+        YCbbzW4uyiZyUD9HB0W5HlWVGcLcnRaK2+WSR9BAMgIAKw2oqsyYieqyUcFDPp2H4vFjwzpnC6qqQ0fQ
+        s/zuMZROIH0gtFw9Goe7dxz34dI10NI/UKk+AdEclz8RrkwTAAAAAElFTkSuQmCC
 </value>
  </data>
  <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/SubProject/FEQ0000/Equipment/fImpEquipment.cs
+++ b/SubProject/FEQ0000/Equipment/fImpEquipment.cs
@@ -28,6 +28,18 @@ namespace FEQ0000
            FCOMMON.Util.SetFormStatus(ref form, this.Name, true);
            this.Show();
            Application.DoEvents();
+
+            //권하니없으면 button3을 막는다
+            int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.equipment));
+            if (curLevel >= 5)
+            {
+                button3.Enabled = true;
+            }
+            else
+            {
+                button3.Enabled = false;
+            }
+
        }

        void __Closed(object sender, FormClosedEventArgs e)
--- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs
@@ -836,7 +836,7 @@
            this.tbPumPriceD.Size = new System.Drawing.Size(178, 27);
            this.tbPumPriceD.TabIndex = 36;
            this.tbPumPriceD.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.tbPumPriceD.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
+            this.tbPumPriceD.TextChanged += new System.EventHandler(this.tbDolloerPrice_TextChanged);
            // 
            // label8
            // 
--- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs
@@ -15,6 +15,7 @@ namespace FEQ0000
        BindingSource bsModel;
        dsPurchase.PurchaseRow dr;
        public Boolean repeatAdd = false;
+        Boolean binit = false;
        public fPurchase_Add(dsPurchase.PurchaseRow dr_)
        {
            InitializeComponent();
@@ -268,6 +269,7 @@ namespace FEQ0000
                    }
                }
            }
+            binit = true;



@@ -932,10 +934,11 @@ namespace FEQ0000
            FCOMMON.Util.RunExplorer(path);
        }

-        private void textBox1_TextChanged(object sender, EventArgs e)
+        private void tbDolloerPrice_TextChanged(object sender, EventArgs e)
        {
            //단가에 금액이 없는경우에는 환율을 곱해준다.
            //if ( decimal.TryParse(tbPumPrice.Text, out decimal result) == false || result == 0)
+            if(binit)
            {
                if (decimal.TryParse(tbPumPriceD.Text, out decimal priced) == true)
                {
--- a/SubProject/FEQ0000/dsPurchase.Designer.cs
+++ b/SubProject/FEQ0000/dsPurchase.Designer.cs
@@ -1821,11 +1821,11 @@ namespace FEQ0000 {
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
            public decimal pumpriceD {
                get {
-                    try {
-                        return ((decimal)(this[this.tablePurchase.pumpriceDColumn]));
+                    if (this.IspumpriceDNull()) {
+                        return 0m;
                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("\'Purchase\' 테이블의 \'pumpriceD\' 열의 값이 DBNull입니다.", e);
+                    else {
+                        return ((decimal)(this[this.tablePurchase.pumpriceDColumn]));
                    }
                }
                set {
--- a/SubProject/FEQ0000/dsPurchase.xsd
+++ b/SubProject/FEQ0000/dsPurchase.xsd
@@ -340,7 +340,7 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
  <xs:element name="dsPurchase" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsPurchase" msprop:Generator_UserDSName="dsPurchase">
    <xs:complexType>
      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_RowClassName="PurchaseRow" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent">
+        <xs:element name="Purchase" msprop:Generator_TableClassName="PurchaseDataTable" msprop:Generator_TableVarName="tablePurchase" msprop:Generator_TablePropName="Purchase" msprop:Generator_RowDeletingName="PurchaseRowDeleting" msprop:Generator_RowChangingName="PurchaseRowChanging" msprop:Generator_RowEvHandlerName="PurchaseRowChangeEventHandler" msprop:Generator_RowDeletedName="PurchaseRowDeleted" msprop:Generator_UserTableName="Purchase" msprop:Generator_RowChangedName="PurchaseRowChanged" msprop:Generator_RowEvArgName="PurchaseRowChangeEvent" msprop:Generator_RowClassName="PurchaseRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -530,7 +530,7 @@ WHERE  (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc
              </xs:element>
              <xs:element name="inqty" msprop:Generator_ColumnVarNameInTable="columninqty" msprop:Generator_ColumnPropNameInRow="inqty" msprop:Generator_ColumnPropNameInTable="inqtyColumn" msprop:Generator_UserColumnName="inqty" type="xs:int" minOccurs="0" />
              <xs:element name="bigo2" msdata:ReadOnly="true" msdata:Expression="iif(project = '',  bigo , iif( bigo = '', project, project + '/' + bigo ))" msprop:Generator_ColumnVarNameInTable="columnbigo2" msprop:Generator_ColumnPropNameInRow="bigo2" msprop:Generator_ColumnPropNameInTable="bigo2Column" msprop:Generator_UserColumnName="bigo2" type="xs:string" minOccurs="0" />
-              <xs:element name="pumpriceD" msprop:Generator_ColumnVarNameInTable="columnpumpriceD" msprop:Generator_ColumnPropNameInRow="pumpriceD" msprop:Generator_ColumnPropNameInTable="pumpriceDColumn" msprop:Generator_UserColumnName="pumpriceD" type="xs:decimal" minOccurs="0" />
+              <xs:element name="pumpriceD" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="pumpriceD" msprop:Generator_ColumnVarNameInTable="columnpumpriceD" msprop:Generator_ColumnPropNameInTable="pumpriceDColumn" msprop:Generator_UserColumnName="pumpriceD" type="xs:decimal" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>