DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookupTypes.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookups.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DevApp/Gs.DevApp/Gs.DevApp.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -7,6 +7,7 @@ using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; using DevExpress.XtraGrid.Views.Grid; using Gs.DevApp.DevFrm.QC.Models; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,304 @@ using DevExpress.XtraGrid.Views.Grid; using DevExpress.XtraGrid.Views.Grid.ViewInfo; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Data; using System.Drawing; using System.Windows.Forms; namespace Gs.DevApp.DevFrm { public partial class Frm_MesQmCheckitemDt : DevExpress.XtraEditors.XtraForm { string _webServiceName = "MesQmCheckitemManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_MesQmCheckitemDt() { InitializeComponent(); this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; getPageList(1, UtilityHelper.GetPageSize()); pageBar1.PagerEvent += PageBar1_PagerEvent; gridView1.CustomDrawRowIndicator += (s, e) => { if (e.Info.IsRowIndicator && e.RowHandle >= 0) { e.Info.DisplayText = (e.RowHandle + 1).ToString(); } }; gridView1.CustomDrawEmptyForeground += (s, e) => { string str = "ææªæ¥æ¾å°å¹é çæ°æ®!"; Font f = new Font("微软é é»", 16); Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; } /// <summary> /// åå»äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e) { string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid"); if (!string.IsNullOrEmpty(rowGuid)) getModel(rowGuid, false, 999); } /// <summary> /// å页äºä»¶ /// </summary> /// <param name="curPage"></param> /// <param name="pageSize"></param> private void PageBar1_PagerEvent(int curPage, int pageSize) { getPageList(curPage, pageSize); } /// <summary> /// æ¥è¯¢äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) { Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } /// <summary> /// æ¥è¯¢åè° /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) { _filterList = e.FilterList; getPageList(1, pageBar1.RowsCount); } /// <summary> /// åæ¶äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); } /// <summary> /// å é¤äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) { string rowGuid = "", rowName = ""; // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { ToolBox.MsgHelper.Warning("请å éæ©ä½ è¦æä½çè¡ï¼"); return; } if (!MsgHelper.AskQuestion("ä½ éæ©äºã" + rowName + "ãï¼ç¡®å®å é¤åï¼")) return; List<dynamic> lst = new List<dynamic>(); lst.Add(rowGuid); var _obj = lst; try { string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); } ToolBox.MsgHelper.Warning("æç¤ºï¼" + _rtn.rtnMsg); } catch (Exception ex) { ToolBox.MsgHelper.Warning("æç¤ºï¼" + ex.Message); } } /// <summary> /// å·æ°äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); } /// <summary> /// ä¿®æ¹äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) { string rowGuid = "", rowName = ""; // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { ToolBox.MsgHelper.Warning("请å éæ©ä½ è¦æä½çè¡ï¼"); return; } getModel(rowGuid, true, 1); } /// <summary> /// æ°å¢äºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 1); lbGuid.Text = ""; List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gridViews.Add(gvMx1); UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } /// <summary> /// ä¿åäºä»¶ /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; //if (string.IsNullOrEmpty(txt_account.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("ç»å½è´¦å·ä¸è½ä¸ºç©ºï¼"); // txt_account.Focus(); return; } var _obj = new { guid = lbGuid.Text.Trim(),//主建 }; try { string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); ToolBox.MsgHelper.Warning("æç¤ºï¼" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { lbGuid.Text = _rtn.rtnData; toolBarMenu1.isSetBtn = true; UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false); } } catch (Exception ex) { ToolBox.MsgHelper.Warning("æç¤ºï¼" + ex.Message); } } /// <summary> /// /// </summary> /// <param name="curPage">第å 页</param> /// <param name="pageSize">æ¯é¡µå æ¡</param> private void getPageList(int curPage, int pageSize) { System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); foreach (FilterEntity itm in _filterList) { _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'"); } PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try { string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json); ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn); if (dd.rtnCode > 0) { DataTable dt = dd.rtnData.list; gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); int dddd = dd.rtnData.pages;//æ»é¡µ pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total;//è®°å½æ»æ° pageBar1.CurrentPage = curPage;//å½å页 pageBar1.RowsCount = pageSize;//æ¯é¡µæ¾ç¤º pageBar1.setTxt(); } else { ToolBox.MsgHelper.ShowError("æç¤ºï¼" + dd.rtnMsg); } } catch (Exception ex) { ToolBox.MsgHelper.Warning("æç¤ºï¼" + ex.Message); } } private void getModel(string strGuid, bool isEdit, int tabIdx) { if (string.IsNullOrEmpty(strGuid)) { ToolBox.MsgHelper.Warning("请å éæ©ä½ è¦æä½çè¡ï¼"); return; } UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); var _obj = new { guid = strGuid,//主建 }; try { string strJson = UtilityHelper.HttpPost("", _webServiceName +"GetModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { dynamic dy = _rtn.rtnData; lbGuid.Text = strGuid; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList); JObject _job = JObject.Parse(strJson); JArray array = new JArray(); foreach (var a in _job["rtnData"]["list"]) { array.Add(a); } DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); if (dt.Rows.Count > 0) { gcMx1.BindingContext = new BindingContext(); gcMx1.DataSource = dt; gcMx1.ForceInitialize(); } else { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } } else ToolBox.MsgHelper.Warning("æç¤ºï¼" + _rtn.rtnMsg); } catch (Exception ex) { ToolBox.MsgHelper.Warning("æç¤ºï¼" + ex.Message); } } } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -7,6 +7,7 @@ using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; using DevExpress.XtraGrid.Views.Grid; using Gs.DevApp.DevFrm.QC.Models; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,191 @@ using System; using System.Collections.Generic; namespace Gs.DevApp.DevFrm.QC.Models { /// <summary> /// IQCãOQCæ£éªé¡¹ç® /// </summary> public class MesQmCheckitem { /// <summary> /// é»è®¤å¼: (newid()) /// </summary> public Guid Guid { 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 Memo { get; set; } /// <summary> /// ç©æäº§åç¼ç /// </summary> public string ItemNo { get; set; } /// <summary> /// åç±» /// </summary> public string Ftype { get; set; } /// <summary> /// 项ç®åç±»(1:æ½æ£ 2:å·¡æ£ 3:å®å·¥æ£éª) /// </summary> public string CheckType { get; set; } /// <summary> /// 客æ·åç§° /// </summary> public string Name1 { get; set; } /// <summary> /// ç¹æ®è§æ ¼ç©æ /// </summary> public long? FspecialItem { get; set; } /// <summary> /// æå±å·¥å /// </summary> public string Factory { get; set; } /// <summary> /// æ£éªæ°´å /// </summary> public string FInspectionLevel { get; set; } /// <summary> /// æ£éªæ°´å¹³ /// </summary> public string FcheckLevel { get; set; } /// <summary> /// æ¥æ¶æ°´å¹³ /// </summary> public string FreceivingLevel { get; set; } /// <summary> /// å®¡æ¹æ è®° /// é»è®¤å¼: ((0)) /// </summary> public bool? FOneChecked { get; set; } /// <summary> /// 审æ¹äºº /// </summary> public string FOneCheckor { get; set; } /// <summary> /// å®¡æ¹æ¥æ /// </summary> public DateTime? FOneCheckDate { get; set; } /// <summary> /// æ¹åæ è®° /// é»è®¤å¼: ((0)) /// </summary> public bool? FTwoChecked { get; set; } /// <summary> /// æ¹å人 /// </summary> public string FTwoCheckor { get; set; } /// <summary> /// æ¹åæ¥æ /// </summary> public DateTime? FTwoCheckDate { get; set; } /// <summary> /// ä¿®æ¹/ æ°å¢ç¶æ /// é»è®¤å¼: ((0)) /// </summary> public bool? EditStatus { get; set; } /// <summary> /// çæ¬ /// é»è®¤å¼: ((0)) /// </summary> public long? FVersion { get; set; } /// <summary> /// æ¯å¦å¯ç¨ /// é»è®¤å¼: ((0)) /// </summary> public bool? IsEnabled { get; set; } /// <summary> /// </summary> public string Company { get; set; } /// <summary> /// 客æ·ç¼ç /// </summary> public string Kunnr { get; set; } /// <summary> /// æå¤§æ½æ£æ° /// </summary> public long? MaxCheckQty { get; set; } /// <summary> /// æéæ¬¡æ° /// </summary> public long? RemQty { get; set; } /// <summary> /// æªè®ºè¯ç©æ /// </summary> public bool? Otherflag { get; set; } /// <summary> /// æåçµæ± ç±»åï¼å¨å/ å¨è½ /// </summary> public string Battype { get; set; } /// <summary> /// 项ç®åç§° /// </summary> public string ProjectName { get; set; } /// <summary> /// ç©æåç§° /// </summary> public string Tname { get; set; } /// <summary> /// ç©æID /// </summary> public long? ItemId { get; set; } public string UserName { get; set; } public string LastName { get; set; } public string FInspectionLevelName { get; set; } public string ItemModel { get; set; } public string ItemName { get; set; } public List<MesQmCheckitemDt> list { get; set; } } } DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,218 @@ using System; namespace Gs.DevApp.DevFrm.QC.Models { /// <summary> /// æ£éªé¡¹ç®ä»è¡¨ /// </summary> public class MesQmCheckitemDt { /// <summary> /// é»è®¤å¼: (newid()) /// </summary> public Guid Guid { 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 Memo { get; set; } /// <summary> /// ç©æäº§åç¼ç /// </summary> public string ItemNo { get; set; } /// <summary> /// é¡ºåº /// </summary> public long? Forder { get; set; } /// <summary> /// ä¸å ¬å·® /// </summary> public string FupAllow { get; set; } /// <summary> /// æ£éªé¡¹ç® /// </summary> public string FcheckItem { get; set; } /// <summary> /// ç¹æ®ç¹æ§ç±»å« /// </summary> public string FspecType { get; set; } /// <summary> /// å¤ç¨ /// </summary> public long? WorkshopCenterCode { get; set; } /// <summary> /// å·¥åº /// </summary> public string ProcNo { get; set; } /// <summary> /// æ£éªæ°´åç¼ç /// </summary> public string SampleSizeNo { get; set; } /// <summary> /// æ£éªå·¥å · /// </summary> public string FcheckTool { get; set; } /// <summary> /// ä¸å ¬å·® /// </summary> public string FdownAllow { get; set; } /// <summary> /// æ£éªæ°´å¹³ /// </summary> public string FcheckLevel { get; set; } /// <summary> /// æ åå¼ /// </summary> public string Fstand { get; set; } /// <summary> /// æ¥æ¶æ°´å¹³ /// </summary> public string FacLevel { get; set; } /// <summary> /// å¤ç¨ /// </summary> public string FeatuProc { get; set; } /// <summary> /// å¤ç¨ /// </summary> public string FeatuProd { get; set; } /// <summary> /// å¤ç¨ /// </summary> public string Aql1Id { get; set; } /// <summary> /// å¤ç¨ /// </summary> public string FqaType { get; set; } /// <summary> /// æ¯å¦æ¡£ä½ /// é»è®¤å¼: ((0)) /// </summary> public bool? Isdanwei { get; set; } /// <summary> /// é»è®¤ç¨äºå¨åºéæ£ /// é»è®¤å¼: ((1)) /// </summary> public long? Ftype { get; set; } /// <summary> /// ä¿®æ¹/ æ°å¢ç¶æ /// é»è®¤å¼: ((0)) /// </summary> public bool? EditStatus { get; set; } /// <summary> /// æ½æ£æ°é /// </summary> public long? CheckQty { get; set; } /// <summary> /// å æ¶æ°é /// é»è®¤å¼: ((0)) /// </summary> public long? FacQty { get; set; } /// <summary> /// </summary> public string Company { get; set; } /// <summary> /// </summary> public string Factory { get; set; } /// <summary> /// 颿¬¡ /// </summary> public string Frequency { get; set; } /// <summary> /// è§æ ¼è¦æ± /// </summary> public string FspecRequ { get; set; } /// <summary> /// 项ç®ç±»å« /// </summary> public string FcheckType { get; set; } /// <summary> /// åä½ /// </summary> public string Funit { get; set; } /// <summary> /// æ¥è¡¨éæ© /// é»è®¤å¼: ((0)) /// </summary> public bool? ReporfCheck { get; set; } /// <summary> /// ç¹å®ä¿®æ¹ /// é»è®¤å¼: ((0)) /// </summary> public bool? GivenModify { get; set; } /// <summary> /// UCL_X设å®å¼ /// </summary> public decimal? Fucl { get; set; } /// <summary> /// LCL_X设å®å¼ /// </summary> public decimal? Flcl { get; set; } /// <summary> /// UCL_R设å®å¼ /// </summary> public decimal? Frucl { get; set; } /// <summary> /// ç©æID /// </summary> public long? ItemId { get; set; } /// <summary> /// </summary> public Guid? Pid { get; set; } } } DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookupTypes.cs
@@ -1,7 +1,7 @@ using System; using System.Collections.Generic; namespace MES.Service.Modes namespace Gs.DevApp.DevFrm.QC.Models { /// <summary> /// ç³»ç»å¿«ç å类表 DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookups.cs
@@ -1,6 +1,6 @@ using System; namespace MES.Service.Modes namespace Gs.DevApp.DevFrm.QC.Models { /// <summary> /// ç³»ç»å¿«ç 表 DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -229,12 +229,20 @@ <Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs"> <DependentUpon>Frm_IQCLookups.cs</DependentUpon> </Compile> <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDt.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDt.Designer.cs"> <DependentUpon>Frm_MesQmCheckitemDt.cs</DependentUpon> </Compile> <Compile Include="DevFrm\QC\Frm_MesSysLookups.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs"> <DependentUpon>Frm_MesSysLookups.cs</DependentUpon> </Compile> <Compile Include="DevFrm\QC\Models\MesQmCheckitem.cs" /> <Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" /> <Compile Include="DevFrm\QC\Models\MesSysLookups.cs" /> <Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" /> <Compile Include="DevFrm\Rpt\RptPreview.cs"> @@ -452,6 +460,9 @@ <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx"> <DependentUpon>Frm_IQCLookups.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\Frm_MesQmCheckitemDt.resx"> <DependentUpon>Frm_MesQmCheckitemDt.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\Frm_MesSysLookups.resx"> <DependentUpon>Frm_MesSysLookups.cs</DependentUpon> </EmbeddedResource>