From c4187f9a3321d9ff62579f87dedf66bf8151690d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 04 四月 2025 11:01:35 +0800
Subject: [PATCH] 加班
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 10 ++
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs | 111 ++++++++++++++++++------------------
2 files changed, 64 insertions(+), 57 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
index 1c03028..64aaf0f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -30,17 +30,17 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -100,7 +100,7 @@
this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton4 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
- this.progressBarControl1 = new DevExpress.XtraEditors.ProgressBarControl();
+ this.prog1 = new DevExpress.XtraEditors.ProgressBarControl();
this.panel2 = new System.Windows.Forms.Panel();
this.lbSum3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
@@ -201,7 +201,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel2.SuspendLayout();
this.panel4.SuspendLayout();
this.panel1.SuspendLayout();
@@ -499,7 +499,7 @@
this.splitTop1.Panel2.Controls.Add(this.simpleButton5);
this.splitTop1.Panel2.Controls.Add(this.simpleButton4);
this.splitTop1.Panel2.Controls.Add(this.simpleButton3);
- this.splitTop1.Panel2.Controls.Add(this.progressBarControl1);
+ this.splitTop1.Panel2.Controls.Add(this.prog1);
this.splitTop1.Panel2.Controls.Add(this.panel2);
this.splitTop1.Panel2.Controls.Add(this.panel4);
this.splitTop1.Panel2.Controls.Add(this.panel1);
@@ -696,41 +696,41 @@
this.layoutControlItem3});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7});
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14});
this.Root.Size = new System.Drawing.Size(849, 220);
this.Root.TextVisible = false;
//
@@ -929,12 +929,13 @@
this.simpleButton3.TabIndex = 6;
this.simpleButton3.Text = "鐗╂枡";
//
- // progressBarControl1
+ // prog1
//
- this.progressBarControl1.Location = new System.Drawing.Point(21, 79);
- this.progressBarControl1.Name = "progressBarControl1";
- this.progressBarControl1.Size = new System.Drawing.Size(359, 22);
- this.progressBarControl1.TabIndex = 5;
+ this.prog1.Location = new System.Drawing.Point(21, 79);
+ this.prog1.Name = "prog1";
+ this.prog1.Properties.ShowTitle = true;
+ this.prog1.Size = new System.Drawing.Size(359, 22);
+ this.prog1.TabIndex = 5;
//
// panel2
//
@@ -1216,7 +1217,7 @@
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
this.tabMxPage2.Size = new System.Drawing.Size(1249, 306);
- this.tabMxPage2.Text = "鏈慨鐞嗘槑缁�";
+ this.tabMxPage2.Text = "寰呬慨鐞嗘槑缁�";
//
// gridColumn24
//
@@ -1511,7 +1512,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panel4.ResumeLayout(false);
@@ -1567,7 +1568,7 @@
private DevExpress.XtraEditors.SimpleButton simpleButton5;
private DevExpress.XtraEditors.SimpleButton simpleButton4;
private DevExpress.XtraEditors.SimpleButton simpleButton3;
- private DevExpress.XtraEditors.ProgressBarControl progressBarControl1;
+ private DevExpress.XtraEditors.ProgressBarControl prog1;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Label lbSum3;
private System.Windows.Forms.Label label4;
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index c97fdd0..c1d84f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -14,6 +14,8 @@
public partial class Frm_Repair : DevExpress.XtraEditors.XtraForm
{
string _webServiceName = "WorkRepair/";
+ string goodTag = "OK";
+ string badTag = "NG";
private List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_Repair()
{
@@ -41,10 +43,10 @@
};
btnGood.Click += (s, e) =>
{
- getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, "鈭�");
+ getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, goodTag);
};
btnBad.Click += (s, e) => {
- getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, "脳");
+ getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt,badTag);
};
}
@@ -184,6 +186,10 @@
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, false);
+ lbSum1.Text = dy.lbSum1;
+ lbSum2.Text = dy.lbSum2;
+ lbSum3.Text = dy.lbSum3;
+ prog1.Position = dy.jd;
txt_barCode.ReadOnly = false;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
--
Gitblit v1.9.3