From 1f99c554ffc67f599fbce5981a3da584945b3b16 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 18 八月 2025 14:24:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index cc275f1..02ce5dd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -1,12 +1,12 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Sys
{
@@ -27,7 +27,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- });
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -47,7 +47,6 @@
txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
-
}
/// <summary>
@@ -59,7 +58,7 @@
{
getPageList(curPage);
}
-
+
/// <summary>
/// 鍙嶅鏍�
/// </summary>
@@ -355,6 +354,7 @@
dataTable.Columns.Add("docCode", typeof(string));
dataTable.Rows.Add("CGDH(閲囪喘鍒拌揣)");
dataTable.Rows.Add("CGJY(閲囪喘妫�楠�)");
+ dataTable.Rows.Add("RKJY(鍏ュ簱妫�楠�)");
dataTable.Rows.Add("CGRK(閲囪喘鍏ュ簱)");
dataTable.Rows.Add("CGTHSQ(閲囪喘閫�璐х敵璇�)");
dataTable.Rows.Add("CGTHJ(閲囪喘妫�楠岄��)");
@@ -370,6 +370,8 @@
dataTable.Rows.Add("SCCL(鐢熶骇瓒呴)");
dataTable.Rows.Add("BG(鎶ュ伐)");
dataTable.Rows.Add("SCRK(鐢熶骇鍏ュ簱)");
+ dataTable.Rows.Add("SCTKSQ(鐢熶骇閫�搴撶敵璇�)");
+ dataTable.Rows.Add("SCTK(鐢熶骇閫�搴�)");
dataTable.Rows.Add("QTCKSQ(鍏朵粬鍑哄簱鐢宠)");
dataTable.Rows.Add("QTCK(鍏朵粬鍑哄簱)");
dataTable.Rows.Add("QTRKSQ(鍏朵粬鍏ュ簱鐢宠)");
@@ -407,6 +409,9 @@
dataTable.Rows.Add("IPQCYC(IPQC寮傚父)");
dataTable.Rows.Add("FQCYC(FQC寮傚父)");
dataTable.Rows.Add("ZSM(杩芥函鐮�)");
+ dataTable.Rows.Add("TB(鎵樻澘鐮�)");
+ dataTable.Rows.Add("JYSQ(妫�楠岀敵璇�)");
+ dataTable.Rows.Add("JYFA(妫�楠屾柟妗�)");
txt_docCode.Properties.DataSource = dataTable;
txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
--
Gitblit v1.9.3