From ecb7a60de1639f520712ce95f99414b0dd2c9713 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 14 四月 2025 08:30:40 +0800
Subject: [PATCH] 自动打印
---
DevApp/Gs.DevApp/UserControl/UcLookUser.cs | 5
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs | 6
DevApp/Gs.DevApp/UserControl/showLayOut.cs | 12
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs | 17
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.cs | 13
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs | 17
DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs | 11
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs | 136 +-
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.cs | 15
DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs | 6
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 10
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs | 14
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs | 18
DevApp/Gs.DevApp/UserControl/UcLookUnit.cs | 14
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs | 154 +-
DevApp/Gs.DevApp/UserControl/UcLookDaa.cs | 21
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs | 20
DevApp/Gs.DevApp/UserControl/UCUpFileList.cs | 5
DevApp/Gs.DevApp/DevFrm/User/ViewRole.cs | 11
DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs | 18
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 16
DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaMj.cs | 100 +-
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs | 8
DevApp/Gs.DevApp/UserControl/SelectHz.cs | 8
DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs | 10
DevApp/Gs.DevApp/UserControl/SelectCk.cs | 10
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs | 37
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 35
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 10
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs | 9
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 3
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs | 76
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 4
DevApp/Gs.DevApp/UserControl/showZhongTai.cs | 13
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 12
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs | 10
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs | 6
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs | 11
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 12
DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookSales.cs | 14
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 14
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs | 4
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 14
DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs | 16
DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs | 18
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs | 14
DevApp/Gs.DevApp/UserControl/Toast.cs | 10
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOuts.cs | 22
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 6
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs | 15
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs | 13
DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs | 9
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs | 18
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs | 4
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs | 10
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs | 14
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | 166 +-
DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs | 4
DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs | 12
DevApp/Gs.DevApp/DevFrm/User/User.cs | 14
DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs | 6
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 8
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs | 15
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 25
DevApp/Gs.DevApp/UserControl/ShowFilter.cs | 12
DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 11
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 14
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs | 11
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 8
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs | 8
DevApp/Gs.DevApp/UserControl/ShowUp.cs | 13
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs | 4
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs | 4
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs | 2
DevApp/Gs.DevApp/UserControl/SelectFont.cs | 11
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs | 16
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs | 4
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs | 9
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 6
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs | 104 +-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs | 18
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs | 166 +-
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs | 10
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 25
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 4
DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs | 6
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs | 16
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 6
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs | 13
DevApp/Gs.DevApp/Entity/PageQueryModel.cs | 4
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 10
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs | 13
DevApp/Gs.DevApp/UserControl/SelectCw.cs | 16
DevApp/Gs.DevApp/UserControl/UcLookStaff.cs | 13
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 19
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 4
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs | 3
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 24
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs | 6
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 6
DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs | 9
DevApp/Gs.DevApp/UserControl/UcPageBar.cs | 1
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs | 6
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 18
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs | 18
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 6
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs | 4
DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 20
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs | 78
DevApp/Gs.DevApp/UserControl/SelectOrg.cs | 3
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs | 13
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs | 5
DevApp/Gs.DevApp/UserControl/UcLookOrg.cs | 9
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs | 7
DevApp/Gs.DevApp/Entity/XlsOutModel.cs | 2
DevApp/Gs.DevApp/UserControl/ShowLogcs.cs | 5
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 6
DevApp/Gs.DevApp/UserControl/UCUpFile.cs | 10
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs | 44
DevApp/Gs.DevApp/Program.cs | 9
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 10
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 4
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 22
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs | 16
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookGx.cs | 14
DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.cs | 15
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs | 22
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs | 14
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 8
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs | 6
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 18
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 15
DevApp/Gs.DevApp/UserControl/UcLookCk.cs | 18
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 14
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs | 20
DevApp/Gs.DevApp/Entity/LoginInfoModel.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookPrint.cs | 12
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 20
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 13
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs | 9
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs | 5
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 2
DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs | 16
DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs | 12
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs | 12
DevApp/Gs.DevApp/XtraForm1.cs | 21
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 28
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 39
DevApp/Gs.DevApp/UserControl/ShowFile.cs | 4
167 files changed, 1,169 insertions(+), 1,552 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
index 838fa84..3d93cd6 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
@@ -23,7 +23,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },tips);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -60,7 +60,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
index da2d7bf..ce85d58 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -1,13 +1,13 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index e04d455..45fed5b 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -12,6 +7,11 @@
using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
index 2eefd08..4b89ab9 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
@@ -1,13 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
@@ -37,11 +37,11 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -62,7 +62,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
index 65f5fb8..804a86d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -1,13 +1,13 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
@@ -36,8 +36,8 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
- private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
- {
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
@@ -62,7 +62,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -105,7 +105,7 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
+ private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "",
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
index 8cd3791..1ca4f0a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -1,13 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
@@ -62,7 +62,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index 863f29e..0084217 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -25,7 +25,7 @@
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, null, null, "", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -66,7 +66,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
index 44daf41..81f4751 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
@@ -1,13 +1,13 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
@@ -38,7 +38,7 @@
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -63,7 +63,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index 5d796ab..0a91895 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -1,13 +1,13 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
@@ -21,7 +21,7 @@
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,null, null, "", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -35,10 +35,10 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
- private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
- Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
@@ -62,7 +62,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -105,7 +105,7 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
+ private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.supp_no",
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index f694d9c..cfff603 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -35,7 +35,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },tips);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -132,7 +132,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
index b10b382..cf8de2c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
@@ -66,7 +66,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
index 51e6a4a..2c3e649 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
@@ -69,7 +69,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -125,7 +125,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs
index 6ec2df7..c687e8b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBl.cs
@@ -1,26 +1,14 @@
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemBl : DevExpress.XtraEditors.XtraForm
{
-
+
public Frm_MesItemBl()
{
InitializeComponent();
-
+
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs
index 7344c95..ed868fa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemBlDJ.cs
@@ -1,23 +1,12 @@
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemBlDJ : DevExpress.XtraEditors.XtraForm
{
-
+
public Frm_MesItemBlDJ()
{
InitializeComponent();
-
+
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs
index a9c8a83..66a6e6a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemCl.cs
@@ -1,15 +1,3 @@
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemCl : DevExpress.XtraEditors.XtraForm
@@ -17,7 +5,7 @@
public Frm_MesItemCl()
{
InitializeComponent();
-
+
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs
index 13cffb3..cb1aff7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemClDj.cs
@@ -1,14 +1,3 @@
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_MesItemClDj : DevExpress.XtraEditors.XtraForm
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index ab2a42d..c0feeff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -88,7 +88,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -124,7 +124,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -624,6 +624,6 @@
}
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
index 8d4cb44..76b62af 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
@@ -81,7 +81,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index f29129b..e27e65b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -107,7 +107,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -116,7 +116,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
-
+
/// <summary>
/// 鏃ュ織
/// </summary>
@@ -151,11 +151,11 @@
parentForm = this.Parent as Form;
else
parentForm = this.Parent.Parent as Form;
-
+
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
index 92bd9d7..a64faae 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
@@ -53,11 +53,11 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
-
+
/// <summary>
/// 鏃ュ織
/// </summary>
@@ -96,7 +96,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.cs
index 7d3c6d4..0e909e0 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_Fqc.cs
@@ -1,15 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.FQC
+锘縩amespace Gs.DevApp.DevFrm.FQC
{
public partial class Frm_Fqc : DevExpress.XtraEditors.XtraForm
{
@@ -17,6 +6,6 @@
{
InitializeComponent();
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
index a01faa2..a445b32 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
@@ -6,7 +6,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -234,7 +233,7 @@
string _txt_fzrId = txt_fzrId.GetId();
string _txt_workNo = txt_workNo.Text.Trim();
string _txt_msg = txt_msg.TextTxt;
- string _txt_zrType=txt_zrType.Text.Trim();
+ string _txt_zrType = txt_zrType.Text.Trim();
if (txt_freceQty.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍒ゅ畾缁撴灉锛�");
@@ -250,7 +249,7 @@
txt_fngHandle.Focus();
return;
}
- if (_txt_fzrId.Length<= 0)
+ if (_txt_fzrId.Length <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐ｄ换浜猴紒");
txt_fzrId.Focus();
@@ -280,7 +279,8 @@
return;
}
}
- else {
+ else
+ {
if (!string.IsNullOrEmpty(_txt_workNo))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕佸～鍐欏弽宸ュ崟鍙凤紒");
@@ -296,8 +296,9 @@
}
}
//褰撲负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜�
- else {
- if (( _txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0 || txt_zrType.SelectedIndex>0 || txt_fngHandle.SelectedIndex > 0)
+ else
+ {
+ if ((_txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0 || txt_zrType.SelectedIndex > 0 || txt_fngHandle.SelectedIndex > 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("褰撳垽瀹氱粨鏋滀负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜嗭紒");
txt_freceQty.Focus();
@@ -314,7 +315,7 @@
workNo = _txt_workNo,
fmrmode = _txt_fmrmode,
msg = _txt_msg,
- zrType= _txt_zrType,
+ zrType = _txt_zrType,
edtType = 1
};
try
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs
index 6ed8353..b89fb5d 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs
@@ -183,7 +183,7 @@
private void getModel(string strGuid)
{
ucUpFileList1.parentGroup = "闂鍥剧墖";
- ucUpFileList1.pGuid= strGuid;
+ ucUpFileList1.pGuid = strGuid;
ucUpFileList1.getFileList();
ucUpFileList2.parentGroup = "鏀瑰杽鍥剧墖";
ucUpFileList2.pGuid = strGuid;
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs
index c9fa95c..eb88031 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-
+
namespace Gs.DevApp.DevFrm.FQC
{
@@ -20,7 +20,7 @@
getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
}
-
+
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index d62af1c..ee1506b 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -1,17 +1,17 @@
-锘縰sing System;
-using System.Configuration;
-using System.Linq;
-using System.Management;
-using System.Net.Sockets;
-using System.Net;
-using System.Windows.Forms;
-using AutoUpdaterDotNET;
+锘縰sing AutoUpdaterDotNET;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Configuration;
+using System.Linq;
+using System.Management;
+using System.Net;
+using System.Net.Sockets;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -29,7 +29,7 @@
Text = lbVersion.Text = ConfigurationManager.AppSettings["ProductName"];
btnLogin.Click += BtnLogin_Click;
btnCancel.Click += BtnCancel_Click;
-
+
}
private void BtnCancel_Click(object sender, EventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 206cd38..a19cc04 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -1,12 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Configuration;
-using System.Data;
-using System.Drawing;
-using System.Reflection;
-using System.Windows.Forms;
-using DevExpress.XtraBars;
+锘縰sing DevExpress.XtraBars;
using DevExpress.XtraBars.FluentDesignSystem;
using DevExpress.XtraBars.Navigation;
using DevExpress.XtraTab;
@@ -16,6 +8,14 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration;
+using System.Data;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
@@ -99,7 +99,7 @@
Gs.DevApp.DevFrm.User.SysMenu frm = new SysMenu();
frm.ShowDialog();
};
- // tab.ContextMenuStrip = cms1;
+ // tab.ContextMenuStrip = cms1;
}
private void Tab_MouseDown(object sender, MouseEventArgs e)
@@ -187,7 +187,7 @@
var strJson = UtilityHelper.HttpPost("",
"User/GetUserLoginInfo", JsonConvert.SerializeObject(_obj));
Size _size; string _caption; Color _color; Padding _pad;
- (_size, _caption, _color, _pad) =Gs.DevApp.ToolBox.UtilityHelper.getLoading();
+ (_size, _caption, _color, _pad) = Gs.DevApp.ToolBox.UtilityHelper.getLoading();
DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鍔犺浇杩涘害:", _caption, _size);
wdf.BackColor = _color;
wdf.Padding = _pad;
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.cs
index 456feb5..98b2993 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.cs
@@ -1,15 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.IPQC
+锘縩amespace Gs.DevApp.DevFrm.IPQC
{
public partial class Frm_ShouJian : DevExpress.XtraEditors.XtraForm
{
@@ -18,6 +7,6 @@
InitializeComponent();
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
index 0ca8a2c..addf190 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
@@ -28,7 +28,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },tips);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value, "0");
@@ -73,7 +73,7 @@
getList12(rowGuid);
}
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -120,7 +120,7 @@
lbGuid, txt_releaseNo, gridView1);
toolBarMenu1.guidKey = rowGuid;
}
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.cs
index 9d1c658..6285ac0 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.cs
@@ -1,15 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.IPQC
+锘縩amespace Gs.DevApp.DevFrm.IPQC
{
public partial class Frm_XunJian : DevExpress.XtraEditors.XtraForm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
index 155ce96..f47df39 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
@@ -1,17 +1,11 @@
-锘縰sing DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Controls;
-using Gs.DevApp.DevFrm.User;
+锘縰sing DevExpress.XtraEditors.Controls;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -29,7 +23,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },tips);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -67,7 +61,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -83,7 +77,7 @@
getPageList(1);
}
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -106,7 +100,7 @@
}
}
-
+
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
@@ -187,7 +181,7 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+
/// <summary>
/// pda椤甸潰
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
index 7cf4434..7622a4a 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
@@ -22,11 +22,11 @@
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
-
- },tips);
+
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
-
+
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
@@ -36,7 +36,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -61,7 +61,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -173,7 +173,8 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) {
+ if (_rtn.rtnCode > 0)
+ {
getPageList(this.pageBar1.CurrentPage);
//int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], mxGuid);
//gridView1.FocusedRowHandle = rowHandle;
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs
index 1652d94..39032f8 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs
@@ -2,7 +2,6 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
@@ -41,7 +40,7 @@
{
userGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(userGuid),
bindGuidslist = sbList.ToString(),
- fType="浠撳簱",
+ fType = "浠撳簱",
};
try
{
@@ -61,15 +60,15 @@
}
};
}
-
+
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere ="";
- var pgq = new PageQueryModel(curPage,999999, "org.FNumber asc ,a.depot_code", "asc",
+ var _sbSqlWhere = "";
+ var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
index af10bad..c23e3b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
@@ -59,15 +59,15 @@
}
};
}
-
+
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere ="";
- var pgq = new PageQueryModel(curPage, 999999, "a.PAGE_GROUP", "asc","", _sbSqlWhere.ToString(), userGuid);
+ var _sbSqlWhere = "";
+ var pgq = new PageQueryModel(curPage, 999999, "a.PAGE_GROUP", "asc", "", _sbSqlWhere.ToString(), userGuid);
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index c90ce66..9696cbe 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -12,6 +6,11 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
{
@@ -30,11 +29,11 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,picCheckBox, this, "checkStatus", "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ 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);
@@ -44,7 +43,7 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
-
+
}
/// <summary>
/// 鍒嗛〉浜嬩欢
@@ -55,7 +54,7 @@
{
getPageList(curPage);
}
-
+
/// <summary>
/// 鍙嶅鏍�
/// </summary>
@@ -85,7 +84,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -169,7 +168,7 @@
var _obj = new MesSysLookupTypes
{
-
+
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
LookupTypeCode = txt_lookupTypeCode.Text,
LookupTypeName = txt_lookupTypeName.Text,
@@ -190,7 +189,7 @@
toolBarMenu1.isSetBtn = true;
var gridViews = new List<GridView>();
gridViews.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false,gridViews);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
@@ -207,7 +206,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- System.Text.StringBuilder _sbSqlWhere = new StringBuilder( UtilityHelper.GetSearchWhere(_filterList));
+ System.Text.StringBuilder _sbSqlWhere = new StringBuilder(UtilityHelper.GetSearchWhere(_filterList));
_sbSqlWhere.Append("and LOOKUP_TYPE_CODE = 'QCITEM'");
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
@@ -219,7 +218,7 @@
{
DataTable dt = dd.rtnData.list;
gcMain1.BindingContext = new BindingContext();
-
+
if (dt.Rows.Count > 0)
{
gcMain1.DataSource = dt;
@@ -228,7 +227,7 @@
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
-
+
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
@@ -288,7 +287,7 @@
}
else
{
- UtilityHelper.SetDefaultTable(gcMx1,gvMx1);
+ UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
index 21834e9..d8a464b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
@@ -41,18 +41,18 @@
{
strUpGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
}
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid,strUpGuid);
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid);
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
};
- frm.ShowDialog();
+ frm.ShowDialog();
};
this.toolStripMenuItemRoot.Click += (s, ee) =>
{
string strGuid = "";
string strUpGuid = "";
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid,strUpGuid);
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid);
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
@@ -103,7 +103,7 @@
strGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
strUpGuid = tlMenu.FocusedNode.GetValue("pid").ToString();
}
- Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid,strUpGuid);
+ Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid);
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
@@ -128,7 +128,8 @@
toolStripMenuItemRoot.Visible = false;
tlMenu.ContextMenuStrip = contextMenuStrip1;
}
- else {
+ else
+ {
toolStripMenuItemAdd.Visible = false;
toolStripMenuItemEdt.Visible = false;
toolStripMenuItemDel.Visible = false;
@@ -171,7 +172,7 @@
try
{
var strReturn =
- UtilityHelper.HttpPost("", _webServiceName+"GetListPage", json);
+ UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
var dt = dd.rtnData.list;
tlMenu.DataSource = dt;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
index 8e18dd5..caa0101 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
@@ -21,7 +21,8 @@
this.strUpGuid = _strUpGuid;
//杩欐槸鏇存柊
- if (!string.IsNullOrEmpty(this.strGuid)) {
+ if (!string.IsNullOrEmpty(this.strGuid))
+ {
getMode(strGuid);
this.Text = "鏇存柊銆�" + txt_defectName.Text + "銆�";
txt_sType.Enabled = false;
@@ -39,7 +40,7 @@
}
this.Text = "澧炲姞鏂伴」";
-
+
}
private void btnQuery_Click(object sender, EventArgs e)
@@ -129,7 +130,7 @@
{
dynamic dy = _rtn.rtnData;
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, true);
-
+
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 90e6aec..fd90553 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -6,9 +6,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
-using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -42,7 +40,7 @@
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- },lbGuid);
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
txtJianYan.KeyDown += TxtJianYan_KeyDown;
@@ -60,7 +58,7 @@
private void BtnIpt_Click(object sender, EventArgs e)
{
bool bl = btnLoad.Enabled;
- Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(),bl);
+ Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl);
frm.ShowDialog();
}
@@ -357,7 +355,7 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- if ( txt_fcheckResu.Text.Trim()== "N:涓嶅悎鏍�" && string.IsNullOrEmpty(txt_remarks.Text.Trim()))
+ if (txt_fcheckResu.Text.Trim() == "N:涓嶅悎鏍�" && string.IsNullOrEmpty(txt_remarks.Text.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
txt_remarks.Focus();
@@ -397,7 +395,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- // _sbSqlWhere += " and isnull(fsubmit,0)=0";
+ // _sbSqlWhere += " and isnull(fsubmit,0)=0";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -511,7 +509,7 @@
ucUpFileList1.getFileList();
}
}
-
+
/// <summary>
/// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
@@ -553,12 +551,13 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
- private void setEable(bool bl) {
+
+ private void setEable(bool bl)
+ {
txtJianYan.ReadOnly = !bl;
btnLoad.Enabled = bl;
- btnIpt.Text = ( bl==true?"褰曞叆鏍锋湰":"鏌ョ湅鏍锋湰");
+ btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index ca65b4a..f33fd51 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -134,7 +134,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
-
+
toolBarMenu1.isSetBtn = false;
if (txt_freceQty.SelectedIndex <= 0)
{
@@ -182,13 +182,13 @@
}
}
}
- string _fmrmode = txt_fmrmode.SelectedIndex>0? txt_fmrmode.Text.Trim():"";
+ string _fmrmode = txt_fmrmode.SelectedIndex > 0 ? txt_fmrmode.Text.Trim() : "";
string _freceQty = txt_freceQty.SelectedIndex > 0 ? txt_freceQty.Text.Trim() : "";
string _fngHandle = txt_fngHandle.SelectedIndex > 0 ? txt_fngHandle.Text.Trim() : "";
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- freceQty= _freceQty,
+ freceQty = _freceQty,
fngHandle = _fngHandle,
fmrmode = _fmrmode,
};
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index 48b30da..97c2959 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -87,7 +87,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index de25f00..80dd640 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -2,13 +2,11 @@
using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -74,7 +72,7 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
-
+
/// <summary>
/// 鎵瑰噯
/// </summary>
@@ -140,7 +138,7 @@
{
getPageList(curPage);
}
-
+
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
@@ -492,7 +490,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
- //gvMx1.BestFitColumns();
+ //gvMx1.BestFitColumns();
}
else
{
@@ -508,7 +506,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
- // gvMx2.BestFitColumns();
+ // gvMx2.BestFitColumns();
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 00b0b37..fcfc326 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using MES.Service.Modes;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
namespace Gs.DevApp.DevFrm.QC
{
@@ -20,6 +8,6 @@
{
InitializeComponent();
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 0ee55db..627a8a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -12,6 +6,11 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
{
@@ -30,11 +29,11 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,picCheckBox, this, "checkStatus", "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- }, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ 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);
@@ -45,7 +44,7 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -132,7 +131,7 @@
{
var gvList = new List<GridView>();
gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true,gvList);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 2d8979e..2d1a967 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -1,9 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -11,6 +6,11 @@
using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -41,7 +41,8 @@
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
if (strType == "iqc")
dfValue = 5;
- this.gvMx1.InitNewRow += (s, e) => {
+ this.gvMx1.InitNewRow += (s, e) =>
+ {
this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
int newIndex = gvMx1.DataRowCount + 1;
this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
@@ -89,7 +90,7 @@
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -119,7 +120,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -422,7 +423,7 @@
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-
+
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -805,8 +806,8 @@
{
sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
itemGuids = _sbGuids.ToString(),
- iqcType=this.strType,
- ypsl=this.dfValue
+ iqcType = this.strType,
+ ypsl = this.dfValue
};
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
index 7fd535b..537133a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -77,7 +77,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -92,7 +92,7 @@
_filterList = e.FilterList;
getPageList(1);
}
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -136,8 +136,8 @@
_toolCk(0);
}
-
-
+
+
/// <summary>
///
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs
index 79cf1da..8b7dcc5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectCode.cs
@@ -127,7 +127,7 @@
/// 涓昏〃ID
///</summary>
public Guid? Pid { get; set; }
-
-
+
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaMj.cs
index 7896eba..513b04d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaMj.cs
@@ -2,65 +2,65 @@
namespace Gs.DevApp.DevFrm.QC.Models
{
-/// <summary>
-/// 鍏嶆琛�
-/// </summary>
-public class MesQaMj
-{
/// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
- public Guid Guid { get; set; }
+ /// 鍏嶆琛�
+ /// </summary>
+ public class MesQaMj
+ {
+ /// <summary>
+ /// 榛樿鍊�: (newid())
+ /// </summary>
+ public Guid Guid { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string ItemNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string ItemNo { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public string CreateBy { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public DateTime? CreateDate { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- public string LastupdateBy { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- public DateTime? LastupdateDate { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- public string CheckUser { get; set; }
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ public string CheckUser { get; set; }
- /// <summary>
- /// 瀹℃牳鏃堕棿
- /// </summary>
- public DateTime? CheckDate { get; set; }
+ /// <summary>
+ /// 瀹℃牳鏃堕棿
+ /// </summary>
+ public DateTime? CheckDate { get; set; }
- /// <summary>
- /// 瀹℃牳鏍囪瘑
- /// 榛樿鍊�: ((0))
- /// </summary>
- public int? Status { get; set; }
+ /// <summary>
+ /// 瀹℃牳鏍囪瘑
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ public int? Status { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public int? ItemId { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ public int? ItemId { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
- public string SuppId { get; set; }
-}
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ public string SuppId { get; set; }
+ }
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs
index c58bd30..c6060a6 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmAql1.cs
@@ -12,95 +12,95 @@
///
/// 榛樿鍊�: (newid())
///</summary>
- public Guid Guid { get; set; }
+ public Guid Guid { get; set; }
/// <summary>
/// 鍒涘缓浜�
///</summary>
- public string CreateBy { get; set; }
+ public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓浜哄鍚�
///</summary>
- public string CreateName { get; set; }
+ public string CreateName { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
///</summary>
- public DateTime? CreateDate { get; set; }
+ public DateTime? CreateDate { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂颁汉
///</summary>
- public string LastupdateBy { get; set; }
+ public string LastupdateBy { get; set; }
/// <summary>
/// 鏇存柊浜哄鍚�
///</summary>
- public string LastupdateName { get; set; }
+ public string LastupdateName { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
///</summary>
- public DateTime? LastupdateDate { get; set; }
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
/// 鏍囧噯缂栫爜
///</summary>
- public string SampleSizeNo { get; set; }
+ public string SampleSizeNo { get; set; }
/// <summary>
/// 鏍囧噯鍚嶇О
///</summary>
- public string SampleSizeName { get; set; }
+ public string SampleSizeName { get; set; }
/// <summary>
/// 澶囨敞淇℃伅
///</summary>
- public string Memo { get; set; }
+ public string Memo { get; set; }
/// <summary>
/// 鎵�灞炲伐鍘�
///</summary>
- public string Factory { get; set; }
+ public string Factory { get; set; }
/// <summary>
/// 瀹℃壒鏍囪
/// 榛樿鍊�: ((0))
///</summary>
- public bool? FoneChecked { get; set; }
+ public bool? FoneChecked { get; set; }
/// <summary>
/// 瀹℃壒浜�
///</summary>
- public string FoneCheckor { get; set; }
+ public string FoneCheckor { get; set; }
/// <summary>
/// 瀹℃壒鏃ユ湡
///</summary>
- public DateTime? FoneCheckdate { get; set; }
+ public DateTime? FoneCheckdate { get; set; }
/// <summary>
/// 纭鏍囪
/// 榛樿鍊�: ((0))
///</summary>
- public bool? FtwoChecked { get; set; }
+ public bool? FtwoChecked { get; set; }
/// <summary>
/// 纭浜�
///</summary>
- public string FtwoCheckor { get; set; }
+ public string FtwoCheckor { get; set; }
/// <summary>
/// 纭鏃ユ湡
///</summary>
- public DateTime? FtwoCheckdate { get; set; }
+ public DateTime? FtwoCheckdate { get; set; }
/// <summary>
/// 淇敼/鏂板鐘舵��
/// 榛樿鍊�: ((0))
///</summary>
- public bool? EditStatus { get; set; }
+ public bool? EditStatus { get; set; }
/// <summary>
/// 鐗堟湰鍙�
/// 榛樿鍊�: ((0))
///</summary>
- public int? Fversion { get; set; }
+ public int? Fversion { get; set; }
/// <summary>
/// 鏄惁鍙敤
/// 榛樿鍊�: ((0))
///</summary>
- public bool? Isenabled { get; set; }
+ public bool? Isenabled { get; set; }
/// <summary>
/// 鍏徃
///</summary>
- public string Company { get; set; }
+ public string Company { get; set; }
public List<MesQmAql2> MesQmAql2s { get; set; }
-
+
public List<MesQmAql3> MesQmAql3s { get; set; }
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
index 4060c69..a7a16d3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
@@ -1,185 +1,185 @@
锘縰sing System;
using System.Collections.Generic;
-
+
namespace MES.Service.Modes
{
/// <summary>
/// IQC銆丱QC妫�楠岄」鐩�
///</summary>
-
+
public class MesQmCheckitem
{
/// <summary>
///
/// 榛樿鍊�: (newid())
///</summary>
-
- public Guid Guid { get; set; }
+
+ public Guid Guid { get; set; }
/// <summary>
/// 鍒涘缓浜�
///</summary>
-
- public string CreateBy { get; set; }
+
+ public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
///</summary>
-
- public DateTime? CreateDate { get; set; }
+
+ public DateTime? CreateDate { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂颁汉
///</summary>
-
- public string LastupdateBy { get; set; }
+
+ public string LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
///</summary>
-
- public DateTime? LastupdateDate { get; set; }
+
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
/// 澶囨敞
///</summary>
-
- public string Memo { get; set; }
+
+ public string Memo { get; set; }
/// <summary>
/// 鐗╂枡浜у搧缂栫爜
///</summary>
-
- public string ItemNo { get; set; }
+
+ public string ItemNo { get; set; }
/// <summary>
/// 鍒嗙被
///</summary>
-
- public string Ftype { get; set; }
+
+ public string Ftype { get; set; }
/// <summary>
/// 椤圭洰鍒嗙被(1:鎶芥 2:宸℃ 3:瀹屽伐妫�楠�)
///</summary>
-
- public string CheckType { get; set; }
+
+ public string CheckType { get; set; }
/// <summary>
/// 瀹㈡埛鍚嶇О
///</summary>
-
- public string Name1 { get; set; }
+
+ public string Name1 { get; set; }
/// <summary>
/// 鐗规畩瑙勬牸鐗╂枡
///</summary>
-
- public long? FspecialItem { get; set; }
+
+ public long? FspecialItem { get; set; }
/// <summary>
/// 鎵�灞炲伐鍘�
///</summary>
-
- public string Factory { get; set; }
+
+ public string Factory { get; set; }
/// <summary>
/// 妫�楠屾按鍑�
///</summary>
-
- public string FinspectionLevel { get; set; }
+
+ public string FinspectionLevel { get; set; }
/// <summary>
/// 妫�楠屾按骞�
///</summary>
-
- public string FcheckLevel { get; set; }
+
+ public string FcheckLevel { get; set; }
/// <summary>
/// 鎺ユ敹姘村钩
///</summary>
-
- public string FreceivingLevel { get; set; }
+
+ public string FreceivingLevel { get; set; }
/// <summary>
/// 瀹℃壒鏍囪
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? FoneChecked { get; set; }
+
+ public bool? FoneChecked { get; set; }
/// <summary>
/// 瀹℃壒浜�
///</summary>
-
- public string FoneCheckor { get; set; }
+
+ public string FoneCheckor { get; set; }
/// <summary>
/// 瀹℃壒鏃ユ湡
///</summary>
-
- public DateTime? FoneCheckdate { get; set; }
+
+ public DateTime? FoneCheckdate { get; set; }
/// <summary>
/// 鎵瑰噯鏍囪
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? FtwoChecked { get; set; }
+
+ public bool? FtwoChecked { get; set; }
/// <summary>
/// 鎵瑰噯浜�
///</summary>
-
- public string FtwoCheckor { get; set; }
+
+ public string FtwoCheckor { get; set; }
/// <summary>
/// 鎵瑰噯鏃ユ湡
///</summary>
-
- public DateTime? FtwoCheckdate { get; set; }
+
+ public DateTime? FtwoCheckdate { get; set; }
/// <summary>
/// 淇敼/ 鏂板鐘舵��
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? EditStatus { get; set; }
+
+ public bool? EditStatus { get; set; }
/// <summary>
/// 鐗堟湰
/// 榛樿鍊�: ((0))
///</summary>
-
- public long? Fversion { get; set; }
+
+ public long? Fversion { get; set; }
/// <summary>
/// 鏄惁鍙敤
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? Isenabled { get; set; }
+
+ public bool? Isenabled { get; set; }
/// <summary>
///
///</summary>
-
- public string Company { get; set; }
+
+ public string Company { get; set; }
/// <summary>
/// 瀹㈡埛缂栫爜
///</summary>
-
- public string Kunnr { get; set; }
+
+ public string Kunnr { get; set; }
/// <summary>
/// 鏈�澶ф娊妫�鏁�
///</summary>
-
- public long? MaxCheckQty { get; set; }
+
+ public long? MaxCheckQty { get; set; }
/// <summary>
/// 鎻愰啋娆℃暟
///</summary>
-
- public long? RemQty { get; set; }
+
+ public long? RemQty { get; set; }
/// <summary>
/// 鏈璇佺墿鏂�
///</summary>
-
- public bool? Otherflag { get; set; }
+
+ public bool? Otherflag { get; set; }
/// <summary>
/// 鎴愬搧鐢垫睜绫诲瀷锛氬姩鍔�/ 鍌ㄨ兘
///</summary>
-
- public string Battype { get; set; }
+
+ public string Battype { get; set; }
/// <summary>
/// 椤圭洰鍚嶇О
///</summary>
-
- public string ProjectName { get; set; }
+
+ public string ProjectName { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
///</summary>
-
- public string Tname { get; set; }
+
+ public string Tname { get; set; }
/// <summary>
/// 鐗╂枡ID
///</summary>
-
- public long? ItemId { get; set; }
+
+ public long? ItemId { get; set; }
public List<MesQmCheckitemDt> list { get; set; }
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
index 544d461..067d9a9 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
@@ -1,222 +1,220 @@
锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-
+
namespace MES.Service.Modes
{
/// <summary>
/// 妫�楠岄」鐩粠琛�
///</summary>
-
+
public class MesQmCheckitemDt
{
/// <summary>
///
/// 榛樿鍊�: (newid())
///</summary>
-
- public Guid? Guid { get; set; }
+
+ public Guid? Guid { get; set; }
/// <summary>
/// 鍒涘缓浜�
///</summary>
-
- public string CreateBy { get; set; }
+
+ public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
///</summary>
-
- public DateTime? CreateDate { get; set; }
+
+ public DateTime? CreateDate { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂颁汉
///</summary>
-
- public string LastupdateBy { get; set; }
+
+ public string LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
///</summary>
-
- public DateTime? LastupdateDate { get; set; }
+
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
/// 澶囨敞
///</summary>
-
- public string Memo { get; set; }
+
+ public string Memo { get; set; }
/// <summary>
/// 鐗╂枡浜у搧缂栫爜
///</summary>
-
- public string ItemNo { get; set; }
+
+ public string ItemNo { get; set; }
/// <summary>
/// 椤哄簭
///</summary>
-
- public long? Forder { get; set; }
+
+ public long? Forder { get; set; }
/// <summary>
/// 涓婂叕宸�
///</summary>
-
- public decimal? FupAllow { get; set; }
+
+ public decimal? FupAllow { get; set; }
/// <summary>
/// 妫�楠岄」鐩�
///</summary>
-
- public string FcheckItem { get; set; }
+
+ public string FcheckItem { get; set; }
/// <summary>
/// 鐗规畩鐗规�х被鍒�
///</summary>
-
- public string FspecType { get; set; }
+
+ public string FspecType { get; set; }
/// <summary>
/// 澶囩敤
///</summary>
-
- public long? WorkshopCenterCode { get; set; }
+
+ public long? WorkshopCenterCode { get; set; }
/// <summary>
/// 宸ュ簭
///</summary>
-
- public string ProcNo { get; set; }
+
+ public string ProcNo { get; set; }
/// <summary>
/// 妫�楠屾按鍑嗙紪鐮�
///</summary>
-
- public string SampleSizeNo { get; set; }
+
+ public string SampleSizeNo { get; set; }
/// <summary>
/// 妫�楠屽伐鍏�
///</summary>
-
- public string FcheckTool { get; set; }
+
+ public string FcheckTool { get; set; }
/// <summary>
/// 涓嬪叕宸�
///</summary>
-
- public decimal? FdownAllow { get; set; }
+
+ public decimal? FdownAllow { get; set; }
/// <summary>
/// 妫�楠屾按骞�
///</summary>
-
- public string FcheckLevel { get; set; }
+
+ public string FcheckLevel { get; set; }
/// <summary>
/// 鏍囧噯鍊�
///</summary>
-
- public decimal? Fstand { get; set; }
+
+ public decimal? Fstand { get; set; }
/// <summary>
/// 鎺ユ敹姘村钩
///</summary>
-
- public string FacLevel { get; set; }
+
+ public string FacLevel { get; set; }
/// <summary>
/// 澶囩敤
///</summary>
-
- public string FeatuProc { get; set; }
+
+ public string FeatuProc { get; set; }
/// <summary>
/// 澶囩敤
///</summary>
-
- public string FeatuProd { get; set; }
+
+ public string FeatuProd { get; set; }
/// <summary>
/// 澶囩敤
///</summary>
-
- public string Aql1Id { get; set; }
+
+ public string Aql1Id { get; set; }
/// <summary>
/// 澶囩敤
///</summary>
-
- public string FqaType { get; set; }
+
+ public string FqaType { get; set; }
/// <summary>
/// 鏄惁妗ｄ綅
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? Isdanwei { get; set; }
+
+ public bool? Isdanwei { get; set; }
/// <summary>
/// 榛樿鐢ㄤ簬鍦ㄥ簱閲嶆
/// 榛樿鍊�: ((1))
///</summary>
-
- public long? Ftype { get; set; }
+
+ public long? Ftype { get; set; }
/// <summary>
/// 淇敼/ 鏂板鐘舵��
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? EditStatus { get; set; }
+
+ public bool? EditStatus { get; set; }
/// <summary>
/// 鎶芥鏁伴噺
///</summary>
-
- public long? CheckQty { get; set; }
+
+ public long? CheckQty { get; set; }
/// <summary>
/// 鍏佹敹鏁伴噺
/// 榛樿鍊�: ((0))
///</summary>
-
- public long? FacQty { get; set; }
+
+ public long? FacQty { get; set; }
/// <summary>
///
///</summary>
-
- public string Company { get; set; }
+
+ public string Company { get; set; }
/// <summary>
///
///</summary>
-
- public string Factory { get; set; }
+
+ public string Factory { get; set; }
/// <summary>
/// 棰戞
///</summary>
-
- public string Frequency { get; set; }
+
+ public string Frequency { get; set; }
/// <summary>
/// 瑙勬牸瑕佹眰
///</summary>
-
- public string FspecRequ { get; set; }
+
+ public string FspecRequ { get; set; }
/// <summary>
/// 椤圭洰绫诲埆
///</summary>
-
- public string FcheckType { get; set; }
+
+ public string FcheckType { get; set; }
/// <summary>
/// 鍗曚綅
///</summary>
-
- public string Funit { get; set; }
+
+ public string Funit { get; set; }
/// <summary>
/// 鎶ヨ〃閫夋嫨
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? ReporfCheck { get; set; }
+
+ public bool? ReporfCheck { get; set; }
/// <summary>
/// 鐗瑰畾淇敼
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? GivenModify { get; set; }
+
+ public bool? GivenModify { get; set; }
/// <summary>
/// UCL_X璁惧畾鍊�
///</summary>
-
- public decimal? Fucl { get; set; }
+
+ public decimal? Fucl { get; set; }
/// <summary>
/// LCL_X璁惧畾鍊�
///</summary>
-
- public decimal? Flcl { get; set; }
+
+ public decimal? Flcl { get; set; }
/// <summary>
/// UCL_R璁惧畾鍊�
///</summary>
-
- public decimal? Frucl { get; set; }
+
+ public decimal? Frucl { get; set; }
/// <summary>
/// 鐗╂枡ID
///</summary>
-
- public long? ItemId { get; set; }
+
+ public long? ItemId { get; set; }
/// <summary>
///
///</summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs
index ce23021..53db70f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs
@@ -1,12 +1,11 @@
-锘縰sing System;
+锘縰sing Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.Charts.Native;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
namespace Gs.DevApp.UserControl
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index e5ae8cb..bd92903 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -11,6 +6,11 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
@@ -112,7 +112,7 @@
};
frm.ShowDialog();
};
-
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -142,7 +142,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index 0c7f20a..b310f85 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -42,7 +42,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -66,7 +66,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 4aeed07..fd306c5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -120,9 +120,9 @@
//鑷姩璁＄畻鎵撳嵃閲�
txt_psnQty_1.TextChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan( txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
};
-
+
radOut.SelectedIndexChanged += (s, e) =>
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
@@ -167,7 +167,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -520,7 +520,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
index 5378bb1..ee9cc9d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
@@ -79,7 +79,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 9d18edf..f5080a8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -147,7 +147,7 @@
};
radOut.SelectedIndexChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1,radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
};
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
index e5e3b46..675ed61 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
@@ -42,7 +42,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -78,7 +78,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -307,6 +307,6 @@
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs
index 8aacf17..ac99e87 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.cs
@@ -38,7 +38,7 @@
/// </summary>
public event EventHandler<UpdateParentEventArgs> UpdateParent;
-
+
/// <summary>
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
index 607ffd9..b68e1c4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
@@ -1,4 +1,3 @@
-using DevExpress.Utils.DirectXPaint;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -23,7 +22,7 @@
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
{
-
+
});
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
@@ -36,7 +35,7 @@
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
await Task.Delay(100);
getPageList(1);
}
@@ -60,7 +59,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -109,7 +108,7 @@
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-
+
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
index 5a8e1dd..3e7f0be 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
@@ -1,12 +1,10 @@
-锘縰sing System;
-using System.Data;
-using System.IO;
-using DevExpress.Utils.VisualEffects;
-using DevExpress.XtraEditors;
-using FastReport;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Data;
+using System.IO;
namespace Gs.DevApp.DevFrm.Rpt
{
@@ -52,17 +50,17 @@
//涓昏〃
var array = new JArray();
foreach (var a in _job["rtnData"]["zb"]) array.Add(a);
- var _zb =JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ var _zb = JsonConvert.DeserializeObject<DataTable>(array.ToString());
_zb.TableName = "zb";
//鏄庣粏琛�1
var array1 = new JArray();
foreach (var a in _job["rtnData"]["mx1"]) array1.Add(a);
- var _mx1 =JsonConvert.DeserializeObject<DataTable>( array1.ToString());
+ var _mx1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
_mx1.TableName = "mx1";
//鏄庣粏琛�2
var array2 = new JArray();
foreach (var a in _job["rtnData"]["mx2"]) array2.Add(a);
- var _mx2 =JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ var _mx2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
_mx2.TableName = "mx2";
//鍔犲埌鏁版嵁闆嗕腑
var ds = new DataSet();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index e3be008..963e2ef 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -34,7 +34,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },tips);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -76,7 +76,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -99,7 +99,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
index f2ecf45..cbfa83c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
@@ -81,7 +81,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
index 19572eb..fb2a0d4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
@@ -62,7 +62,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -163,7 +163,7 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
- lbGuid.Text = strGuid;
+ lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index c25e65f..400407a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -57,7 +57,7 @@
txt_custName.Text = txt_salesOrderId.GetSalesCusName();
txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName();
string _xsOrgFid = txt_salesOrderId.GetSalesOrgFid();
- txt_fstockid.getSuppler(_xsOrgFid,_ucCk);
+ txt_fstockid.getSuppler(_xsOrgFid, _ucCk);
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
var json = JsonConvert.SerializeObject(_obj);
@@ -148,7 +148,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
index 2e7cf98..36939ea 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
@@ -79,7 +79,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index e9d5c44..b1373f5 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);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -47,9 +47,9 @@
txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
-
+
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
index f3f4532..7cf767a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
@@ -1,12 +1,11 @@
-锘縰sing System;
-using System.Data;
-using System.IO;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using FastReport;
+锘縰sing DevExpress.XtraEditors;
using FastReport.Design;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.Data;
+using System.IO;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Sys
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
index 4dbf148..7762687 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
@@ -1,18 +1,10 @@
-锘縰sing DevExpress.Utils.VisualEffects;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Sys
{
@@ -47,7 +39,7 @@
btn.TabIndex = 1;
btn.Text = row["reportType"].ToString() + "\n" + row["reportName"].ToString();
btn.Margin = new System.Windows.Forms.Padding(20);
- btn.Tag = row["reportType"].ToString()+ "{}";
+ btn.Tag = row["reportType"].ToString() + "{}";
this.flowLayoutPanel1.Controls.Add(btn);
btn.Click += Btn_Click;
}
@@ -60,7 +52,7 @@
private void Btn_Click(object sender, EventArgs e)
{
- string _guid =Guid.NewGuid().ToString();
+ string _guid = Guid.NewGuid().ToString();
SimpleButton btn = (SimpleButton)sender;
string rptParameter = btn.Tag.ToString();
if (string.IsNullOrEmpty(rptParameter))
@@ -69,7 +61,7 @@
return;
}
var _bl = false;
- _bl = _ckRptService(_guid,rptParameter);
+ _bl = _ckRptService(_guid, rptParameter);
//濡傛灉宸茬粡鏈夋ā鏉夸簡锛岀洿鎺ユ墦寮�璁剧疆妯℃澘
if (_bl)
{
@@ -82,7 +74,7 @@
rptWizard.ShowDialog();
}
- private bool _ckRptService(string _guid, string rptParameter)
+ private bool _ckRptService(string _guid, string rptParameter)
{
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
index 8899ac9..4a2f8c9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -214,7 +214,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere ="";
+ var _sbSqlWhere = "";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.PAGE_GROUP", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
index 6cdbc15..20bd4c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
@@ -28,7 +28,7 @@
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,null, null, "", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -48,7 +48,7 @@
await Task.Delay(100);
getPageList(1);
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -68,7 +68,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -216,7 +216,8 @@
txt_port.Focus();
return;
}
- if (!validateIpAddress(txt_ip.Text.Trim())) {
+ if (!validateIpAddress(txt_ip.Text.Trim()))
+ {
MessageBox.Show("璇疯緭鍏ユ纭殑IP鍦板潃");
txt_ip.Focus();
return;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
index 81f75df..5deede7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
@@ -6,7 +6,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -67,7 +66,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs
index ffdf5eb..9cb11b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Mode/PrintUser.cs
@@ -44,7 +44,7 @@
/// 榛樿鍊�: ((0))
///</summary>
public bool? IsStatus { get; set; }
-
+
public string userName { get; set; }
public string printNo { get; set; }
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index b660c2c..ea423ea 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -1,11 +1,11 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
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.User
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs
index 1eae205..fac22d9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.cs
@@ -33,7 +33,7 @@
{
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
}
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
index 1898a0c..425c732 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -1,13 +1,13 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Sys
{
@@ -61,7 +61,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList,this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
index 171c1f7..7d2df63 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
@@ -1,10 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Reflection;
-using System.Resources;
-using System.Windows.Forms;
-using DevExpress.Utils;
+锘縰sing DevExpress.Utils;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraTreeList;
@@ -12,6 +6,12 @@
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Reflection;
+using System.Resources;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.User
{
@@ -161,7 +161,7 @@
//getPageList(1);
getTree();
}
-
+
}
/// <summary>
@@ -199,7 +199,7 @@
UtilityHelper.ChangeEnableByControl(this.panel1.Controls, true);
}
-
+
}
/// <summary>
@@ -212,7 +212,7 @@
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
UtilityHelper.CleanValueByControl(panel1.Controls, true);
-
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 1820117..fc073a6 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -1,14 +1,14 @@
-锘縰sing System;
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
namespace Gs.DevApp.DevFrm.User
{
@@ -30,20 +30,20 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },tips);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- },lbGuid);
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
index 9d5750d..9ec9290 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
@@ -46,7 +46,7 @@
node.Name = _dy["guid"].ToString();
node.ImageIndex = 0;
node.Checked = _dy["isCk"].ToString() == "1" ? true : false;
- var drItem = dt.Select("upGuid='" + _dy["guid"] +"'");
+ var drItem = dt.Select("upGuid='" + _dy["guid"] + "'");
foreach (var _dy2 in drItem)
{
var node22 = new TreeNode(); //瀹氫箟缁撶偣
@@ -54,12 +54,12 @@
node22.Name = _dy2["guid"].ToString();
node22.ImageIndex = 1;
node22.Checked = _dy2["isCk"].ToString() == "1" ? true : false;
- var drItem33 = dt.Select("upGuid='" + _dy2["guid"] +"'");
+ var drItem33 = dt.Select("upGuid='" + _dy2["guid"] + "'");
foreach (var _dy3 in drItem33)
{
var node33 = new TreeNode(); //瀹氫箟缁撶偣
node33.Text = _dy3["name"].ToString(); //涓虹粨鐐硅祴鍊�
- node33.Name =_dy3["guid"].ToString();
+ node33.Name = _dy3["guid"].ToString();
node33.ImageIndex = 2;
node33.Checked = _dy3["isCk"].ToString() == "1" ? true : false;
node22.Nodes.Add(node33);
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index 40087df..ea25670 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -1,14 +1,14 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.User
{
@@ -29,7 +29,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },tips);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
index 274fce8..082529e 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
@@ -1,11 +1,11 @@
-锘縰sing System;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.User
{
@@ -104,7 +104,7 @@
imageList.Images.Add("icon0", Resources.addfooter_32x32);
imageList.Images.Add("icon1", Resources.listmultilevel_16x16);
imageList.Images.Add("icon2", Resources.addcalculatedfield_16x16);
- // trv.ImageList = imageList;
+ // trv.ImageList = imageList;
var _obj = new
{
userGuid
@@ -138,7 +138,7 @@
node22.Text =
(_dy2["isCk"].ToString() == "1" ? _gou : "") +
_dy2["name"]; //涓虹粨鐐硅祴鍊�
- node22.Name = _dy2["guid"].ToString();
+ node22.Name = _dy2["guid"].ToString();
node22.ImageIndex = 1;
node22.Checked = _dy2["isCk"].ToString() == "1" ? true : false;
var drItem33 = dt.Select("upGuid='" + _dy2["guid"] + "'");
@@ -150,7 +150,7 @@
_dy3["name"]; //涓虹粨鐐硅祴鍊�
node33.Name = _dy3["guid"].ToString();
node33.ImageIndex = 2;
- node33.Checked = _dy3["isCk"].ToString() == "1"? true : false;
+ node33.Checked = _dy3["isCk"].ToString() == "1" ? true : false;
node22.Nodes.Add(node33);
}
node22.Expand();
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
index d0e8108..0e72080 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSetPwd.cs
@@ -1,8 +1,8 @@
-锘縰sing System;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.User
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/ViewRole.cs b/DevApp/Gs.DevApp/DevFrm/User/ViewRole.cs
index b702139..b9808be 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/ViewRole.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/ViewRole.cs
@@ -1,15 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Properties;
+锘縰sing Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.User
@@ -23,7 +16,7 @@
{
InitializeComponent();
_userGuid = userGuid;
-
+
GetTree(_userGuid);
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
index aec5dc1..f522c27 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
@@ -25,7 +25,7 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -66,7 +66,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -98,7 +98,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
_toolCk(1);
}
@@ -109,10 +109,10 @@
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
_toolCk(0);
-
+
}
/// <summary>
@@ -142,7 +142,7 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
+ private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
@@ -180,7 +180,7 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
- private void getModel(string strGuid)
+ private void getModel(string strGuid)
{
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
@@ -275,7 +275,7 @@
var _obj = new
{
guid = rowGuid,
- inFieldValue= _inFieldValue
+ inFieldValue = _inFieldValue
};
try
{
@@ -299,6 +299,6 @@
}
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
index 2830788..b6ca8ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
@@ -77,7 +77,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index d0d3604..4ac57e8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -38,7 +38,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -62,7 +62,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -145,7 +145,7 @@
}
}
-
+
private void getModel(string strGuid)
{
bool isEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 345132a..03c8a8d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -80,7 +80,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
};
-
+
radOut.SelectedIndexChanged += (s, e) =>
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
@@ -607,7 +607,7 @@
this.ucBtnPrint98.rptParameter = "return false";
return;
}
- this.ucBtnPrint98.rptParameter = "rpt_trace{"
+ this.ucBtnPrint98.rptParameter = "rpt_trace{"
+ ""
+ "," + txt_printRemark98.Text.Trim()
+ "," + ""
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
index 400d5b9..042867d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -6,7 +6,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -22,11 +21,11 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "auditStatusChk", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "auditStatusChk", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },tips);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -43,7 +42,7 @@
await Task.Delay(100);
getPageList(1);
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -63,7 +62,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -100,20 +99,20 @@
getPageList(this.pageBar1.CurrentPage);
}
}
-
+
/// <summary>
///
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
+ private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "order_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs
index a4112a6..f3db425 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs
@@ -1,15 +1,3 @@
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwBl : DevExpress.XtraEditors.XtraForm
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs
index d16403f..ddf149b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBlDj.cs
@@ -1,24 +1,13 @@
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwBlDj : DevExpress.XtraEditors.XtraForm
{
-
+
public Frm_WwBlDj()
{
InitializeComponent();
-
+
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs
index 2288b25..fb2e77c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs
@@ -1,20 +1,8 @@
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwCl : DevExpress.XtraEditors.XtraForm
{
-
+
public Frm_WwCl()
{
InitializeComponent();
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs
index 20faef9..5452857 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwClDj.cs
@@ -1,14 +1,3 @@
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_WwClDj : DevExpress.XtraEditors.XtraForm
@@ -16,7 +5,7 @@
/// <summary>
/// 瓒呴鍜岃ˉ鏂欏崟鏄悓涓�涓�
/// </summary>
-
+
public Frm_WwClDj()
{
InitializeComponent();
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
index 070dd27..4d921f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -29,8 +29,8 @@
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "pcShChk", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "pcShChk", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -46,7 +46,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -63,7 +63,7 @@
lbGuid, txt_daa001, gridView1);
toolBarMenu1.guidKey = rowGuid;
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -83,7 +83,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
index 128b641..cafbc7f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
@@ -44,7 +44,7 @@
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -69,7 +69,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -83,7 +83,7 @@
_filterList = e.FilterList;
getPageList(1);
}
-
+
/// <summary>
/// 鏃ュ織
/// </summary>
@@ -263,7 +263,7 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
index 77fedad..8f7ece1 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
@@ -28,8 +28,8 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "shChk", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "shChk", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -79,7 +79,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -230,11 +230,11 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-
+
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(rowGuid);
-
+
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index 7af0861..b1e1994 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -172,7 +172,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -187,7 +187,7 @@
getPageList(1);
}
-
+
/// <summary>
/// 瀹℃牳浜嬩欢
@@ -385,7 +385,7 @@
Guid = _guid,
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
Sl = _sl, //鐢宠鏁伴噺
- Remark= row["tld014"].ToString()
+ Remark = row["tld014"].ToString()
});
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
index a5ff0be..638a2b3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
@@ -27,7 +27,7 @@
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -44,7 +44,7 @@
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -81,7 +81,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -125,7 +125,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
index 35baa93..257c0ac 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
@@ -1,21 +1,15 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
public partial class SelectWwPc : DevExpress.XtraEditors.XtraForm
{
-
+
private readonly string _webServiceName = "WWPCManager/";
private string lineId = "";
public SelectWwPc(string _lineId)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
index f0ab58d..8b89ee7 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
@@ -1,14 +1,7 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -49,7 +42,7 @@
/// </summary>
public event EventHandler<UpdateParentEventArgs> UpdateParent;
-
+
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
index f6c64f2..64b1d05 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -41,8 +41,8 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
Form parentForm = this.FindForm();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, parentForm, "bl018", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "bl018", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -95,7 +95,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -112,7 +112,7 @@
lbGuid, txt_blNo, gridView1);
toolBarMenu1.guidKey = rowGuid;
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -138,7 +138,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -282,7 +282,7 @@
toolBarMenu1.isSetBtn = false;
string inGdId = txt_aboutGuid.GetId();//宸ュ崟鍙�
string inCkId = txt_bl010.GetId();//鍙戞枡浠�
- string inFlOrg= txt_orgId.GetId();//鍙戞枡缁勭粐
+ string inFlOrg = txt_orgId.GetId();//鍙戞枡缁勭粐
if (string.IsNullOrEmpty(inFlOrg))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡缁勭粐锛�");
@@ -598,6 +598,6 @@
}
}
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
index b6372b9..2350fd1 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
@@ -53,7 +53,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -71,7 +71,7 @@
lbGuid, txt_itemOutNo, gridView1);
toolBarMenu1.guidKey = rowGuid;
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -97,7 +97,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index eee4cf5..0c51293 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -26,7 +26,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- },tips);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -86,7 +86,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -136,7 +136,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
index cbde748..70e4f7a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -106,7 +106,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index bf2c12b..b538b57 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -62,7 +62,7 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
//Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
}
catch (Exception ex)
@@ -71,11 +71,12 @@
}
};
- this.gvMx1.InitNewRow += (s, e) => {
+ this.gvMx1.InitNewRow += (s, e) =>
+ {
string _orgId = txt_fapporgid.GetId();
- string _orgName= txt_fapporgid.GetName();
+ string _orgName = txt_fapporgid.GetName();
if (string.IsNullOrEmpty(_orgId)) return;
-
+
gvMx1.SetFocusedRowCellValue("dcOrg", _orgName);
gvMx1.SetFocusedRowCellValue("dcOrgGuid", _orgId);
gvMx1.SetFocusedRowCellValue("drOrg", _orgName);
@@ -111,7 +112,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -226,7 +227,7 @@
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl( splitMx1.Panel1.Controls, true, gvList);
+ UtilityHelper.ChangeEnableByControl(splitMx1.Panel1.Controls, true, gvList);
}
}
/// <summary>
@@ -811,7 +812,7 @@
var rowhandle = gvMx1.FocusedRowHandle;
//if (rowhandle < 0)
// return;
- int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
+ int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
//if (_drhzlx <= 0)
//{
// MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆璐т富绫诲瀷锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs
index 8ba1ace..aba0928 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -66,7 +65,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index e351377..ab45b47 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
@@ -10,6 +5,11 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
@@ -23,8 +23,8 @@
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "docStusTxt", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "docStusTxt", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -34,18 +34,18 @@
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- },lbGuid);
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
txt_supplier.getSuppler("");
}
- private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
- Task.Delay(100);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ Task.Delay(100);
getPageList(1);
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -66,7 +66,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -109,7 +109,7 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
+ private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
index 96fd754..341816d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
@@ -75,7 +75,7 @@
this.txt_fStockId.Focus();
return;
}
- var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fIsLink.SelectedIndex.ToString());
+ var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fIsLink.SelectedIndex.ToString());
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -150,7 +150,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -315,7 +315,7 @@
var _ckId = txt_fStockId.GetId();
var _khId = txt_fCustId.GetId();
string _orgId = txt_fStockOrgId.GetId();
- int _fIsLink= txt_fIsLink.SelectedIndex==0?1:0;
+ int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0;
if (string.IsNullOrEmpty(_orgId))
{
MsgHelper.Warning("璇烽�夋嫨缁勭粐锛�");
@@ -353,8 +353,8 @@
}; gvMx1.PostEditor();
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
-
-
+
+
if (gvMx1.DataRowCount <= 0)
{
MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
@@ -372,7 +372,7 @@
MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
- if (string.IsNullOrEmpty(row["fStockStatusId"].ToString()) || row["fStockStatusId"].ToString()=="璇烽�夋嫨")
+ if (string.IsNullOrEmpty(row["fStockStatusId"].ToString()) || row["fStockStatusId"].ToString() == "璇烽�夋嫨")
{
MsgHelper.ShowError("璇烽�夋嫨搴撳瓨鐘舵�侊紒");
return;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
index 2b216cf..83a2bc2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs
@@ -69,7 +69,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -83,7 +83,7 @@
_filterList = e.FilterList;
getPageList(1);
}
-
+
/// <summary>
/// 鏃ュ織
/// </summary>
@@ -265,7 +265,7 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
index 5d1bcd7..3f7c8bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -122,7 +122,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -159,7 +159,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -304,7 +304,7 @@
string kcZz = txt_fStockOrgId.GetId();//搴撳瓨缁勭粐
string inRkyy = txt_remark.Text.Trim();//鍘熷洜
string kcCk = txt_fStockId.GetId();//浠撳簱
- string kh=txt_fCustId.GetId();//瀹㈡埛
+ string kh = txt_fCustId.GetId();//瀹㈡埛
if (string.IsNullOrEmpty(kcZz))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨缁勭粐锛�");
@@ -329,7 +329,7 @@
kcZz = kcZz,//搴撳瓨缁勭粐
kcCk = kcCk,//搴撳瓨浠撳簱
inRkyy = inRkyy,//鍏ュ簱鍘熷洜
- kh= kh,
+ kh = kh,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -647,7 +647,8 @@
txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
}
- else {
+ else
+ {
lbMxGuid.Text = "";
ucBtnPrint1.guidKey = "";
txtWlid.Text = "";
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs
index fa0d53a..f9f6650 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs
@@ -79,7 +79,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
index 88941c5..46d78ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
@@ -1,109 +1,108 @@
锘�
using System;
-using System.Collections.Generic;
namespace MES.Service.Modes
{
/// <summary>
/// </summary>
-
+
public class MesDepotSections
{
/// <summary>
/// 榛樿鍊�: (newid())
/// </summary>
-
+
public Guid? Guid { get; set; }
/// <summary>
/// </summary>
-
+
public Guid? DepotGuid { get; set; }
/// <summary>
/// ID(SEQ_INV_ID)锛圗RPID锛�
/// </summary>
-
+
public int DepotSectionId { get; set; }
/// <summary>
/// 璐т綅缂栫爜
/// </summary>
-
+
public string DepotSectionCode { get; set; }
/// <summary>
/// 璐т綅鍚嶇О
/// </summary>
-
+
public string DepotSectionName { get; set; }
/// <summary>
/// 鍙備笌榻愬鏍￠獙(0:鍚�,1:鏄�)
/// </summary>
-
+
public bool? CompletenessFlag { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
-
+
public string Description { get; set; }
/// <summary>
/// 鍒涘缓浜�
/// </summary>
-
+
public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
-
+
public DateTime? CreateDate { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂颁汉
/// </summary>
-
+
public string LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
/// </summary>
-
+
public DateTime? LastupdateDate { get; set; }
/// <summary>
/// </summary>
-
+
public string Company { get; set; }
/// <summary>
/// </summary>
-
+
public string Factory { get; set; }
/// <summary>
/// 鍗℃澘鏁�
/// </summary>
-
+
public int? KbQty { get; set; }
/// <summary>
/// 浠撲綅缁処D
/// </summary>
-
+
public int? Zuid { get; set; }
/// <summary>
/// 浠撲綅鍏ㄥ悕
/// </summary>
-
+
public string DepotSectionNamet { get; set; }
/// <summary>
/// </summary>
-
+
public int? Erpid { get; set; }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
index 077bfcc..54f7a33 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
@@ -6,208 +6,208 @@
/// <summary>
///
///</summary>
-
+
public class MesInvItemArn
{
/// <summary>
/// 涓婚敭
/// 榛樿鍊�: (newid())
///</summary>
-
- public Guid Guid { get; set; }
+
+ public Guid Guid { get; set; }
/// <summary>
/// 鍒拌揣鍗曞彿
///</summary>
-
- public string BillNo { get; set; }
+
+ public string BillNo { get; set; }
/// <summary>
/// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
/// 榛樿鍊�: ((0))
///</summary>
-
- public int? Status { get; set; }
+
+ public int? Status { get; set; }
/// <summary>
/// 鍘熷洜
///</summary>
-
- public string Reason { get; set; }
+
+ public string Reason { get; set; }
/// <summary>
/// 鍒涘缓浜�
///</summary>
-
- public string CreateBy { get; set; }
+
+ public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
///</summary>
-
- public DateTime? CreateDate { get; set; }
+
+ public DateTime? CreateDate { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂颁汉
///</summary>
-
- public string LastupdateBy { get; set; }
+
+ public string LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
///</summary>
-
- public DateTime? LastupdateDate { get; set; }
+
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
/// 鍗曟嵁绫诲瀷ID
///</summary>
-
- public int? BillTypeId { get; set; }
+
+ public int? BillTypeId { get; set; }
/// <summary>
/// 浜嬪姟绫诲瀷ID
///</summary>
-
- public int? TransactionId { get; set; }
+
+ public int? TransactionId { get; set; }
/// <summary>
/// 澶囨敞
///</summary>
-
- public string Remark { get; set; }
+
+ public string Remark { get; set; }
/// <summary>
/// 閫佽揣鍗曞彿
///</summary>
-
- public string PaperBillNo { get; set; }
+
+ public string PaperBillNo { get; set; }
/// <summary>
/// 閫�鏂欎汉宸ュ彿
///</summary>
-
- public string UserNoBack { get; set; }
+
+ public string UserNoBack { get; set; }
/// <summary>
/// 鎻愪氦浜�
///</summary>
-
- public string CheckUser { get; set; }
+
+ public string CheckUser { get; set; }
/// <summary>
/// 鎻愪氦鏃ユ湡
///</summary>
-
- public DateTime? CheckDate { get; set; }
+
+ public DateTime? CheckDate { get; set; }
/// <summary>
/// 鍏ュ簱鏃ユ湡
///</summary>
-
- public DateTime? InsDate { get; set; }
+
+ public DateTime? InsDate { get; set; }
/// <summary>
/// 妫�楠岀粨鏋�
///</summary>
-
- public string CheckRes { get; set; }
+
+ public string CheckRes { get; set; }
/// <summary>
/// 宸叉崱鏁伴噺
///</summary>
-
- public int? CheckQty { get; set; }
+
+ public int? CheckQty { get; set; }
/// <summary>
/// 浠撳簱id
///</summary>
-
- public string DepotsId { get; set; }
+
+ public string DepotsId { get; set; }
/// <summary>
/// 浜嬪姟绫诲瀷缂栫爜
///</summary>
-
- public string TransctionNo { get; set; }
+
+ public string TransctionNo { get; set; }
/// <summary>
/// 渚涘簲鍟唅d
///</summary>
-
- public string SuppId { get; set; }
+
+ public string SuppId { get; set; }
/// <summary>
/// 鎻愪氦鐘舵��
/// 榛樿鍊�: ((0))
///</summary>
- public bool? Fstatus { get; set; }
+ public bool? Fstatus { get; set; }
/// <summary>
/// 宸ュ巶缂栫爜
///</summary>
-
- public string Factory { get; set; }
+
+ public string Factory { get; set; }
/// <summary>
/// 鏄惁宸插洖鍐橲AP
/// 榛樿鍊�: ((0))
///</summary>
-
- public int? Sapstatus { get; set; }
+
+ public int? Sapstatus { get; set; }
/// <summary>
/// 鏄惁妫�楠�
///</summary>
-
- public bool? Ischeck { get; set; }
+
+ public bool? Ischeck { get; set; }
/// <summary>
/// 瀹℃牳鍏ュ簱浜�
///</summary>
-
- public string Insby { get; set; }
+
+ public string Insby { get; set; }
/// <summary>
/// 鍏徃浠ｇ爜
///</summary>
-
- public string Company { get; set; }
+
+ public string Company { get; set; }
/// <summary>
/// 鎬ユ枡鏍囪瘑
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? UrgentFlag { get; set; }
+
+ public bool? UrgentFlag { get; set; }
/// <summary>
/// 鍐查攢浜嬪姟绫诲瀷缂栫爜
///</summary>
-
- public int? MttransctionNo { get; set; }
+
+ public int? MttransctionNo { get; set; }
/// <summary>
/// IQC妫�楠屽崟鍙�
///</summary>
-
- public string IqcReleaseNo { get; set; }
+
+ public string IqcReleaseNo { get; set; }
/// <summary>
/// 鏄惁鏄剧ず
/// 榛樿鍊�: ((0))
///</summary>
-
- public int? IsVisual { get; set; }
+
+ public int? IsVisual { get; set; }
/// <summary>
/// 0=閲囪喘锛�1=濮斿
/// 榛樿鍊�: ((1))
///</summary>
-
- public bool? FType { get; set; }
+
+ public bool? FType { get; set; }
/// <summary>
/// ERP鍒拌揣鍗旾D
///</summary>
-
- public string EbelnK3id { get; set; }
+
+ public string EbelnK3id { get; set; }
/// <summary>
/// 鏉＄爜鏉″嵃杩涘害
///</summary>
-
- public int? BarcodeRatio { get; set; }
+
+ public int? BarcodeRatio { get; set; }
/// <summary>
/// ERP鍗曞彿
///</summary>
-
- public string Erpno { get; set; }
+
+ public string Erpno { get; set; }
/// <summary>
/// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
///</summary>
-
- public int? Thstatus { get; set; }
+
+ public int? Thstatus { get; set; }
/// <summary>
/// ERP閫�璐у崟鍙�
///</summary>
-
- public string Erpthno { get; set; }
+
+ public string Erpthno { get; set; }
/// <summary>
/// 缁勭粐缂栫爜
///</summary>
-
- public string OrganizeCode { get; set; }
-
+ public string OrganizeCode { get; set; }
+
+
public List<MesInvItemArnDetail> list { get; set; }
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs
index a8e01d3..66ad7ec 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs
@@ -1,221 +1,221 @@
锘縰sing System;
-
+
namespace MES.Service.Modes
{
/// <summary>
///
///</summary>
-
+
public class MesInvItemArnDetail
{
/// <summary>
///
/// 榛樿鍊�: (newid())
///</summary>
-
- public Guid? Guid { get; set; }
+
+ public Guid? Guid { get; set; }
/// <summary>
///
///</summary>
-
- public Guid? ParentGuid { get; set; }
+
+ public Guid? ParentGuid { get; set; }
/// <summary>
/// MES_ROH_IN_DATA鐨刧uid
///</summary>
-
- public Guid? AboutGuid { get; set; }
+
+ public Guid? AboutGuid { get; set; }
/// <summary>
/// 閲囪喘鍗曞彿
///</summary>
-
- public string Ebeln { get; set; }
+
+ public string Ebeln { get; set; }
/// <summary>
/// 閲囪喘璁㈠崟琛屽彿
///</summary>
-
- public int? EbelnLine { get; set; }
+
+ public int? EbelnLine { get; set; }
/// <summary>
/// 閲囪喘璁㈠崟鏁伴噺
///</summary>
-
- public decimal? EbelnQty { get; set; }
+
+ public decimal? EbelnQty { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
///</summary>
-
- public string ItemNo { get; set; }
+
+ public string ItemNo { get; set; }
/// <summary>
/// 鏀惰揣鏁伴噺
///</summary>
-
- public decimal? Quantity { get; set; }
+
+ public decimal? Quantity { get; set; }
/// <summary>
/// 鍒涘缓浜�
///</summary>
-
- public string CreateBy { get; set; }
+
+ public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
///</summary>
-
- public DateTime? CreateDate { get; set; }
+
+ public DateTime? CreateDate { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂颁汉
///</summary>
-
- public string LastupdateBy { get; set; }
+
+ public string LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
///</summary>
-
- public DateTime? LastupdateDate { get; set; }
+
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
/// 鍒嗗巶缂栫爜
///</summary>
-
- public string Factory { get; set; }
+
+ public string Factory { get; set; }
/// <summary>
/// 鍏徃浠ｇ爜
///</summary>
-
- public string Company { get; set; }
+
+ public string Company { get; set; }
/// <summary>
/// 閲囪喘鍗旾D
///</summary>
-
- public int? EbelnK3id { get; set; }
+
+ public int? EbelnK3id { get; set; }
/// <summary>
/// 閲囪喘鍗曡ID
///</summary>
-
- public int? LineK3id { get; set; }
+
+ public int? LineK3id { get; set; }
/// <summary>
/// 鏈搴旀敹鏁伴噺
///</summary>
-
- public decimal? SubQty { get; set; }
+
+ public decimal? SubQty { get; set; }
/// <summary>
/// 浣欓噺
///</summary>
-
- public int? MarginQty { get; set; }
+
+ public int? MarginQty { get; set; }
/// <summary>
/// 浠诲姟鍗曞彿
///</summary>
-
- public string WorkNo { get; set; }
+
+ public string WorkNo { get; set; }
/// <summary>
/// 鎬ユ枡鏍囪瘑
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? UrgentFlag { get; set; }
+
+ public bool? UrgentFlag { get; set; }
/// <summary>
/// 澶囨敞
///</summary>
-
- public string Memo { get; set; }
+
+ public string Memo { get; set; }
/// <summary>
/// 妫�楠岀粨鏋�
///</summary>
-
- public string CheckRes { get; set; }
+
+ public string CheckRes { get; set; }
/// <summary>
/// 妫�楠岀姸鎬� 锛堝緟妫�銆佸垎閫夈�佺壒閲囥�佸凡妫�锛�
/// 榛樿鍊�: ('寰呮')
///</summary>
-
- public string CheckStates { get; set; }
+
+ public string CheckStates { get; set; }
/// <summary>
/// 鏀惰揣浣欓噺
///</summary>
-
- public int? QuantityM { get; set; }
+
+ public int? QuantityM { get; set; }
/// <summary>
/// 鏈搴旀敹浣欓噺
///</summary>
-
- public int? SubMqty { get; set; }
+
+ public int? SubMqty { get; set; }
/// <summary>
/// 妫�楠屾棩鏈�
///</summary>
-
- public DateTime? CheckDate { get; set; }
+
+ public DateTime? CheckDate { get; set; }
/// <summary>
/// 鏄惁妫�楠�
/// 榛樿鍊�: ((0))
///</summary>
-
- public int? Ischeck { get; set; }
+
+ public int? Ischeck { get; set; }
/// <summary>
/// 宸叉敹鏁伴噺
///</summary>
-
- public int? OkQty { get; set; }
+
+ public int? OkQty { get; set; }
/// <summary>
/// 宸叉敹浣欓噺
///</summary>
-
- public int? OkMqty { get; set; }
+
+ public int? OkMqty { get; set; }
/// <summary>
/// 浜у搧鍨嬪彿
///</summary>
-
- public string BoardStyle { get; set; }
+
+ public string BoardStyle { get; set; }
/// <summary>
/// 浠诲姟鍗曡鍙�
///</summary>
-
- public int? WorkLine { get; set; }
+
+ public int? WorkLine { get; set; }
/// <summary>
/// 0銆侀噰璐崟锛�1銆佸澶栧崟
/// 榛樿鍊�: ((0))
///</summary>
-
- public int? FType { get; set; }
+
+ public int? FType { get; set; }
/// <summary>
/// 鏄惁鍏ュ簱
/// 榛樿鍊�: ((0))
///</summary>
-
- public bool? IsdepsIn { get; set; }
+
+ public bool? IsdepsIn { get; set; }
/// <summary>
/// 鍒拌揣鍗曞彿
///</summary>
-
- public string Dha001 { get; set; }
+
+ public string Dha001 { get; set; }
/// <summary>
/// 宸插叆搴撴暟閲�
///</summary>
-
- public int? OkRkqty { get; set; }
+
+ public int? OkRkqty { get; set; }
/// <summary>
/// 鍒拌揣鍗曞彿
///</summary>
-
- public string CbillNo { get; set; }
+
+ public string CbillNo { get; set; }
/// <summary>
/// 閲囪喘鍏ュ簱鏁伴噺
///</summary>
-
- public int? CgRkqty { get; set; }
+
+ public int? CgRkqty { get; set; }
/// <summary>
/// 鐗╂枡ID
///</summary>
-
- public int? ItemId { get; set; }
+
+ public int? ItemId { get; set; }
/// <summary>
/// 閫�璐ф爣璇�
/// 榛樿鍊�: ((0))
///</summary>
-
- public int? ReturnFlag { get; set; }
+
+ public int? ReturnFlag { get; set; }
/// <summary>
/// 鎺ㄩ�佺姸鎬�
///</summary>
-
- public string States { get; set; }
-
+ public string States { get; set; }
+
+
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs
index 39ad617..01cdb7e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs
@@ -10,155 +10,155 @@
/// <summary>
/// 鐗╂枡缂栧彿
///</summary>
- public string ItemNo { get; set; }
+ public string ItemNo { get; set; }
/// <summary>
/// 鐢宠鏁伴噺
///</summary>
- public decimal? Quantity { get; set; }
+ public decimal? Quantity { get; set; }
/// <summary>
///
///</summary>
- public string CreateBy { get; set; }
+ public string CreateBy { get; set; }
/// <summary>
///
///</summary>
- public DateTime? CreateDate { get; set; }
+ public DateTime? CreateDate { get; set; }
/// <summary>
///
///</summary>
- public string LastupdateBy { get; set; }
+ public string LastupdateBy { get; set; }
/// <summary>
///
///</summary>
- public DateTime? LastupdateDate { get; set; }
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
/// 澶囨敞淇℃伅
///</summary>
- public string Remark { get; set; }
+ public string Remark { get; set; }
/// <summary>
///
///</summary>
- public string Factory { get; set; }
+ public string Factory { get; set; }
/// <summary>
///
///</summary>
- public string Company { get; set; }
+ public string Company { get; set; }
/// <summary>
/// 鎺ㄤ粙浠撳簱
///</summary>
- public string DepotCode { get; set; }
+ public string DepotCode { get; set; }
/// <summary>
/// 鎺ㄤ粙搴撲綅
///</summary>
- public string DepotSectionCode { get; set; }
+ public string DepotSectionCode { get; set; }
/// <summary>
///
///</summary>
- public string TaskNo { get; set; }
+ public string TaskNo { get; set; }
/// <summary>
/// 鍒拌揣鍗曞彿
///</summary>
- public string WorkNo { get; set; }
+ public string WorkNo { get; set; }
/// <summary>
/// 鍒拌揣鍗曡鍙�
///</summary>
- public int? WorkLine { get; set; }
+ public int? WorkLine { get; set; }
/// <summary>
/// ERP 涓昏〃ID
///</summary>
- public int? ErpId { get; set; }
+ public int? ErpId { get; set; }
/// <summary>
/// ERP 浠庤〃ID
///</summary>
- public int? ErpAutoid { get; set; }
+ public int? ErpAutoid { get; set; }
/// <summary>
/// ERP_鏂欏彿
///</summary>
- public string ErpItemNo { get; set; }
+ public string ErpItemNo { get; set; }
/// <summary>
/// 棰滆壊
///</summary>
- public string ColorName { get; set; }
+ public string ColorName { get; set; }
/// <summary>
/// 鏈�鏂颁笅杞芥洿鏂版爣璇�
/// 榛樿鍊�: ((1))
///</summary>
- public int? UpdateFlg { get; set; }
+ public int? UpdateFlg { get; set; }
/// <summary>
/// 閲囪喘鍗旾D
///</summary>
- public int? EbelnK3id { get; set; }
+ public int? EbelnK3id { get; set; }
/// <summary>
/// 閲囪喘鍗曡ID
///</summary>
- public int? LineK3id { get; set; }
+ public int? LineK3id { get; set; }
/// <summary>
/// 閲囪喘鍗曞彿
/// 榛樿鍊�: ('0')
///</summary>
- public string Ebeln { get; set; }
+ public string Ebeln { get; set; }
/// <summary>
/// 閲囪喘璁㈠崟琛屽彿
///</summary>
- public int? EbelnLine { get; set; }
+ public int? EbelnLine { get; set; }
/// <summary>
/// 閲囪喘璁㈠崟鏁伴噺
///</summary>
- public decimal? EbelnQty { get; set; }
+ public decimal? EbelnQty { get; set; }
/// <summary>
/// 浜у搧缂栧彿
///</summary>
- public string BoardItem { get; set; }
+ public string BoardItem { get; set; }
/// <summary>
///
///</summary>
- public int? FType { get; set; }
+ public int? FType { get; set; }
/// <summary>
///
/// 榛樿鍊�: ((0))
///</summary>
- public int? Status { get; set; }
+ public int? Status { get; set; }
/// <summary>
/// 瀛愬瓙琛↖D
///</summary>
- public int? Allocateid { get; set; }
+ public int? Allocateid { get; set; }
/// <summary>
/// 棰嗘枡缂栧彿/鐢熶骇宸ュ崟
///</summary>
- public string PbillNo { get; set; }
+ public string PbillNo { get; set; }
/// <summary>
/// erp鎺ュ彛杩斿洖
///</summary>
- public string ErpMark { get; set; }
+ public string ErpMark { get; set; }
/// <summary>
/// 鍏ュ簱鍗曞彿
///</summary>
- public string RkNo { get; set; }
+ public string RkNo { get; set; }
/// <summary>
/// 宸插叆搴撴暟
///</summary>
- public int? RkQty { get; set; }
+ public int? RkQty { get; set; }
/// <summary>
/// 宸叉壂鏁伴噺
///</summary>
- public int? TlQty { get; set; }
+ public int? TlQty { get; set; }
/// <summary>
/// 鐗╂枡ID
///</summary>
- public long? ItemId { get; set; }
+ public long? ItemId { get; set; }
/// <summary>
/// 鐗╂枡鎶曟枡鍗旾D(鍙戞枡鎵爜浣跨敤)
///</summary>
- public int? ItemDabid { get; set; }
+ public int? ItemDabid { get; set; }
/// <summary>
///
/// 榛樿鍊�: (newid())
///</summary>
- public Guid Guid { get; set; }
+ public Guid Guid { get; set; }
/// <summary>
/// 鍑哄簱ID
///</summary>
- public Guid? ItemOutId { get; set; }
+ public Guid? ItemOutId { get; set; }
public string ItemName { get; set; }
public string ItemModel { get; set; }
@@ -169,7 +169,7 @@
/// RK_LINE
/// </summary>
public Guid AboutGuid { get; set; }
-
+
public string ItemUnit { get; set; }
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOuts.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOuts.cs
index 88b4bfa..fe85058 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOuts.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOuts.cs
@@ -218,7 +218,7 @@
///
///</summary>
public int? DepotId { get; set; }
-
+
public string BillNo { get; set; }
public string DepotName { get; set; }
@@ -232,20 +232,20 @@
public List<MesInvItemOutItems> MesInvItemOutItemsList { get; set; }
public List<MesInvItemOutCDetails> MesInvItemOutCDetailsList { get; set; }
-
-
+
+
public string Departmentname { get; set; }
-
-
+
+
public string ItemNo { get; set; }
-
-
+
+
public string ItemName { get; set; }
-
-
+
+
public string BillTypeName { get; set; }
-
-
+
+
public string TransactionName { get; set; }
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs
index 76af4f0..1ca6f02 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs
@@ -11,145 +11,145 @@
///
/// 榛樿鍊�: (newid())
///</summary>
- public Guid Guid { get; set; }
+ public Guid Guid { get; set; }
/// <summary>
/// 鐢熶骇璁㈠崟
///</summary>
- public string TaskNo { get; set; }
+ public string TaskNo { get; set; }
/// <summary>
/// 鐗╂枡鏉＄爜
///</summary>
- public string ItemBarcode { get; set; }
+ public string ItemBarcode { get; set; }
/// <summary>
/// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
///</summary>
- public string CItemCode { get; set; }
+ public string CItemCode { get; set; }
/// <summary>
/// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
///</summary>
- public string ItemNo { get; set; }
+ public string ItemNo { get; set; }
/// <summary>
/// 瀛愬簱id
///</summary>
- public long? DepotsId { get; set; }
+ public long? DepotsId { get; set; }
/// <summary>
/// 璐т綅id
///</summary>
- public long? DepotSectionsId { get; set; }
+ public long? DepotSectionsId { get; set; }
/// <summary>
/// 鍘傚鎵规
///</summary>
- public string LotNo { get; set; }
+ public string LotNo { get; set; }
/// <summary>
/// 鏁伴噺
/// 榛樿鍊�: ((0))
///</summary>
- public decimal? Quantity { get; set; }
+ public decimal? Quantity { get; set; }
/// <summary>
/// 鐜繚鏍囧織锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級(0-鍚︼紝1-鏄�)
///</summary>
- public byte? EpFlag { get; set; }
+ public byte? EpFlag { get; set; }
/// <summary>
/// 瀹㈡埛缂栫爜
///</summary>
- public string CustomerNo { get; set; }
+ public string CustomerNo { get; set; }
/// <summary>
/// 閲嶉噺
///</summary>
- public decimal? ItemWt { get; set; }
+ public decimal? ItemWt { get; set; }
/// <summary>
/// 瀛愬簱CODE
///</summary>
- public string DepotsCode { get; set; }
+ public string DepotsCode { get; set; }
/// <summary>
/// 璐т綅CODE
///</summary>
- public string DepotSectionsCode { get; set; }
+ public string DepotSectionsCode { get; set; }
/// <summary>
/// 妫�楠屾棩鏈�
///</summary>
- public DateTime? CheckDate { get; set; }
+ public DateTime? CheckDate { get; set; }
/// <summary>
/// 0 鐗╂枡 1 鍗婃垚鍝� 2 鎴愬搧
/// 榛樿鍊�: ((0))
///</summary>
- public byte? ItemType { get; set; }
+ public byte? ItemType { get; set; }
/// <summary>
/// 鍏ュ簱鏃ユ湡
/// 榛樿鍊�: (getdate())
///</summary>
- public DateTime? IndepDate { get; set; }
+ public DateTime? IndepDate { get; set; }
/// <summary>
/// 宸ュ巶缂栧彿
///</summary>
- public string Factory { get; set; }
+ public string Factory { get; set; }
/// <summary>
/// 鍏徃缂栧彿
///</summary>
- public string Company { get; set; }
+ public string Company { get; set; }
/// <summary>
/// 璐ㄩ噺鐘舵��
///</summary>
- public string IqcStatus { get; set; }
+ public string IqcStatus { get; set; }
/// <summary>
/// F鍗�
///</summary>
- public string Fcar { get; set; }
+ public string Fcar { get; set; }
/// <summary>
/// 鍙鎻愪氦鏍囧織锛�0-鍚︼紝1-鏄級
/// 榛樿鍊�: ((0))
///</summary>
- public byte? VisableSubmit { get; set; }
+ public byte? VisableSubmit { get; set; }
/// <summary>
/// 鍙鎻愪氦浜�
///</summary>
- public string VisableSubmitBy { get; set; }
+ public string VisableSubmitBy { get; set; }
/// <summary>
/// 鍙鎻愪氦鏃堕棿
///</summary>
- public DateTime? VisableSubmitDate { get; set; }
+ public DateTime? VisableSubmitDate { get; set; }
/// <summary>
/// 鏉垮瀷
///</summary>
- public string BoardStyle { get; set; }
+ public string BoardStyle { get; set; }
/// <summary>
/// 宸ュ崟鍙�
///</summary>
- public string WorkNo { get; set; }
+ public string WorkNo { get; set; }
/// <summary>
/// 宸ュ崟琛屽彿
///</summary>
- public int? WorkLine { get; set; }
+ public int? WorkLine { get; set; }
/// <summary>
/// 渚涘簲鍟嗙紪鐮�
///</summary>
- public string SuppNo { get; set; }
+ public string SuppNo { get; set; }
/// <summary>
/// 琛屽彿
///</summary>
- public string LineNo { get; set; }
+ public string LineNo { get; set; }
/// <summary>
/// 鍗曟嵁缂栧彿
///</summary>
- public string BillNo { get; set; }
+ public string BillNo { get; set; }
/// <summary>
/// K3ID
///</summary>
- public long? EbelnK3id { get; set; }
+ public long? EbelnK3id { get; set; }
/// <summary>
/// 琛孠3ID
///</summary>
- public long? LineK3id { get; set; }
+ public long? LineK3id { get; set; }
/// <summary>
/// 鐗╂枡ID
///</summary>
- public long? ItemId { get; set; }
-
- public string SuppId { get; set; }
+ public long? ItemId { get; set; }
- /// <summary>
- /// 浠撳簱ID
- /// </summary>
- public int? DepotId { get; set; }
+ public string SuppId { get; set; }
+
+ /// <summary>
+ /// 浠撳簱ID
+ /// </summary>
+ public int? DepotId { get; set; }
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs
index 6e15ae2..40f2f1c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs
@@ -10,210 +10,210 @@
/// <summary>
///
///</summary>
- public Guid Guid { get; set; }
+ public Guid Guid { get; set; }
/// <summary>
/// 鐗╂枡ID
///</summary>
- public long Id { get; set; }
+ public long Id { get; set; }
/// <summary>
/// 宸ュ巶
///</summary>
- public string Factory { get; set; }
+ public string Factory { get; set; }
/// <summary>
/// 鍏徃缂栧彿
///</summary>
- public string Company { get; set; }
+ public string Company { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
///</summary>
- public string ItemNo { get; set; }
+ public string ItemNo { get; set; }
/// <summary>
/// 鐗╂枡鍚嶇О
///</summary>
- public string ItemName { get; set; }
+ public string ItemName { get; set; }
/// <summary>
/// 鐗╂枡绠�绉�
///</summary>
- public string ItemSname { get; set; }
+ public string ItemSname { get; set; }
/// <summary>
/// 瑙勬牸鍨嬪彿
///</summary>
- public string ItemModel { get; set; }
+ public string ItemModel { get; set; }
/// <summary>
/// 鐗╂枡鎻忚堪
///</summary>
- public string ItemDescription { get; set; }
+ public string ItemDescription { get; set; }
/// <summary>
/// 鐗╂枡鍗曚綅
///</summary>
- public string ItemUnit { get; set; }
+ public string ItemUnit { get; set; }
/// <summary>
/// 鐗╂枡绫诲瀷
///</summary>
- public string ItemType { get; set; }
+ public string ItemType { get; set; }
/// <summary>
/// 浜у搧鐗堟湰
///</summary>
- public string ItemVersion { get; set; }
+ public string ItemVersion { get; set; }
/// <summary>
/// 瀹㈡埛缂栧彿
///</summary>
- public string CustNo { get; set; }
+ public string CustNo { get; set; }
/// <summary>
/// 鍒涘缓浜�
///</summary>
- public string CreateBy { get; set; }
+ public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
///</summary>
- public DateTime? CreateDate { get; set; }
+ public DateTime? CreateDate { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂颁汉
///</summary>
- public string LastupdateBy { get; set; }
+ public string LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
///</summary>
- public DateTime? LastupdateDate { get; set; }
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
/// 鏈�浣庡簱瀛�
///</summary>
- public decimal? Lowlimit { get; set; }
+ public decimal? Lowlimit { get; set; }
/// <summary>
/// 鏈�澶у簱瀛�
///</summary>
- public decimal? Highlimit { get; set; }
+ public decimal? Highlimit { get; set; }
/// <summary>
/// 鏈�灏忓寘瑁呮暟
///</summary>
- public decimal? PrdPack { get; set; }
+ public decimal? PrdPack { get; set; }
/// <summary>
/// 璁㈠崟鍗曚綅
///</summary>
- public string Orderunit { get; set; }
+ public string Orderunit { get; set; }
/// <summary>
/// 閿�鍞崟浣�
///</summary>
- public string Saleunit { get; set; }
+ public string Saleunit { get; set; }
/// <summary>
/// 搴撴埧鍗曚綅
///</summary>
- public string Storeunit { get; set; }
+ public string Storeunit { get; set; }
/// <summary>
/// 鐗╂枡ID
///</summary>
- public long? EItemId { get; set; }
+ public long? EItemId { get; set; }
/// <summary>
/// ERP鏂欏彿
///</summary>
- public string ErpItemNo { get; set; }
+ public string ErpItemNo { get; set; }
/// <summary>
/// 榛樿浠撳簱
///</summary>
- public string DepotCode { get; set; }
+ public string DepotCode { get; set; }
/// <summary>
/// 鐗╂枡鍒嗙被缂栧彿
///</summary>
- public string Ppbom00019124 { get; set; }
+ public string Ppbom00019124 { get; set; }
/// <summary>
/// 鐗╂枡鍒嗙粍
///</summary>
- public string Remarks { get; set; }
+ public string Remarks { get; set; }
/// <summary>
/// 閲囪喘鍛�
///</summary>
- public string Fpurchaserid { get; set; }
+ public string Fpurchaserid { get; set; }
/// <summary>
/// 绂佺敤鐘舵��
///</summary>
- public string Fforbidstatus { get; set; }
+ public string Fforbidstatus { get; set; }
/// <summary>
/// 鐗╂枡鍒嗙粍
///</summary>
- public string Fmaterialgroup { get; set; }
+ public string Fmaterialgroup { get; set; }
/// <summary>
/// 瀹屽伐瓒呮敹姣斾緥
///</summary>
- public int? Ffinishreceiptoverrate { get; set; }
+ public int? Ffinishreceiptoverrate { get; set; }
/// <summary>
/// 鍙戞枡鏂瑰紡
///</summary>
- public string Fissuetype { get; set; }
+ public string Fissuetype { get; set; }
/// <summary>
/// 鍚敤鎵瑰彿绠＄悊
///</summary>
- public int? Fisbatchmanage { get; set; }
+ public int? Fisbatchmanage { get; set; }
/// <summary>
/// 閲囪喘鍗曚綅
///</summary>
- public string Fpurchaseunitid { get; set; }
+ public string Fpurchaseunitid { get; set; }
/// <summary>
/// 鎹熻�楃巼
///</summary>
- public string LossPercent { get; set; }
+ public string LossPercent { get; set; }
/// <summary>
/// 鍔╄鐮�
///</summary>
- public string MnemonicCode { get; set; }
+ public string MnemonicCode { get; set; }
/// <summary>
/// 淇濊川鏈�
///</summary>
- public string ExpPeriod { get; set; }
+ public string ExpPeriod { get; set; }
/// <summary>
/// 鐢熶骇杞﹂棿
///</summary>
- public string ProductionWorkshop { get; set; }
+ public string ProductionWorkshop { get; set; }
/// <summary>
/// 鐗╂枡灞炴��
///</summary>
- public string MaterialProperti { get; set; }
+ public string MaterialProperti { get; set; }
/// <summary>
/// 鐢熶骇鍗曚綅
///</summary>
- public string ProduceUnit { get; set; }
+ public string ProduceUnit { get; set; }
/// <summary>
/// 濮斿鍗曚綅
///</summary>
- public string SubconUnit { get; set; }
+ public string SubconUnit { get; set; }
/// <summary>
/// 鍥剧墖1
///</summary>
- public string Bz06 { get; set; }
+ public string Bz06 { get; set; }
/// <summary>
/// 鍥剧墖2
///</summary>
- public string Bz07 { get; set; }
+ public string Bz07 { get; set; }
/// <summary>
/// 鍥剧墖3
///</summary>
- public string Bz08 { get; set; }
+ public string Bz08 { get; set; }
/// <summary>
/// 鍥剧墖4
///</summary>
- public string Bz09 { get; set; }
+ public string Bz09 { get; set; }
/// <summary>
/// 鍥剧墖5
///</summary>
- public string Bz10 { get; set; }
+ public string Bz10 { get; set; }
/// <summary>
/// QC鍒嗙粍ID
///</summary>
- public string QcTeamid { get; set; }
+ public string QcTeamid { get; set; }
/// <summary>
/// 鐗╂枡ID
///</summary>
- public int? ItemId { get; set; }
+ public int? ItemId { get; set; }
/// <summary>
/// 棰滆壊
///</summary>
- public string ColorName { get; set; }
+ public string ColorName { get; set; }
/// <summary>
/// 鍒涘缓缁勭粐
///</summary>
- public string Fumbrella { get; set; }
+ public string Fumbrella { get; set; }
/// <summary>
/// 浣跨敤缁勭粐
///</summary>
- public string FSubsidiary { get; set; }
+ public string FSubsidiary { get; set; }
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs
index a6d8789..3a9259b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs
@@ -10,42 +10,42 @@
/// <summary>
///
///</summary>
- public Guid? Guid { get; set; }
+ public Guid? Guid { get; set; }
/// <summary>
///
///</summary>
- public string BILL_NO { get; set; }
+ public string BILL_NO { get; set; }
/// <summary>
///
///</summary>
- public string ITEM_BARCODE { get; set; }
+ public string ITEM_BARCODE { get; set; }
/// <summary>
///
///</summary>
- public string ITEM_NO { get; set; }
+ public string ITEM_NO { get; set; }
/// <summary>
///
///</summary>
- public string LOT_DATE { get; set; }
+ public string LOT_DATE { get; set; }
/// <summary>
///
///</summary>
- public long? OLDQTY { get; set; }
+ public long? OLDQTY { get; set; }
/// <summary>
///
///</summary>
- public string ITEM_NAME { get; set; }
+ public string ITEM_NAME { get; set; }
/// <summary>
///
///</summary>
- public string ITEM_MODEL { get; set; }
+ public string ITEM_MODEL { get; set; }
/// <summary>
///
///</summary>
- public int? ICOUNT { get; set; }
+ public int? ICOUNT { get; set; }
/// <summary>
///
///</summary>
- public bool? COME_FLG { get; set; }
+ public bool? COME_FLG { get; set; }
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
index 0ee020b..6b1a95b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
@@ -8,7 +8,7 @@
{
public partial class SelectShuoTuiSq : DevExpress.XtraEditors.XtraForm
{
-
+
private readonly string _webServiceName = "MesShouTuiManager/";
private string cusId = "";
private string inOrgId = "";
@@ -66,7 +66,7 @@
/// </summary>
public event EventHandler<UpdateParentEventArgs> UpdateParent;
-
+
/// <summary>
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index 935c8a8..0e373f4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -30,7 +30,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
txt_barCode.Text = "";
- getModel(value, "", "","","");
+ getModel(value, "", "", "", "");
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
@@ -39,14 +39,15 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
txt_barCode.KeyDown += (s, e) =>
{
- if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "","","",""); };
+ if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "", "", "", ""); };
};
btnGood.Click += (s, e) =>
{
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,badTag);
+ btnBad.Click += (s, e) =>
+ {
+ getModel(lbGuid.Text.Trim(), txt_remark.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, badTag);
};
}
@@ -99,7 +100,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), "", "","","");
+ getModel(lbGuid.Text.Trim(), "", "", "", "");
else
{
//_filterList.Clear();
@@ -243,6 +244,6 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 2ae2272..180fa9d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -117,7 +117,7 @@
if (!string.IsNullOrEmpty(_msg))
{
- Toast vm = new Toast( (goodTag== "鈭�" ? 1:-1), _msg);
+ Toast vm = new Toast((goodTag == "鈭�" ? 1 : -1), _msg);
vm.Show();
};
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs
index 81ab435..7589fff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs
@@ -99,7 +99,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_processNo, gridView1,"processNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_processNo, gridView1, "processNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -160,7 +160,7 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_processNo, gridView1,"processNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_processNo, gridView1, "processNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
index bebbcb3..0310c5e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Work
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index ba1f74b..34b2b3e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -256,7 +256,8 @@
}
decimal num = 0;
int num2 = 0;
- if (!int.TryParse(txt_fSumPeople.Text.Trim(), out num2)) {
+ if (!int.TryParse(txt_fSumPeople.Text.Trim(), out num2))
+ {
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇疯緭鍏ユ纭殑瀹氬憳锛�");
txt_fSumPeople.Focus(); return;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs
index baa0e79..f0de730 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/SelectProcess.cs
@@ -25,7 +25,7 @@
{
list.Add(new
{
- fSeq = ($"{(idx+1) * 10:D4}"),
+ fSeq = ($"{(idx + 1) * 10:D4}"),
processNo = dt.Rows[idx]["processNo"].ToString(),
processName = dt.Rows[idx]["processName"].ToString(),
});
diff --git a/DevApp/Gs.DevApp/Entity/LoginInfoModel.cs b/DevApp/Gs.DevApp/Entity/LoginInfoModel.cs
index feb3032..d24fc49 100644
--- a/DevApp/Gs.DevApp/Entity/LoginInfoModel.cs
+++ b/DevApp/Gs.DevApp/Entity/LoginInfoModel.cs
@@ -10,7 +10,7 @@
public string LoginUserGuid { get; set; } = "";
public string LoginTime { get; set; }
-
+
//搴旂敤鍗曚欢妯″紡锛屼繚瀛樼敤鎴风櫥褰曠姸鎬�
public static LoginInfoModel CurrentUser
{
diff --git a/DevApp/Gs.DevApp/Entity/PageQueryModel.cs b/DevApp/Gs.DevApp/Entity/PageQueryModel.cs
index 761df99..0c9156d 100644
--- a/DevApp/Gs.DevApp/Entity/PageQueryModel.cs
+++ b/DevApp/Gs.DevApp/Entity/PageQueryModel.cs
@@ -5,7 +5,7 @@
/// </summary>
public class PageQueryModel
{
-
+
/// <summary>
///
/// </summary>
@@ -18,7 +18,7 @@
/// <param name="_keyType">涓�涓緟鍔╃敤鐨勫叧閿瓧</param>
public PageQueryModel(int _currentPage, int _everyPageSize,
string _sortName = "create_date", string _sortOrder = "asc",
- string _keyWord = "", string _keyWhere = "",string _keyType="")
+ string _keyWord = "", string _keyWhere = "", string _keyType = "")
{
currentPage = _currentPage;
everyPageSize = _everyPageSize;
diff --git a/DevApp/Gs.DevApp/Entity/XlsOutModel.cs b/DevApp/Gs.DevApp/Entity/XlsOutModel.cs
index a424691..0020481 100644
--- a/DevApp/Gs.DevApp/Entity/XlsOutModel.cs
+++ b/DevApp/Gs.DevApp/Entity/XlsOutModel.cs
@@ -8,7 +8,7 @@
/// <param name="_outWhere">鏉′欢</param>
/// <param name="_outSortName">鎺掑簭瀛楁</param>
/// <param name="_outSortOrder">鎺掑簭</param>
- public XlsOutModel(string _outParameter= "", string _outWhere = "",
+ public XlsOutModel(string _outParameter = "", string _outWhere = "",
string _outSortName = "", string _outSortOrder = "")
{
outParameter = _outParameter;
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 3459e3d..6832ec6 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -1,11 +1,10 @@
-锘縰sing System;
+锘縰sing CefSharp;
+using CefSharp.WinForms;
+using Gs.DevApp.DevFrm;
+using System;
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
-using CefSharp.WinForms;
-using CefSharp;
-using Gs.DevApp.DevFrm;
-using DevExpress.XtraEditors;
namespace Gs.DevApp
{
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index fa37f22..2043a24 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1,4 +1,18 @@
-锘縰sing System;
+锘縰sing DevExpress.Utils;
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid;
+using DevExpress.XtraGrid.Columns;
+using DevExpress.XtraGrid.Menu;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using DevExpress.XtraTab;
+using DevExpress.XtraTreeList;
+using Gs.DevApp.Entity;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
@@ -14,20 +28,6 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.Utils;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraGrid;
-using DevExpress.XtraGrid.Columns;
-using DevExpress.XtraGrid.Menu;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using DevExpress.XtraTab;
-using DevExpress.XtraTreeList;
-using Gs.DevApp.Entity;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using UserControls.Data;
using static System.Windows.Forms.Control;
@@ -1746,7 +1746,7 @@
column.OptionsColumn.ReadOnly = false;
else
//column.OptionsColumn.ReadOnly = true;
- column.OptionsColumn.ReadOnly = isPostSearch;
+ column.OptionsColumn.ReadOnly = isPostSearch;
if (isPostSearch == true)
{
@@ -2065,7 +2065,8 @@
}
}
- public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut) {
+ public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut)
+ {
txt_psnQty_1.Text = "";
txt_iCount_1.Text = "";
radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index deb5e76..f3a4a85 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -1,16 +1,16 @@
-锘縰sing System;
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
namespace Gs.DevApp.UserControl
{
public partial class SelectCgMx : XtraForm
{
-
+
private readonly string _webServiceName = "MesInvItemArnManager/";
private string suppId = "";
private string receiveOrgId = "";
@@ -35,7 +35,7 @@
DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮
foreach (int idx in rows)
{
- string _guid= dt.Rows[idx]["guid"].ToString();
+ string _guid = dt.Rows[idx]["guid"].ToString();
list.Add(_guid);
}
UpdateParent?.Invoke(this,
@@ -65,7 +65,7 @@
everyPageSize = 999999,
sortName = "",
keyWhere = "",
- inBusType = (radioGroup1.SelectedIndex+1),//1鏄噰璐紝2鏄澶�
+ inBusType = (radioGroup1.SelectedIndex + 1),//1鏄噰璐紝2鏄澶�
inSupId = this.suppId,
inReceiveOrgId = this.receiveOrgId,
};
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
index 589aadd..1cb9e53 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
@@ -1,15 +1,9 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -52,7 +46,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- _sbSqlWhere += (" and org.fid='" + _strGuid+"'");
+ _sbSqlWhere += (" and org.fid='" + _strGuid + "'");
var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCw.cs b/DevApp/Gs.DevApp/UserControl/SelectCw.cs
index 699544c..cc86f59 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCw.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCw.cs
@@ -1,17 +1,9 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using MES.Service.Modes;
+锘縰sing Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
namespace Gs.DevApp.UserControl
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectFont.cs b/DevApp/Gs.DevApp/UserControl/SelectFont.cs
index 6f732a2..5d0a225 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectFont.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectFont.cs
@@ -1,14 +1,5 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Properties;
+锘縰sing Gs.DevApp.Properties;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.cs b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
index 9c61660..366d481 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectHz.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
@@ -1,15 +1,9 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
diff --git a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs
index 55409ba..26c5e5d 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs
@@ -12,12 +12,12 @@
private readonly string _webServiceName = "MesCgthSqManager/";
private string suppId = "";
private string receiveOrgId = "";
- /// <summary>
- ///
- /// </summary>
- /// <param name="_suppId">渚涘簲鍟嗙紪鍙� </param>
- /// <param name="_receiveOrgId">缁勭粐缂栧彿</param>
- /// <param name="_isWw">2涓哄澶栵紝1涓洪噰璐�</param>
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_suppId">渚涘簲鍟嗙紪鍙� </param>
+ /// <param name="_receiveOrgId">缁勭粐缂栧彿</param>
+ /// <param name="_isWw">2涓哄澶栵紝1涓洪噰璐�</param>
public SelectMesCgthSq(string _suppId, string _receiveOrgId)
{
InitializeComponent();
@@ -73,7 +73,7 @@
everyPageSize = 999999,
sortName = "",
keyWhere = "",
- // inIsWw = this.isWw,
+ // inIsWw = this.isWw,
inIsWw = (radioGroup1.SelectedIndex),//0鏄噰璐紝1鏄澶�
inSupId = this.suppId,
inReceiveOrgId = this.receiveOrgId,
diff --git a/DevApp/Gs.DevApp/UserControl/SelectOrg.cs b/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
index 4edf9ef..1af7b75 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.Utils.DirectXPaint;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFile.cs b/DevApp/Gs.DevApp/UserControl/ShowFile.cs
index 6313f8a..eefa5e3 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFile.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFile.cs
@@ -1,9 +1,7 @@
-锘縰sing CefSharp;
-using CefSharp.WinForms;
+锘縰sing CefSharp.WinForms;
using System;
using System.Configuration;
using System.IO;
-using System.Net;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
index 37a9fb8..8295a70 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFilter.cs
@@ -1,9 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid;
@@ -11,6 +6,11 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
index 29aeb8b..5eb1ec0 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
@@ -3,10 +3,7 @@
using Newtonsoft.Json;
using System;
using System.Data;
-using System.Drawing;
-using System.Linq;
using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -34,7 +31,7 @@
private void getPageList(int curPage, int pageSize)
{
var _sbSqlWhere = new StringBuilder();
- _sbSqlWhere.Append(" and ABT_GUID='"+this.guidKey + "'");
+ _sbSqlWhere.Append(" and ABT_GUID='" + this.guidKey + "'");
var pgq = new PageQueryModel(curPage, 999999, "OPERATION_TIME",
"desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs b/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
index 3d5da77..972c08a 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
@@ -1,11 +1,10 @@
-锘縰sing System;
-using System.ComponentModel;
-using System.Data.SqlTypes;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using DevExpress.XtraWizard;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.ComponentModel;
namespace Gs.DevApp.UserControl
{
@@ -38,7 +37,7 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- var frm = new EasyRptDesign(_rptGuid,_rptParameter);
+ var frm = new EasyRptDesign(_rptGuid, _rptParameter);
frm.Show();
}
else
diff --git a/DevApp/Gs.DevApp/UserControl/ShowUp.cs b/DevApp/Gs.DevApp/UserControl/ShowUp.cs
index af70a96..3f9527e 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowUp.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowUp.cs
@@ -1,14 +1,5 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -37,7 +28,7 @@
private void UcUpFile1_UpChanged(object sender, EventArgs e)
{
UpdateParent?.Invoke(this,
- new UpdateParentEventArgs { FilterList = null});
+ new UpdateParentEventArgs { FilterList = null });
Close();
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/Toast.cs b/DevApp/Gs.DevApp/UserControl/Toast.cs
index 811814d..f33d494 100644
--- a/DevApp/Gs.DevApp/UserControl/Toast.cs
+++ b/DevApp/Gs.DevApp/UserControl/Toast.cs
@@ -1,13 +1,5 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Properties;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
+锘縰sing System;
using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp
diff --git a/DevApp/Gs.DevApp/UserControl/UCUpFile.cs b/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
index 5bb6164..e67278a 100644
--- a/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
+++ b/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.Utils.DirectXPaint;
-using DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Configuration;
-using System.Data;
-using System.Drawing;
using System.IO;
-using System.Linq;
using System.Net.Http;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
diff --git a/DevApp/Gs.DevApp/UserControl/UCUpFileList.cs b/DevApp/Gs.DevApp/UserControl/UCUpFileList.cs
index 8dad973..b02e933 100644
--- a/DevApp/Gs.DevApp/UserControl/UCUpFileList.cs
+++ b/DevApp/Gs.DevApp/UserControl/UCUpFileList.cs
@@ -3,14 +3,9 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Configuration;
using System.Data;
-using System.Drawing;
-using System.Linq;
using System.Net;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
index 11187d2..a1a7e2d 100644
--- a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
@@ -15,7 +15,7 @@
btnReport.Click += BtnReport_ItemClick;
btnDesign.Click += BtnDesign_ItemClick;
-
+
}
/// <summary>
/// 鍏抽敭瀛楋紝涓�鑸槸涓婚敭
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
index 9e3a574..7b4f02a 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
@@ -83,8 +83,8 @@
/// </summary>
private void getTree()
{
- string _where = " and 1=1 and "+this.strWhere;
- var pgq = new PageQueryModel(1, 999999, "a.defect_name","asc","", _where);
+ string _where = " and 1=1 and " + this.strWhere;
+ var pgq = new PageQueryModel(1, 999999, "a.defect_name", "asc", "", _where);
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
index b69b033..f410fb1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -1,9 +1,9 @@
-锘縰sing System;
-using System.Data;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using System;
+using System.Data;
namespace Gs.DevApp.UserControl
{
@@ -15,10 +15,10 @@
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
-
+
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
-
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+
/// <summary>
/// 鏀瑰彉浜嬩欢
/// </summary>
@@ -42,7 +42,7 @@
if (!string.IsNullOrEmpty(orgId))
_keyWhere = " and a.FSubsidiary ='" + orgId + "'";
var pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.depot_code", "asc", "",
- " and is_ng='A'"+_keyWhere);
+ " and is_ng='A'" + _keyWhere);
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -97,8 +97,8 @@
lookSearchSupplier.EditValue = null;
return;
}
- if(!string.IsNullOrEmpty(Code))
- lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
+ if (!string.IsNullOrEmpty(Code))
+ lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs b/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs
index 81ff194..ceac918 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -24,7 +16,7 @@
LookSearchSupplier_EditValueChanged;
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
@@ -37,7 +29,7 @@
if (EditChanged != null) EditChanged(this, e);
}
- public void getSuppler(string orgId,string _dftVale="")
+ public void getSuppler(string orgId, string _dftVale = "")
{
lookSearchSupplier.EditValue = null;
string _keyWhere = "";
@@ -55,7 +47,7 @@
lookSearchSupplier.Properties.ValueMember = "id";
lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
if (!string.IsNullOrEmpty(_dftVale))
- SetIdOrCode(_dftVale);
+ SetIdOrCode(_dftVale);
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs b/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
index f517ea7..de27c74 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -23,10 +15,10 @@
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
- // getSuppler();
+ // getSuppler();
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
@@ -42,7 +34,7 @@
/// 璇诲彇宸ュ崟
/// </summary>
/// <param name="orgId"></param>
- public void getSuppler(string orgId,string _dftVale = "")
+ public void getSuppler(string orgId, string _dftVale = "")
{
lookSearchSupplier.EditValue = null;
string _keyWhere = "";
@@ -119,7 +111,7 @@
}
lookSearchSupplier.EditValue = (((Code.ToString().Trim())));
}
-
+
/// <summary>
/// 浜у搧id
/// </summary>
@@ -241,7 +233,8 @@
/// <summary>
/// 绫诲瀷锛屽鐢ㄤ簬鍒嗙被鏌ヨ
/// </summary>
- public string category{
+ public string category
+ {
set;
get;
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
index df564e1..ea4bccf 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -1,10 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;
-using System.Windows;
namespace Gs.DevApp.UserControl
{
@@ -19,7 +17,7 @@
LookSearchSupplier_EditValueChanged;
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
@@ -94,8 +92,8 @@
lookSearchSupplier.EditValue = null;
return;
}
- if(!string.IsNullOrEmpty(Code))
- lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
+ if (!string.IsNullOrEmpty(Code))
+ lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookGx.cs b/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
index 122f959..e7de230 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -26,7 +18,7 @@
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
@@ -107,6 +99,6 @@
if (!string.IsNullOrEmpty(Code))
lookSearchSupplier.EditValue = (((Code.ToString().Trim())));
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
index 3e4aa9a..be4673d 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -23,7 +22,7 @@
get;
set;
}
- public bool IsReadly { set; get; }
+ public bool IsReadly { set; get; }
public UcLookHuoZhu()
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index 892c309..158dcdc 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -1,16 +1,7 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -22,10 +13,10 @@
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
- // getSuppler("");
+ // getSuppler("");
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
/// </summary>
@@ -52,7 +43,7 @@
var json = JsonConvert.SerializeObject(_obj);
try
{
- var strReturn = UtilityHelper.HttpPost("",
+ var strReturn = UtilityHelper.HttpPost("",
"MesItemsManager/GetListSelect", json);
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
@@ -96,7 +87,8 @@
public string GetModel()
{
var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
- if (row != null) {
+ if (row != null)
+ {
string id = row["itemModel"].ToString();
return id;
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
index bcc6805..5b70469 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
@@ -1,10 +1,7 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
@@ -22,7 +19,7 @@
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
@@ -88,7 +85,7 @@
return;
}
//lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
- lookSearchSupplier.EditValue =(((Code.ToString().Trim())));
+ lookSearchSupplier.EditValue = (((Code.ToString().Trim())));
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs b/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs
index da850fd..a410d71 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -26,7 +18,7 @@
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
index 79c61d5..9ad1124 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -22,10 +14,10 @@
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
- // getSuppler();
+ // getSuppler();
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookStaff.cs b/DevApp/Gs.DevApp/UserControl/UcLookStaff.cs
index c64d0ea..715b9e9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookStaff.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookStaff.cs
@@ -1,17 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -26,7 +17,7 @@
getSuppler();
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
index 2643608..8cb6f0c 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -1,13 +1,8 @@
-锘縰sing System;
-using System.Data;
-using System.Windows.Forms;
-using System.Windows.Media.Animation;
-using DevExpress.Emf;
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
-using static DevExpress.XtraPrinting.Native.PageSizeInfo;
+using System;
+using System.Data;
namespace Gs.DevApp.UserControl
{
@@ -20,7 +15,7 @@
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs b/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs
index 42966ad..71022d4 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -25,7 +17,7 @@
getSuppler();
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
@@ -85,7 +77,7 @@
public void SetIdOrCode(string Code)
{
- if (Code == "-1" || string.IsNullOrEmpty(Code) || Code.ToUpper()=="null".ToUpper())
+ if (Code == "-1" || string.IsNullOrEmpty(Code) || Code.ToUpper() == "null".ToUpper())
{
lookSearchSupplier.EditValue = null;
return;
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookUser.cs b/DevApp/Gs.DevApp/UserControl/UcLookUser.cs
index 2bae741..06ba467 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookUser.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookUser.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -19,7 +18,7 @@
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
index dac73c5..6b2af6e 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
@@ -1,18 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Data.SqlTypes;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -24,8 +14,8 @@
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged += LookSearchSupplier_EditValueChanged;
}
-
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
@@ -46,7 +36,7 @@
lookSearchSupplier.EditValue = null;
string _sbSqlWhere = "";
if (!string.IsNullOrEmpty(shopGuid))
- _sbSqlWhere = " and a.dpt_id="+ shopGuid;
+ _sbSqlWhere = " and a.dpt_id=" + shopGuid;
var pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,c.departmentcode asc,a.line_no",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
index 163a52f..82b41e3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -22,11 +14,11 @@
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
- // getSuppler();
+ // getSuppler();
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
-
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+
/// <summary>
/// 鏀瑰彉浜嬩欢
/// </summary>
@@ -42,7 +34,7 @@
/// 璇诲彇杞﹂棿
/// </summary>
/// <param name="orgId"></param>
- public void getSuppler(string orgId="", string _dftVale = "")
+ public void getSuppler(string orgId = "", string _dftVale = "")
{
lookSearchSupplier.EditValue = null;
var pgq = new PageQueryModel(1, 999999, "a.departmentid", "asc", "", " and 1=1 and a.FSubsidiary=" + orgId);
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs b/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs
index 9aaf561..c6707f8 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -25,7 +17,7 @@
getSuppler();
}
- private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcPageBar.cs b/DevApp/Gs.DevApp/UserControl/UcPageBar.cs
index edfb1e8..ad94e75 100644
--- a/DevApp/Gs.DevApp/UserControl/UcPageBar.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcPageBar.cs
@@ -1,5 +1,4 @@
锘縰sing DevExpress.XtraLayout.Utils;
-using Gs.DevApp.ToolBox;
using System;
using System.Windows.Forms;
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index a14a8a2..f79620c 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1,13 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Windows.Forms;
-using DevExpress.XtraBars;
+锘縰sing DevExpress.XtraBars;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
@@ -18,6 +9,15 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -65,7 +65,7 @@
actions = lst;
}
-
+
/// <summary>
@@ -1228,7 +1228,7 @@
{
spt.RestoreLayoutFromStream(stream);
}
- // spt.Horizontal = false;
+ // spt.Horizontal = false;
spt.Panel1.AutoScroll = false;
spt.Panel2.AutoScroll = false;
//spt.Panel1.MaximumSize = new System.Drawing.Size(spt.Panel1.Width, 100);
diff --git a/DevApp/Gs.DevApp/UserControl/showLayOut.cs b/DevApp/Gs.DevApp/UserControl/showLayOut.cs
index 8c05336..bd71af9 100644
--- a/DevApp/Gs.DevApp/UserControl/showLayOut.cs
+++ b/DevApp/Gs.DevApp/UserControl/showLayOut.cs
@@ -1,10 +1,6 @@
-锘縰sing DevExpress.Utils.DirectXPaint;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.TextEditController;
-using DevExpress.XtraGrid.Columns;
+锘縰sing DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
-using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -65,7 +61,7 @@
}
}
xmlList.Add(
- new { idType = "gridview", idName = gridView1.Name, idXml = sb.ToString(), splitterPosition="" }
+ new { idType = "gridview", idName = gridView1.Name, idXml = sb.ToString(), splitterPosition = "" }
);
}
foreach (LayoutControl lay1 in layList)
@@ -84,7 +80,7 @@
}
}
xmlList.Add(
- new { idType = "layoutcontrol ", idName = lay1.Name, idXml = sb.ToString(), splitterPosition="" }
+ new { idType = "layoutcontrol ", idName = lay1.Name, idXml = sb.ToString(), splitterPosition = "" }
);
}
foreach (SplitContainerControl splt in spcList)
@@ -103,7 +99,7 @@
}
}
xmlList.Add(
- new { idType = "splitcontainercontrol ", idName = splt.Name, idXml = sb.ToString(), splitterPosition= splt.SplitterPosition }
+ new { idType = "splitcontainercontrol ", idName = splt.Name, idXml = sb.ToString(), splitterPosition = splt.SplitterPosition }
);
}
var _obj = new
diff --git a/DevApp/Gs.DevApp/UserControl/showZhongTai.cs b/DevApp/Gs.DevApp/UserControl/showZhongTai.cs
index 6200ca6..dcaa462 100644
--- a/DevApp/Gs.DevApp/UserControl/showZhongTai.cs
+++ b/DevApp/Gs.DevApp/UserControl/showZhongTai.cs
@@ -1,14 +1,5 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
+锘縰sing Gs.DevApp.ToolBox;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -19,7 +10,7 @@
InitializeComponent();
btnSave.Click += (s, e) =>
{
- if (comZt.SelectedIndex<= 0)
+ if (comZt.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鐘舵�侊紒");
return;
diff --git a/DevApp/Gs.DevApp/XtraForm1.cs b/DevApp/Gs.DevApp/XtraForm1.cs
index 8867059..ad5953f 100644
--- a/DevApp/Gs.DevApp/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.cs
@@ -1,20 +1,5 @@
-锘縰sing DevExpress.Internal.WinApi;
-using DevExpress.Utils;
-using DevExpress.XtraBars.ToastNotifications;
-using DevExpress.XtraEditors;
-using DevExpress.XtraTreeList;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
+锘縰sing DevExpress.Utils;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
namespace Gs.DevApp
{
@@ -23,7 +8,7 @@
public XtraForm1()
{
InitializeComponent();
-
+
}
private void simpleButton1_Click(object sender, EventArgs e)
@@ -42,7 +27,7 @@
aa.ToolTipType = ToolTipType.Standard;//鏍囧噯鏍峰紡锛屽彲鏄剧ず楦熷槾銆�
aa.IconType = ToolTipIconType.Information; //娑堟伅鍥炬爣
aa.IconSize = ToolTipIconSize.Small; //澶у浘鏍�
-
+
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3