lu
2025-05-30 f0905802d94da8271087ef6920aa683f307ef160
修理
已修改5个文件
235 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs 147 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs 60 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.resx 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -60,6 +60,7 @@
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
            this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -68,7 +69,7 @@
            this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_badReson = new Gs.DevApp.UserControl.UcDictionary();
            this.txt_remark = new Gs.DevApp.UserControl.UcDictionary();
            this.txt_badDescription = new Gs.DevApp.UserControl.UcDictionary();
            this.txt_repairMethd = new Gs.DevApp.UserControl.UcDictionary();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
@@ -255,6 +256,7 @@
            // split1
            // 
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
@@ -267,7 +269,8 @@
            // 
            // split1.Panel2
            // 
             this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1251, 570);
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
@@ -301,7 +304,8 @@
            this.gridColumn19,
            this.gridColumn20,
            this.gridColumn21,
            this.gridColumn23});
            this.gridColumn23,
            this.gridColumn37});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -312,7 +316,7 @@
            // 
            this.gv_operationTime.AppearanceCell.Options.UseFont = true;
            this.gv_operationTime.Caption = "生产线别";
            this.gv_operationTime.FieldName = "sjXt";
            this.gv_operationTime.FieldName = "lineName";
            this.gv_operationTime.Name = "gv_operationTime";
            this.gv_operationTime.OptionsColumn.AllowEdit = false;
            this.gv_operationTime.Tag = "query_OPERATION_TIME";
@@ -410,18 +414,16 @@
            this.gridColumn20.FieldName = "mesStartProd";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 9;
            this.gridColumn20.Width = 94;
            // 
            // gridColumn21
            // 
            this.gridColumn21.Caption = "不良备注";
            this.gridColumn21.FieldName = "remark";
            this.gridColumn21.Caption = "不良描述";
            this.gridColumn21.FieldName = "badDescription";
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 10;
            this.gridColumn21.VisibleIndex = 9;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn23
@@ -431,8 +433,18 @@
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 11;
            this.gridColumn23.VisibleIndex = 10;
            this.gridColumn23.Width = 94;
            //
            // gridColumn37
            //
            this.gridColumn37.Caption = "流水码";
            this.gridColumn37.FieldName = "barCode";
            this.gridColumn37.MinWidth = 25;
            this.gridColumn37.Name = "gridColumn37";
            this.gridColumn37.Visible = true;
            this.gridColumn37.VisibleIndex = 11;
            this.gridColumn37.Width = 94;
            // 
            // repositoryItemMemoEdit1
            // 
@@ -466,7 +478,7 @@
            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx1.Horizontal = false;
            this.splitMx1.Location = new System.Drawing.Point(0, 0);
             this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Name = "splitMx1";
            // 
            // splitMx1.Panel1
            // 
@@ -479,7 +491,7 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1251, 570);
            this.splitMx1.SplitterPosition = 220;
            this.splitMx1.SplitterPosition = 226;
            this.splitMx1.TabIndex = 1;
            // 
            // splitTop1
@@ -509,14 +521,14 @@
            this.splitTop1.Panel2.Controls.Add(this.btnBad);
            this.splitTop1.Panel2.Text = "Panel2";
            this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitTop1.Size = new System.Drawing.Size(1251, 220);
            this.splitTop1.Size = new System.Drawing.Size(1251, 226);
            this.splitTop1.SplitterPosition = 390;
            this.splitTop1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_badReson);
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_badDescription);
            this.layoutMx1.Controls.Add(this.txt_repairMethd);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_gdbh);
@@ -536,39 +548,39 @@
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(849, 220);
            this.layoutMx1.Size = new System.Drawing.Size(849, 226);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // txt_badReson
            // 
            this.txt_badReson.BtnTxt = "不良原因";
            this.txt_badReson.Location = new System.Drawing.Point(12, 154);
            this.txt_badReson.Location = new System.Drawing.Point(12, 157);
            this.txt_badReson.Name = "txt_badReson";
            this.txt_badReson.Size = new System.Drawing.Size(410, 54);
            this.txt_badReson.Size = new System.Drawing.Size(410, 57);
            this.txt_badReson.TabIndex = 26;
            this.txt_badReson.TextTxt = "";
            this.txt_badReson.WhereTxt = "s_type=\'现场维修不良原因\'";
            this.txt_badReson.WhereTxt = "s_type=\'现场维修不良原因\'   and pid<>\'00000000-0000-0000-0000-000000000000\'";
            // 
            // txt_remark
            // txt_badDescription
            // 
            this.txt_remark.BtnTxt = "不良现象";
            this.txt_remark.Location = new System.Drawing.Point(12, 96);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Size = new System.Drawing.Size(410, 54);
            this.txt_remark.TabIndex = 25;
            this.txt_remark.TextTxt = "";
            this.txt_remark.WhereTxt = "s_type=\'现场维修不良现象\'";
            this.txt_badDescription.BtnTxt = "不良描述";
            this.txt_badDescription.Location = new System.Drawing.Point(12, 99);
            this.txt_badDescription.Name = "txt_badDescription";
            this.txt_badDescription.Size = new System.Drawing.Size(410, 54);
            this.txt_badDescription.TabIndex = 25;
            this.txt_badDescription.TextTxt = "";
            this.txt_badDescription.WhereTxt = "s_type=\'现场维修不良现象\'";
            // 
            // txt_repairMethd
            // 
            this.txt_repairMethd.BtnTxt = "不良对策";
            this.txt_repairMethd.Location = new System.Drawing.Point(426, 96);
            this.txt_repairMethd.Location = new System.Drawing.Point(426, 99);
            this.txt_repairMethd.Name = "txt_repairMethd";
            this.txt_repairMethd.Size = new System.Drawing.Size(411, 112);
            this.txt_repairMethd.Size = new System.Drawing.Size(411, 115);
            this.txt_repairMethd.TabIndex = 24;
            this.txt_repairMethd.TextTxt = "";
            this.txt_repairMethd.WhereTxt = "s_type=\'现场维修不良对策\'";
            this.txt_repairMethd.WhereTxt = "s_type=\'现场维修不良对策\' and pid<>\'00000000-0000-0000-0000-000000000000\'";
            // 
            // lbGuid
            // 
@@ -589,7 +601,7 @@
            // 
            // txt_gx
            // 
            this.txt_gx.Location = new System.Drawing.Point(498, 68);
            this.txt_gx.Location = new System.Drawing.Point(498, 70);
            this.txt_gx.Name = "txt_gx";
            this.txt_gx.Properties.ReadOnly = true;
            this.txt_gx.Size = new System.Drawing.Size(131, 24);
@@ -598,7 +610,7 @@
            // 
            // txt_collectBy
            // 
            this.txt_collectBy.Location = new System.Drawing.Point(705, 68);
            this.txt_collectBy.Location = new System.Drawing.Point(705, 70);
            this.txt_collectBy.Name = "txt_collectBy";
            this.txt_collectBy.Properties.ReadOnly = true;
            this.txt_collectBy.Size = new System.Drawing.Size(132, 24);
@@ -607,7 +619,7 @@
            // 
            // txt_barCode
            // 
            this.txt_barCode.Location = new System.Drawing.Point(84, 68);
            this.txt_barCode.Location = new System.Drawing.Point(84, 70);
            this.txt_barCode.Name = "txt_barCode";
            this.txt_barCode.Size = new System.Drawing.Size(338, 24);
            this.txt_barCode.StyleController = this.layoutMx1;
@@ -615,7 +627,7 @@
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(84, 40);
            this.txt_itemNo.Location = new System.Drawing.Point(84, 41);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.ReadOnly = true;
            this.txt_itemNo.Size = new System.Drawing.Size(131, 24);
@@ -624,7 +636,7 @@
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(291, 40);
            this.txt_itemName.Location = new System.Drawing.Point(291, 41);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.ReadOnly = true;
            this.txt_itemName.Size = new System.Drawing.Size(131, 24);
@@ -633,7 +645,7 @@
            // 
            // txt_itemModel
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(498, 40);
            this.txt_itemModel.Location = new System.Drawing.Point(498, 41);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.ReadOnly = true;
            this.txt_itemModel.Size = new System.Drawing.Size(339, 24);
@@ -733,7 +745,7 @@
            rowDefinition5,
            rowDefinition6,
            rowDefinition7});
            this.Root.Size = new System.Drawing.Size(849, 220);
            this.Root.Size = new System.Drawing.Size(849, 226);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -741,39 +753,39 @@
            this.layoutControlItem1.Control = this.txt_gdbh;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(207, 28);
            this.layoutControlItem1.Size = new System.Drawing.Size(207, 29);
            this.layoutControlItem1.Text = "工单编号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_barCode;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 58);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(414, 28);
            this.layoutControlItem4.Size = new System.Drawing.Size(414, 29);
            this.layoutControlItem4.Text = "扫追溯码";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_repairMethd;
            this.layoutControlItem18.Location = new System.Drawing.Point(414, 84);
            this.layoutControlItem18.Location = new System.Drawing.Point(414, 87);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem18.OptionsTableLayoutItem.RowSpan = 4;
            this.layoutControlItem18.Size = new System.Drawing.Size(415, 116);
            this.layoutControlItem18.Size = new System.Drawing.Size(415, 119);
            this.layoutControlItem18.Text = "不良对策";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem18.TextVisible = false;
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.txt_remark;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 84);
            this.layoutControlItem16.Control = this.txt_badDescription;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 87);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
@@ -786,45 +798,45 @@
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_itemNo;
            this.layoutControlItem7.Location = new System.Drawing.Point(0, 28);
            this.layoutControlItem7.Location = new System.Drawing.Point(0, 29);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(207, 28);
            this.layoutControlItem7.Size = new System.Drawing.Size(207, 29);
            this.layoutControlItem7.Text = "产品编码";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_itemName;
            this.layoutControlItem10.Location = new System.Drawing.Point(207, 28);
            this.layoutControlItem10.Location = new System.Drawing.Point(207, 29);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(207, 28);
            this.layoutControlItem10.Size = new System.Drawing.Size(207, 29);
            this.layoutControlItem10.Text = "产品名称";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_itemModel;
            this.layoutControlItem11.Location = new System.Drawing.Point(414, 28);
            this.layoutControlItem11.Location = new System.Drawing.Point(414, 29);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(415, 28);
            this.layoutControlItem11.Size = new System.Drawing.Size(415, 29);
            this.layoutControlItem11.Text = "产品规格";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_badReson;
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 142);
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 145);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(414, 58);
            this.layoutControlItem9.Size = new System.Drawing.Size(414, 61);
            this.layoutControlItem9.Text = "不良原因";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem9.TextVisible = false;
@@ -832,11 +844,11 @@
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_gx;
            this.layoutControlItem2.Location = new System.Drawing.Point(414, 56);
            this.layoutControlItem2.Location = new System.Drawing.Point(414, 58);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(207, 28);
            this.layoutControlItem2.Size = new System.Drawing.Size(207, 29);
            this.layoutControlItem2.Text = "上报工序";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -846,7 +858,7 @@
            this.layoutControlItem13.Location = new System.Drawing.Point(207, 0);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.Size = new System.Drawing.Size(207, 28);
            this.layoutControlItem13.Size = new System.Drawing.Size(207, 29);
            this.layoutControlItem13.Text = "生产线别";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -856,7 +868,7 @@
            this.layoutControlItem14.Location = new System.Drawing.Point(414, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(207, 28);
            this.layoutControlItem14.Size = new System.Drawing.Size(207, 29);
            this.layoutControlItem14.Text = "计划时间";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -866,18 +878,18 @@
            this.layoutControlItem15.Location = new System.Drawing.Point(621, 0);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(208, 28);
            this.layoutControlItem15.Size = new System.Drawing.Size(208, 29);
            this.layoutControlItem15.Text = "实际时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_collectBy;
            this.layoutControlItem3.Location = new System.Drawing.Point(621, 56);
            this.layoutControlItem3.Location = new System.Drawing.Point(621, 58);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(208, 28);
            this.layoutControlItem3.Size = new System.Drawing.Size(208, 29);
            this.layoutControlItem3.Text = "上报员工";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1049,7 +1061,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1251, 338);
            this.tabMx.Size = new System.Drawing.Size(1251, 332);
            this.tabMx.TabIndex = 4;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -1059,7 +1071,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1249, 306);
            this.tabMxPage1.Size = new System.Drawing.Size(1249, 300);
            this.tabMxPage1.Text = "已修理明细";
            // 
            // gcMx1
@@ -1068,7 +1080,7 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1249, 306);
            this.gcMx1.Size = new System.Drawing.Size(1249, 300);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1226,8 +1238,8 @@
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "不良现象";
            this.gridColumn4.FieldName = "remark";
            this.gridColumn4.Caption = "不良描述";
            this.gridColumn4.FieldName = "badDescription";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
@@ -1258,7 +1270,7 @@
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1249, 306);
            this.tabMxPage2.Size = new System.Drawing.Size(1249, 300);
            this.tabMxPage2.Text = "待修理明细";
            // 
            // gcMx2
@@ -1267,7 +1279,7 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1249, 306);
            this.gcMx2.Size = new System.Drawing.Size(1249, 300);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -1426,7 +1438,7 @@
            // gridColumn34
            // 
            this.gridColumn34.Caption = "不良现象";
            this.gridColumn34.FieldName = "remark";
            this.gridColumn34.FieldName = "badDescription";
            this.gridColumn34.MinWidth = 25;
            this.gridColumn34.Name = "gridColumn34";
            this.gridColumn34.Visible = true;
@@ -1601,7 +1613,7 @@
        private UcDictionary txt_repairMethd;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private UcDictionary txt_badReson;
        private UcDictionary txt_remark;
        private UcDictionary txt_badDescription;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
@@ -1642,5 +1654,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
    }
}
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -43,14 +43,18 @@
            };
            btnGood.Click += (s, e) =>
            {
                getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, goodTag);
                getModel(lbGuid.Text.Trim(), txt_badDescription.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, badTag);
                getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, badTag);
            };
        }
        /// <summary>
        ///
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -159,7 +163,7 @@
            }
        }
        /// <summary>
        ///
        /// 读取实体
        /// </summary>
        /// <param name="strGuid"></param>
        /// <param name="_badXx"></param>
@@ -192,6 +196,8 @@
                    lbSum3.Text = dy.lbSum3;
                    prog1.Position = dy.jd;
                    txt_barCode.ReadOnly = false;
                    txt_badReson.IsReadly = false;
                    txt_repairMethd.IsReadly = false;
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    foreach (var a in _job["rtnData"]["list"])
@@ -245,5 +251,6 @@
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -59,6 +59,7 @@
            this.txt_sjDate = new DevExpress.XtraEditors.TextEdit();
            this.btnGood = new DevExpress.XtraEditors.SimpleButton();
            this.btnBad = new DevExpress.XtraEditors.SimpleButton();
            this.txt_dianJianPath = new DevExpress.XtraEditors.TextEdit();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -77,6 +78,7 @@
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
            this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
            this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -130,8 +132,6 @@
            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
            this.txt_dianJianPath = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
            this.splitMx1.Panel1.SuspendLayout();
@@ -161,6 +161,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -179,6 +180,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
            this.panel3.SuspendLayout();
            this.panel2.SuspendLayout();
@@ -192,8 +194,6 @@
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            this.SuspendLayout();
            // 
            // splitMx1
@@ -430,6 +430,15 @@
            this.btnBad.StyleController = this.layoutMx1;
            this.btnBad.TabIndex = 20;
            this.btnBad.Text = "不良品";
            //
            // txt_dianJianPath
            //
            this.txt_dianJianPath.Location = new System.Drawing.Point(286, 152);
            this.txt_dianJianPath.Name = "txt_dianJianPath";
            this.txt_dianJianPath.Properties.ReadOnly = true;
            this.txt_dianJianPath.Size = new System.Drawing.Size(126, 24);
            this.txt_dianJianPath.StyleController = this.layoutMx1;
            this.txt_dianJianPath.TabIndex = 21;
            // 
            // Root
            // 
@@ -680,6 +689,17 @@
            this.layoutControlItem11.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem11.Text = "产品规格";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_dianJianPath;
            this.layoutControlItem18.Location = new System.Drawing.Point(202, 140);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem18.Size = new System.Drawing.Size(202, 31);
            this.layoutControlItem18.Text = "电检路径";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            // 
            // simpleButton7
            // 
@@ -1004,8 +1024,8 @@
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "备注";
            this.gridColumn1.FieldName = "remark";
            this.gridColumn1.Caption = "不良描述";
            this.gridColumn1.FieldName = "badDescription";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
@@ -1184,8 +1204,8 @@
            // 
            // gridColumn19
            // 
            this.gridColumn19.Caption = "备注";
            this.gridColumn19.FieldName = "remark";
            this.gridColumn19.Caption = "不良描述";
            this.gridColumn19.FieldName = "badDescription";
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
@@ -1232,26 +1252,6 @@
            this.gridColumn23.VisibleIndex = 12;
            this.gridColumn23.Width = 94;
            // 
            // txt_dianJianPath
            //
            this.txt_dianJianPath.Location = new System.Drawing.Point(286, 152);
            this.txt_dianJianPath.Name = "txt_dianJianPath";
            this.txt_dianJianPath.Properties.ReadOnly = true;
            this.txt_dianJianPath.Size = new System.Drawing.Size(126, 24);
            this.txt_dianJianPath.StyleController = this.layoutMx1;
            this.txt_dianJianPath.TabIndex = 21;
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_dianJianPath;
            this.layoutControlItem18.Location = new System.Drawing.Point(202, 140);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem18.Size = new System.Drawing.Size(202, 31);
            this.layoutControlItem18.Text = "电检路径";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            //
            // Frm_Work01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1293,6 +1293,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1311,6 +1312,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
            this.panel3.ResumeLayout(false);
            this.panel3.PerformLayout();
@@ -1328,8 +1330,6 @@
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            this.ResumeLayout(false);
        }
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -111,7 +111,7 @@
                {
                    return null;
                }
                File.WriteAllText(dianJianPath, "");
                JArray dsTemp = JArray.Parse(myStr);
                foreach (var ss in dsTemp)  //查找某个字段与值
                {
@@ -121,7 +121,7 @@
                    JN = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["state"].ToString();
                    XL = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["state"].ToString();
                    GV = (((JObject)ss)["GongLv"] == null) ? "" : ((JObject)ss)["GongLv"]["state"].ToString();
                    JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ", ");
                    JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ",");
                    JYV = (((JObject)ss)["JueYuan"] == null) ? "" : ((JObject)ss)["JueYuan"]["value"].ToString().Replace(" ", ", ");
                    JNV = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["value"].ToString().Replace(" ", ", ");
                    XLV = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["value"].ToString().Replace(" ", ", ");
@@ -138,6 +138,7 @@
                _obj.t009 = JNV;
                _obj.t010 = XLV;
                _obj.t011 = GVV;
              //  File.WriteAllText(dianJianPath, "");
                return _obj;
            }
@@ -167,6 +168,11 @@
                // _obj.t012 = SJJG;这个待确定
                return _obj;
            }
            if (txt_gx.Text.Trim() == fGxZhongJian)
            {
                return _obj;
            }
            return null;
        }
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.resx
@@ -120,4 +120,7 @@
  <metadata name="alertControl1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>25</value>
  </metadata>
</root>