callm 1 місяць тому
батько
коміт
287a596459

+ 5 - 5
UAS_MES_ZT/FunctionCode/Make/Make_AgingCopy.Designer.cs

@@ -170,10 +170,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1183, 148);
+            this.OperateResult.Location = new System.Drawing.Point(35, 166);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(281, 677);
+            this.OperateResult.Size = new System.Drawing.Size(1429, 574);
             this.OperateResult.TabIndex = 188;
             this.OperateResult.Text = "";
             // 
@@ -215,7 +215,7 @@
             this.checkBox1.Checked = true;
             this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
             this.checkBox1.Location = new System.Drawing.Point(656, 101);
-            this.checkBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.checkBox1.Margin = new System.Windows.Forms.Padding(4);
             this.checkBox1.Name = "checkBox1";
             this.checkBox1.Size = new System.Drawing.Size(138, 28);
             this.checkBox1.TabIndex = 203;
@@ -226,7 +226,7 @@
             // 
             this.quxiao.AutoSize = true;
             this.quxiao.Location = new System.Drawing.Point(656, 856);
-            this.quxiao.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.quxiao.Margin = new System.Windows.Forms.Padding(4);
             this.quxiao.Name = "quxiao";
             this.quxiao.Size = new System.Drawing.Size(138, 28);
             this.quxiao.TabIndex = 204;
@@ -278,7 +278,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_AgingCopy";
             this.Tag = "Make!Aging";
             this.Text = "老化采集";

+ 1 - 0
UAS_MES_ZT/FunctionCode/Make/Make_AgingCopy.cs

@@ -284,6 +284,7 @@ namespace UAS_MES_NEW.Make
 
         void fildgv()
         {
+            agsum.Text = dh.getFieldDataByCondition("ageingdetail", "count(1) cn", " agd_agcode = '" + agcode.Text + "'").ToString();
             //DataTable dtc;
             //if (agcode.Text != "")
             //{

+ 7 - 4
UAS_MES_ZT/PublicMethod/LogicHandler.cs

@@ -732,11 +732,14 @@ namespace UAS_MES_NEW.PublicMethod
         public static bool SetStepResult(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, out string oErrorMessage)
         {
             bool result = CS_SetResult(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
-            if (result && iMPKind != "NOWIN")
+            if (result)
             {
-                SetCheck set = new SetCheck("OK", Color.Green);
-                BaseUtil.SetFormCenter(set);
-                set.ShowDialog();
+                if (iMPKind != "NOWIN")
+                {
+                    SetCheck set = new SetCheck("OK", Color.Green);
+                    BaseUtil.SetFormCenter(set);
+                    set.ShowDialog();
+                }
             }
             else
             {