From ce8e6ea5d262001b2b4bd711a85e18d8e0071003 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 25 十月 2024 16:16:21 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | 218 ++++++++++++++++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 304 +++++++++++++++++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 11
DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookups.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs | 191 ++++++++++++++
DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookupTypes.cs | 2
8 files changed, 728 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index a3c2f1b..1a7d0b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/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;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
new file mode 100644
index 0000000..a10c56c
--- /dev/null
+++ b/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);
+ }
+ }
+ }
+}
\ 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 398bdd4..92e5e9c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/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;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
new file mode 100644
index 0000000..61f370f
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitem.cs
@@ -0,0 +1,191 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+namespace Gs.DevApp.DevFrm.QC.Models
+{
+ /// <summary>
+ /// IQC銆丱QC妫�楠岄」鐩�
+ /// </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; }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
new file mode 100644
index 0000000..28eabf1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
@@ -0,0 +1,218 @@
+锘縰sing 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; }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookupTypes.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookupTypes.cs
index 3bccf63..54c9a32 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookupTypes.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookupTypes.cs
@@ -1,7 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
-namespace MES.Service.Modes
+namespace Gs.DevApp.DevFrm.QC.Models
{
/// <summary>
/// 绯荤粺蹇爜鍒嗙被琛�
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookups.cs
index 33797cd..4983d8f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesSysLookups.cs
@@ -1,6 +1,6 @@
锘縰sing System;
-namespace MES.Service.Modes
+namespace Gs.DevApp.DevFrm.QC.Models
{
/// <summary>
/// 绯荤粺蹇爜琛�
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 4ee0bdd..c6ef554 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/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>
--
Gitblit v1.9.3