From 510643d77bd33d73bb9afae041120941e978b91c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 28 十月 2024 16:30:57 +0800
Subject: [PATCH] 增加了来料检验申请
---
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs | 79 +++
DevApp/Gs.DevApp/TestForm/XtraForm1.cs | 1
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 5
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 202 ++++----
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs | 332 +++++++++++++
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs | 356 +++++++-------
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs | 165 ++++++
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs | 262 +++++-----
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 19
9 files changed, 1,008 insertions(+), 413 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 7ee739a..96811fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -121,7 +121,7 @@
"User/GetUserLoginInfo", JsonConvert.SerializeObject(_obj));
var _job = JObject.Parse(strJson);
var rtnCode = _job["rtnCode"].ToString();
-
+ _loading.Stop();
if (int.Parse(rtnCode) > 0)
{
acrd.Clear();
@@ -186,9 +186,10 @@
}
catch (Exception ex)
{
+ _loading.Stop();
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs
new file mode 100644
index 0000000..f373efb
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetect01.cs
@@ -0,0 +1,332 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MES.Service.Modes
+{
+
+ public class MesQaItemsDetect01
+ {
+ /// <summary>
+ ///
+ ///</summary>
+
+ public Guid? Guid { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public int Id { get; set; }
+ /// <summary>
+ /// 妫�楠屽崟鍙�
+ ///</summary>
+
+ public string ReleaseNo { get; set; }
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ ///</summary>
+
+ public DateTime? FcheckDate { get; set; }
+ /// <summary>
+ /// 妫�楠屼汉鍛�
+ ///</summary>
+
+ public string FcheckBy { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ ///</summary>
+
+ public string ItemNo { get; set; }
+ /// <summary>
+ /// 鏉ユ枡鏁伴噺
+ ///</summary>
+
+ public decimal? FbatchQty { get; set; }
+ /// <summary>
+ /// 鍒ゅ畾缁撴灉
+ ///</summary>
+
+ public string FreceQty { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string SuppNo { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string FngDesc { get; set; }
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ ///</summary>
+
+ public string FcheckResu { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string Freview { get; set; }
+ /// <summary>
+ /// 妫�楠屾按鍑�
+ ///</summary>
+
+ public string SampleSizeNo { get; set; }
+ /// <summary>
+ /// 妫�楠屾按骞�
+ ///</summary>
+
+ public string FcheckLevel { get; set; }
+ /// <summary>
+ /// 鎷掓敹姘村钩
+ ///</summary>
+
+ public string FacLevel { get; set; }
+ /// <summary>
+ /// 鎶芥鏁伴噺
+ ///</summary>
+
+ public string CheckQty { get; set; }
+ /// <summary>
+ /// 鎵规鍙� --鍒拌揣鍗曞彿
+ ///</summary>
+
+ public string LotNo { get; set; }
+ /// <summary>
+ /// 鏄惁鎺ㄩ��
+ ///</summary>
+
+ public string Fmove { get; set; }
+ /// <summary>
+ /// 鏄惁澶勭悊
+ ///</summary>
+
+ public string Fhandle { 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 int? Modify1Flag { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string Modify1By { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public DateTime? Modify1Date { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string Factory { get; set; }
+ /// <summary>
+ /// XRF娴嬭瘯鎶ュ憡缂栧彿
+ ///</summary>
+
+ public string FcheckRepno { get; set; }
+ /// <summary>
+ /// 绗笁鏂规姤鍛�
+ ///</summary>
+
+ public string FthirdRep { get; set; }
+ /// <summary>
+ /// 鏄惁浣滃簾
+ ///</summary>
+
+ public int? Fcancel { get; set; }
+ /// <summary>
+ /// 鎻愪氦鏍囪瘑
+ ///</summary>
+
+ public int? Fsubmit { get; set; }
+ /// <summary>
+ /// 妫�楠屼緷鎹�
+ ///</summary>
+
+ public string FcheckAccord { get; set; }
+ /// <summary>
+ /// 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱)
+ ///</summary>
+
+ public int? Ftype { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+
+ public string ItemUnit { get; set; }
+ /// <summary>
+ /// 鍑鸿揣鏃ユ湡
+ ///</summary>
+
+ public string OutDate { get; set; }
+ /// <summary>
+ /// 鏄惁鍏嶆
+ ///</summary>
+
+ public int? Fexemption { get; set; }
+ /// <summary>
+ /// 妗ｄ綅鏍囧噯
+ ///</summary>
+
+ public string FgearStand { get; set; }
+ /// <summary>
+ /// 涓嶈壇澶勭悊鏂规硶
+ ///</summary>
+
+ public string FngHandle { get; set; }
+ /// <summary>
+ /// 绠＄悊缂栧彿
+ ///</summary>
+
+ public string FmanageNo { get; set; }
+ /// <summary>
+ /// 杞崲鏁伴噺
+ ///</summary>
+
+ public string FcovertQty { get; set; }
+ /// <summary>
+ /// 鐗堟湰
+ ///</summary>
+
+ public int? Fversion { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string Company { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string FsecondResu { get; set; }
+ /// <summary>
+ /// 鏈�澶ф娊妫�鏁�
+ ///</summary>
+
+ public int? MaxCheckQty { get; set; }
+ /// <summary>
+ /// 鐗瑰畾淇敼鏄惁瀹℃牳
+ ///</summary>
+
+ public int? Modify1Flag1 { get; set; }
+ /// <summary>
+ /// 鐗瑰畾淇敼瀹℃牳浜�
+ ///</summary>
+
+ public string Modify1By1 { get; set; }
+ /// <summary>
+ /// 鐗瑰畾淇敼瀹℃牳鏃堕棿
+ ///</summary>
+
+ public DateTime? Modify1Date1 { get; set; }
+ /// <summary>
+ /// 灏忔壒娆″彿
+ ///</summary>
+
+ public string LotNo1 { get; set; }
+ /// <summary>
+ /// 閲囪喘鍗曞彿
+ ///</summary>
+
+ public string LotNo2 { get; set; }
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ ///</summary>
+
+ public string BoardStyle { get; set; }
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ ///</summary>
+
+ public string WorkNo { get; set; }
+ /// <summary>
+ /// 鍒拌揣鏃堕棿
+ ///</summary>
+
+ public string Dha018 { get; set; }
+ /// <summary>
+ /// 琛屽彿
+ ///</summary>
+
+ public int? Dhb002 { get; set; }
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ ///</summary>
+
+ public string Dhb001 { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟�
+ ///</summary>
+
+ public string Lifnr { get; set; }
+ /// <summary>
+ /// 閫�鏂欐柟寮�
+ ///</summary>
+
+ public string Fmrmode { get; set; }
+ /// <summary>
+ /// erp杩斿洖淇℃伅
+ ///</summary>
+
+ public string Msg { get; set; }
+ /// <summary>
+ /// 鐘舵��
+ ///</summary>
+
+ public string States { get; set; }
+ /// <summary>
+ /// IQC鎻愪氦鏃堕棿
+ ///</summary>
+
+ public DateTime? IqcDate { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟ID
+ ///</summary>
+
+ public int? EbelnK3id { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛孖D
+ ///</summary>
+
+ public int? LineK3id { get; set; }
+ /// <summary>
+ /// 璐ㄩ噺瀹℃牳鏍囪瘑
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public int? QualityAudit { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+
+ public int? ItemId { get; set; }
+ /// <summary>
+ /// 涓嶈壇鎻忚堪
+ ///</summary>
+
+ public string Remarks { get; set; }
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs
new file mode 100644
index 0000000..7358aa5
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail12.cs
@@ -0,0 +1,79 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MES.Service.Modes
+{
+ /// <summary>
+ ///
+ ///</summary>
+
+ public class MesQaItemsDetectDetail12
+ {
+ /// <summary>
+ ///
+ ///</summary>
+
+ public Guid Guid { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public int Id { get; set; }
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ ///</summary>
+
+ public string FcheckResu { get; set; }
+ /// <summary>
+ /// 妫�楠岄」鐩�
+ ///</summary>
+
+ public string FcheckItem { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏉＄爜
+ ///</summary>
+
+ public string ItemBarcode { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string ReleaseNo { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public int? MainId { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public DateTime? CreateDate { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string Company { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string Factory { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string Fstand { get; set; }
+ /// <summary>
+ /// 鐢熸垚浜�
+ ///</summary>
+
+ public string LastupdateBy { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string CreateBy { get; set; }
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs
new file mode 100644
index 0000000..04ed58a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQaItemsDetectDetail5.cs
@@ -0,0 +1,165 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MES.Service.Modes
+{
+ /// <summary>
+ ///
+ ///</summary>
+
+ public class MesQaItemsDetectDetail5
+ {
+ /// <summary>
+ ///
+ ///</summary>
+
+ public Guid Guid { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public int Id { get; set; }
+ /// <summary>
+ /// 鏍囧噯鍊肩被鍨�
+ ///</summary>
+
+ public string FtextType { get; set; }
+ /// <summary>
+ /// 鏍囧噯鍊�
+ ///</summary>
+
+ public int? Fstand { get; set; }
+ /// <summary>
+ /// 涓婂叕宸�
+ ///</summary>
+
+ public string FupAllow { get; set; }
+ /// <summary>
+ /// 涓嬪叕宸�
+ ///</summary>
+
+ public string FdownAllow { get; set; }
+ /// <summary>
+ /// 妫�楠屾按鍑�
+ ///</summary>
+
+ public string SampleSizeNo { get; set; }
+ /// <summary>
+ /// 妫�楠屾按骞�
+ ///</summary>
+
+ public string FcheckLevel { get; set; }
+ /// <summary>
+ /// 鎷掓敹姘村钩
+ ///</summary>
+
+ public string FacLevel { get; set; }
+ /// <summary>
+ /// 妫�楠岄」鐩�
+ ///</summary>
+
+ public string FcheckItem { get; set; }
+ /// <summary>
+ /// 瑙勬牸瑕佹眰
+ ///</summary>
+
+ public string FspecRequ { get; set; }
+ /// <summary>
+ /// 鎶芥鏁伴噺
+ ///</summary>
+
+ public int? CheckQyt { get; set; }
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ ///</summary>
+
+ public string FcheckResu { get; set; }
+ /// <summary>
+ /// AC鏁伴噺
+ ///</summary>
+
+ public int? FacQty { get; set; }
+ /// <summary>
+ /// RE鏁伴噺
+ ///</summary>
+
+ public int? FreQty { get; set; }
+ /// <summary>
+ /// 涓嶅悎鏍兼暟
+ ///</summary>
+
+ public int? FngQty { get; set; }
+ /// <summary>
+ /// 涓嶈壇鐜�
+ ///</summary>
+
+ public decimal? FngRate { get; set; }
+ /// <summary>
+ /// 宸插綍鍏ユ暟閲�
+ ///</summary>
+
+ public decimal? FenterQty { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string ReleaseNo { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string Company { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+
+ public string Factory { get; set; }
+ /// <summary>
+ /// 妫�楠岄」鐩弿杩�
+ ///</summary>
+
+ public string FcheckItemDesc { get; set; }
+ /// <summary>
+ /// 宸ュ簭鍙�
+ ///</summary>
+
+ public string ProcNo { get; set; }
+ /// <summary>
+ /// 宸ヤ綔涓績缂栫爜
+ ///</summary>
+
+ public string WorkshopCenterCode { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+
+ public string Funit { get; set; }
+ /// <summary>
+ /// 鐗瑰畾淇敼
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public int? GivenModify { get; set; }
+ /// <summary>
+ /// 妫�楠屽伐鍏�
+ ///</summary>
+
+ public string FcheckTool { get; set; }
+ /// <summary>
+ /// 鏇存柊浜�
+ ///</summary>
+
+ public string LastupdateBy { get; set; }
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ ///</summary>
+
+ public DateTime? LastupdateDate { get; set; }
+ /// <summary>
+ /// 涓嶅悎鏍兼弿杩�
+ ///</summary>
+
+ public string Remarks { get; set; }
+ }
+}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index bda4328..d515f67 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -1,7 +1,7 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm
{
- partial class Frm_MesInvItemArn
+ partial class Frm_MesInvItemArn
{
/// <summary>
/// Required designer variable.
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1cgRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -63,6 +63,7 @@
this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_thstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fType = new DevExpress.XtraEditors.LabelControl();
this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -98,6 +99,8 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_ischeck = new DevExpress.XtraEditors.CheckEdit();
this.txt_depotsCode = new Gs.DevApp.UserControl.UcLookCk();
@@ -109,9 +112,6 @@
this.lbGuid = new System.Windows.Forms.Label();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
- this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -128,10 +128,10 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx1states
@@ -507,9 +507,8 @@
this.gvMx1states});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gvAbtGuid
@@ -536,13 +535,22 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "閲囪喘鏃堕棿";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.Width = 94;
//
// gv_thstatus
//
@@ -1016,6 +1024,22 @@
this.panel1.Size = new System.Drawing.Size(1231, 155);
this.panel1.TabIndex = 1;
//
+ // txt_fType
+ //
+ this.txt_fType.Location = new System.Drawing.Point(685, 53);
+ this.txt_fType.Name = "txt_fType";
+ this.txt_fType.Properties.Caption = "";
+ this.txt_fType.Size = new System.Drawing.Size(35, 24);
+ this.txt_fType.TabIndex = 450;
+ //
+ // txt_urgentFlag
+ //
+ this.txt_urgentFlag.Location = new System.Drawing.Point(685, 16);
+ this.txt_urgentFlag.Name = "txt_urgentFlag";
+ this.txt_urgentFlag.Properties.Caption = "";
+ this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
+ this.txt_urgentFlag.TabIndex = 449;
+ //
// labelControl2
//
this.labelControl2.Location = new System.Drawing.Point(28, 128);
@@ -1026,10 +1050,11 @@
//
// txt_ischeck
//
+ this.txt_ischeck.Enabled = false;
this.txt_ischeck.Location = new System.Drawing.Point(685, 89);
this.txt_ischeck.Name = "txt_ischeck";
- this.txt_ischeck.Properties.Caption = "";
- this.txt_ischeck.Size = new System.Drawing.Size(27, 24);
+ this.txt_ischeck.Properties.Caption = "鏄惁鎻愪氦妫�楠�";
+ this.txt_ischeck.Size = new System.Drawing.Size(118, 24);
this.txt_ischeck.TabIndex = 447;
//
// txt_depotsCode
@@ -1117,31 +1142,6 @@
this.txt_remark.Size = new System.Drawing.Size(150, 28);
this.txt_remark.TabIndex = 240;
//
- // gridColumn3
- //
- this.gridColumn3.Caption = "閲囪喘鏃堕棿";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
- this.gridColumn3.Width = 94;
- //
- // txt_urgentFlag
- //
- this.txt_urgentFlag.Location = new System.Drawing.Point(685, 16);
- this.txt_urgentFlag.Name = "txt_urgentFlag";
- this.txt_urgentFlag.Properties.Caption = "";
- this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
- this.txt_urgentFlag.TabIndex = 449;
- //
- // txt_fType
- //
- this.txt_fType.Location = new System.Drawing.Point(685, 53);
- this.txt_fType.Name = "txt_fType";
- this.txt_fType.Properties.Caption = "";
- this.txt_fType.Size = new System.Drawing.Size(35, 24);
- this.txt_fType.TabIndex = 450;
- //
// Frm_MesInvItemArn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1167,15 +1167,15 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
this.ResumeLayout(false);
}
#endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
@@ -1185,67 +1185,67 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
- private DevExpress.XtraTab.XtraTabControl tabMx;
-
- //BQCreateConrolObejct
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1cgRkqty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1dha001;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1isdepsIn;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fType;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1workLine;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1okQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ischeck;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkStates;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkRes;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1subQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnLine;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_thstatus;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
-private DevExpress.XtraEditors.LabelControl lb_fType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
+ //BQCreateConrolObejct
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1cgRkqty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1dha001;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1isdepsIn;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fType;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1workLine;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1okQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ischeck;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkStates;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkRes;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1subQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnLine;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_thstatus;
-private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gv_insby;
+ private DevExpress.XtraEditors.LabelControl lb_fType;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
-private DevExpress.XtraEditors.LabelControl lb_ischeck;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ischeck;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkRes;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+ private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_insby;
-private DevExpress.XtraEditors.LabelControl lb_paperBillNo;
-private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_paperBillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraEditors.LabelControl lb_ischeck;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ischeck;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkRes;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
-private DevExpress.XtraEditors.LabelControl lb_status;
-private DevExpress.XtraEditors.TextEdit txt_status;
+ private DevExpress.XtraEditors.LabelControl lb_paperBillNo;
+ private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_paperBillNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-private DevExpress.XtraEditors.LabelControl lb_billNo;
-private DevExpress.XtraEditors.TextEdit txt_billNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+ private DevExpress.XtraEditors.LabelControl lb_status;
+ private DevExpress.XtraEditors.TextEdit txt_status;
+
+ private DevExpress.XtraEditors.LabelControl lb_billNo;
+ private DevExpress.XtraEditors.TextEdit txt_billNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraEditors.LabelControl labelControl1;
private UserControl.UcLookSupplier txt_suppNo;
private DevExpress.XtraEditors.SimpleButton btnSelect;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index c09832d..55cbb39 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -2,8 +2,10 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
+using System.Security.Cryptography;
using System.Text;
using System.Windows.Forms;
+using DevExpress.DataAccess.DataFederation;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -66,8 +68,15 @@
"MesInvItemArnDetailManager/GetListPageByCgmxGuid",
JsonConvert.SerializeObject(_obj));
var dt = UtilityHelper.ReturnToList(strReturn);
+ DataTable _newTable = dt.rtnData;
+ DataTable _oldTable = (DataTable)gcMx1.DataSource;
+ DataRow[] sourceRows = _newTable.Select();
+ for (int i = 0; i < sourceRows.Length; i++)
+ {
+ _oldTable.ImportRow(sourceRows[i]);
+ }
gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt.rtnData;
+ gcMx1.DataSource = _oldTable;
gcMx1.ForceInitialize();
};
frm.ShowDialog();
@@ -283,16 +292,18 @@
}
var _obj = new MesInvItemArn();
- _obj.Guid = null; //鍒拌揣鍗曚富閿�
+ _obj.Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()); //鍒拌揣鍗曚富閿�
_obj.PaperBillNo = txt_paperBillNo.Text.Trim(); //閫佽揣鍗曞彿;
_obj.Remark = ""; //澶囨敞
_obj.SuppNo = _gysCode; //渚涘簲鍟嗙紪鍙�
_obj.DepotsCode = _ckCode; //浠撳簱缂栧彿 depots_code
- _obj.FType = 1; //0=閲囪喘锛�1=濮斿
+ _obj.FType = txt_fType.Checked; //0=閲囪喘锛�1=濮斿
+ _obj.UrgentFlag = txt_urgentFlag.Checked;//0=涓嶆�ワ紝1=鎬�
_obj.list = new List<MesInvItemArnDetail>();
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
- if (gvMx1.DataRowCount <= 0) {
+ if (gvMx1.DataRowCount <= 0)
+ {
MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
return;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
index 880eabc..2846cc4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
@@ -1,218 +1,218 @@
锘縰sing System;
using System.Collections.Generic;
-
+using System.Linq;
+
namespace MES.Service.Modes
{
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
+
public class MesInvItemArn
{
/// <summary>
- /// 涓婚敭
- /// </summary>
+ /// 涓婚敭
+ ///</summary>
+
public Guid? Guid { get; set; }
-
/// <summary>
- /// ID(SEQ_INV_ID)
- /// </summary>
+ /// ID(SEQ_INV_ID)
+ ///</summary>
+
public int Id { get; set; }
-
/// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
+ /// 鍒拌揣鍗曞彿
+ ///</summary>
+
public string BillNo { get; set; }
-
/// <summary>
- /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
public int? Status { get; set; }
-
/// <summary>
- /// 鍘熷洜
- /// </summary>
+ /// 鍘熷洜
+ ///</summary>
+
public string Reason { get; set; }
-
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+
public string CreateBy { get; set; }
-
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+
public DateTime? CreateDate { get; set; }
-
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
+
public string LastupdateBy { get; set; }
-
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+
public DateTime? LastupdateDate { get; set; }
-
/// <summary>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
+ /// 鍗曟嵁绫诲瀷ID
+ ///</summary>
+
public int? BillTypeId { get; set; }
-
/// <summary>
- /// 浜嬪姟绫诲瀷ID
- /// </summary>
+ /// 浜嬪姟绫诲瀷ID
+ ///</summary>
+
public int? TransactionId { get; set; }
-
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
+
public string Remark { get; set; }
-
/// <summary>
- /// 閫佽揣鍗曞彿
- /// </summary>
+ /// 閫佽揣鍗曞彿
+ ///</summary>
+
public string PaperBillNo { get; set; }
-
/// <summary>
- /// 閫�鏂欎汉宸ュ彿
- /// </summary>
+ /// 閫�鏂欎汉宸ュ彿
+ ///</summary>
+
public string UserNoBack { get; set; }
-
/// <summary>
- /// 鎻愪氦浜�
- /// </summary>
+ /// 鎻愪氦浜�
+ ///</summary>
+
public string CheckUser { get; set; }
-
/// <summary>
- /// 鎻愪氦鏃ユ湡
- /// </summary>
+ /// 鎻愪氦鏃ユ湡
+ ///</summary>
+
public DateTime? CheckDate { get; set; }
-
/// <summary>
- /// 鍏ュ簱鏃ユ湡
- /// </summary>
+ /// 鍏ュ簱鏃ユ湡
+ ///</summary>
+
public DateTime? InsDate { get; set; }
-
/// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
+ /// 妫�楠岀粨鏋�
+ ///</summary>
+
public string CheckRes { get; set; }
-
/// <summary>
- /// 宸叉崱鏁伴噺
- /// </summary>
+ /// 宸叉崱鏁伴噺
+ ///</summary>
+
public int? CheckQty { get; set; }
-
/// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
+ /// 浠撳簱缂栫爜
+ ///</summary>
+
public string DepotsCode { get; set; }
-
/// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- /// </summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ ///</summary>
+
public string TransctionNo { get; set; }
-
/// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ ///</summary>
+
public string SuppNo { get; set; }
-
/// <summary>
- /// 鎻愪氦鐘舵��
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 鎻愪氦鐘舵��
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
public int? Fstatus { get; set; }
-
/// <summary>
- /// 宸ュ巶缂栫爜
- /// </summary>
+ /// 宸ュ巶缂栫爜
+ ///</summary>
+
public string Factory { get; set; }
-
/// <summary>
- /// 鏄惁宸插洖鍐橲AP
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 鏄惁宸插洖鍐橲AP
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
public int? Sapstatus { get; set; }
-
/// <summary>
- /// 纭鍏ュ簱鏃ユ湡
- /// </summary>
- public DateTime? Insdate { get; set; }
+ /// 鏄惁妫�楠�
+ ///</summary>
+ public bool? Ischeck { get; set; }
/// <summary>
- /// 鏄惁妫�楠�
- /// </summary>
- public int? Ischeck { get; set; }
+ /// 瀹℃牳鍏ュ簱浜�
+ ///</summary>
- /// <summary>
- /// 瀹℃牳鍏ュ簱浜�
- /// </summary>
public string Insby { get; set; }
-
/// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
+ /// 鍏徃浠ｇ爜
+ ///</summary>
+
public string Company { get; set; }
-
/// <summary>
- /// 鎬ユ枡鏍囪瘑
- /// 榛樿鍊�: ((0))
- /// </summary>
- public int? UrgentFlag { get; set; }
+ /// 鎬ユ枡鏍囪瘑
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+ public bool? UrgentFlag { get; set; }
/// <summary>
- /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
- /// </summary>
+ /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
+ ///</summary>
+
public int? MttransctionNo { get; set; }
-
/// <summary>
- /// IQC妫�楠屽崟鍙�
- /// </summary>
+ /// IQC妫�楠屽崟鍙�
+ ///</summary>
+
public string IqcReleaseNo { get; set; }
-
/// <summary>
- /// 鏄惁鏄剧ず
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 鏄惁鏄剧ず
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
public int? IsVisual { get; set; }
-
/// <summary>
- /// 0=閲囪喘锛�1=濮斿
- /// 榛樿鍊�: ((1))
- /// </summary>
- public int? FType { get; set; }
+ /// 0=閲囪喘锛�1=濮斿
+ /// 榛樿鍊�: ((1))
+ ///</summary>
+ public bool? FType { get; set; }
/// <summary>
- /// ERP鍒拌揣鍗旾D
- /// </summary>
+ /// ERP鍒拌揣鍗旾D
+ ///</summary>
+
public string EbelnK3id { get; set; }
-
/// <summary>
- /// 鏉＄爜鏉″嵃杩涘害
- /// </summary>
+ /// 鏉＄爜鏉″嵃杩涘害
+ ///</summary>
+
public int? BarcodeRatio { get; set; }
-
/// <summary>
- /// ERP鍗曞彿
- /// </summary>
+ /// ERP鍗曞彿
+ ///</summary>
+
public string Erpno { get; set; }
-
/// <summary>
- /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
- /// </summary>
+ /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
+ ///</summary>
+
public int? Thstatus { get; set; }
-
/// <summary>
- /// ERP閫�璐у崟鍙�
- /// </summary>
+ /// ERP閫�璐у崟鍙�
+ ///</summary>
+
public string Erpthno { get; set; }
-
/// <summary>
- /// 缁勭粐缂栫爜
- /// </summary>
+ /// 缁勭粐缂栫爜
+ ///</summary>
+
public string OrganizeCode { get; set; }
- public List<MesInvItemArnDetail> list { get; set; }
- }
-}
\ No newline at end of file
+ ///
+ 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 f9b5c61..2bdbd07 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs
@@ -1,223 +1,231 @@
锘縰sing System;
-
+using System.Collections.Generic;
+using System.Linq;
+
namespace MES.Service.Modes
{
/// <summary>
- /// </summary>
+ ///
+ ///</summary>
+
public class MesInvItemArnDetail
{
/// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
- public Guid? Guid { get; set; }
-
+ ///
+ /// 榛樿鍊�: (newid())
+ ///</summary>
+
+ public Guid? Guid { get; set; }
/// <summary>
- /// </summary>
- public Guid? ParentGuid { get; set; }
-
+ ///
+ ///</summary>
+
+ public Guid? ParentGuid { get; set; }
/// <summary>
- /// </summary>
- public Guid? AboutGuid { get; set; }
-
+ /// MES_ROH_IN_DATA鐨刧uid
+ ///</summary>
+
+ public Guid? AboutGuid { get; set; }
/// <summary>
- /// ID(SEQ_INV_ID)
- /// </summary>
- public int Id { get; set; }
-
+ /// ID(SEQ_INV_ID)
+ ///</summary>
+
+ public int Id { get; set; }
/// <summary>
- /// 涓昏〃ID
- /// </summary>
- public int? Mid { get; set; }
-
+ /// 涓昏〃ID
+ ///</summary>
+
+ public int? Mid { get; set; }
/// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- public string Ebeln { get; set; }
-
+ /// 閲囪喘鍗曞彿
+ ///</summary>
+
+ public string Ebeln { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
- public int? EbelnLine { get; set; }
-
+ /// 閲囪喘璁㈠崟琛屽彿
+ ///</summary>
+
+ public int? EbelnLine { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟鏁伴噺
- /// </summary>
- public decimal? EbelnQty { get; set; }
-
+ /// 閲囪喘璁㈠崟鏁伴噺
+ ///</summary>
+
+ public decimal? EbelnQty { get; set; }
/// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string ItemNo { get; set; }
-
+ /// 鐗╂枡缂栫爜
+ ///</summary>
+
+ public string ItemNo { get; set; }
/// <summary>
- /// 鏀惰揣鏁伴噺
- /// </summary>
- public decimal? Quantity { get; set; }
-
+ /// 鏀惰揣鏁伴噺
+ ///</summary>
+
+ public decimal? Quantity { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- public string CreateBy { get; set; }
-
+ /// 鍒涘缓浜�
+ ///</summary>
+
+ public string CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- public DateTime? CreateDate { get; set; }
-
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+
+ public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- public string LastupdateBy { get; set; }
-
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
+
+ public string LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- public DateTime? LastupdateDate { get; set; }
-
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+
+ public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
- public string Factory { get; set; }
-
+ /// 鍒嗗巶缂栫爜
+ ///</summary>
+
+ public string Factory { get; set; }
/// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
- public string Company { get; set; }
-
+ /// 鍏徃浠ｇ爜
+ ///</summary>
+
+ public string Company { get; set; }
/// <summary>
- /// 閲囪喘鍗旾D
- /// </summary>
- public int? EbelnK3id { get; set; }
-
+ /// 閲囪喘鍗旾D
+ ///</summary>
+
+ public int? EbelnK3id { get; set; }
/// <summary>
- /// 閲囪喘鍗曡ID
- /// </summary>
- public int? LineK3id { get; set; }
-
+ /// 閲囪喘鍗曡ID
+ ///</summary>
+
+ public int? LineK3id { get; set; }
/// <summary>
- /// 鏈搴旀敹鏁伴噺
- /// </summary>
- public decimal? SubQty { get; set; }
-
+ /// 鏈搴旀敹鏁伴噺
+ ///</summary>
+
+ public decimal? SubQty { get; set; }
/// <summary>
- /// 浣欓噺
- /// </summary>
- public int? MarginQty { get; set; }
-
+ /// 浣欓噺
+ ///</summary>
+
+ public int? MarginQty { get; set; }
/// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- public string WorkNo { get; set; }
-
+ /// 浠诲姟鍗曞彿
+ ///</summary>
+
+ public string WorkNo { get; set; }
/// <summary>
- /// 鎬ユ枡鏍囪瘑
- /// 榛樿鍊�: ((0))
- /// </summary>
- public int? UrgentFlag { get; set; }
-
+ /// 鎬ユ枡鏍囪瘑
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public bool? UrgentFlag { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
- public string Memo { get; set; }
-
+ /// 澶囨敞
+ ///</summary>
+
+ public string Memo { get; set; }
/// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- public string CheckRes { get; set; }
-
+ /// 妫�楠岀粨鏋�
+ ///</summary>
+
+ public string CheckRes { get; set; }
/// <summary>
- /// 妫�楠岀姸鎬� 锛堝緟妫�銆佸垎閫夈�佺壒閲囥�佸凡妫�锛�
- /// 榛樿鍊�: ('寰呮')
- /// </summary>
- public string CheckStates { get; set; }
-
+ /// 妫�楠岀姸鎬� 锛堝緟妫�銆佸垎閫夈�佺壒閲囥�佸凡妫�锛�
+ /// 榛樿鍊�: ('寰呮')
+ ///</summary>
+
+ public string CheckStates { get; set; }
/// <summary>
- /// 鏀惰揣浣欓噺
- /// </summary>
- public int? QuantityM { get; set; }
-
+ /// 鏀惰揣浣欓噺
+ ///</summary>
+
+ public int? QuantityM { get; set; }
/// <summary>
- /// 鏈搴旀敹浣欓噺
- /// </summary>
- public int? SubMqty { get; set; }
-
+ /// 鏈搴旀敹浣欓噺
+ ///</summary>
+
+ public int? SubMqty { get; set; }
/// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- public DateTime? CheckDate { get; set; }
-
+ /// 妫�楠屾棩鏈�
+ ///</summary>
+
+ public DateTime? CheckDate { get; set; }
/// <summary>
- /// 鏄惁妫�楠�
- /// 榛樿鍊�: ((0))
- /// </summary>
- public int? Ischeck { get; set; }
-
+ /// 鏄惁妫�楠�
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public int? Ischeck { get; set; }
/// <summary>
- /// 宸叉敹鏁伴噺
- /// </summary>
- public int? OkQty { get; set; }
-
+ /// 宸叉敹鏁伴噺
+ ///</summary>
+
+ public int? OkQty { get; set; }
/// <summary>
- /// 宸叉敹浣欓噺
- /// </summary>
- public int? OkMqty { get; set; }
-
+ /// 宸叉敹浣欓噺
+ ///</summary>
+
+ public int? OkMqty { get; set; }
/// <summary>
- /// 浜у搧鍨嬪彿
- /// </summary>
- public string BoardStyle { get; set; }
-
+ /// 浜у搧鍨嬪彿
+ ///</summary>
+
+ public string BoardStyle { get; set; }
/// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- public int? WorkLine { get; set; }
-
+ /// 浠诲姟鍗曡鍙�
+ ///</summary>
+
+ public int? WorkLine { get; set; }
/// <summary>
- /// 0銆侀噰璐崟锛�1銆佸澶栧崟
- /// 榛樿鍊�: ((0))
- /// </summary>
- public int? FType { get; set; }
-
+ /// 0銆侀噰璐崟锛�1銆佸澶栧崟
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public int? FType { get; set; }
/// <summary>
- /// 鏄惁鍏ュ簱
- /// 榛樿鍊�: ((0))
- /// </summary>
- public int? IsdepsIn { get; set; }
-
+ /// 鏄惁鍏ュ簱
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public bool? IsdepsIn { get; set; }
/// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- public string Dha001 { get; set; }
-
+ /// 鍒拌揣鍗曞彿
+ ///</summary>
+
+ public string Dha001 { get; set; }
/// <summary>
- /// 宸插叆搴撴暟閲�
- /// </summary>
- public int? OkRkqty { get; set; }
-
+ /// 宸插叆搴撴暟閲�
+ ///</summary>
+
+ public int? OkRkqty { get; set; }
/// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- public string CbillNo { get; set; }
-
+ /// 鍒拌揣鍗曞彿
+ ///</summary>
+
+ public string CbillNo { get; set; }
/// <summary>
- /// 閲囪喘鍏ュ簱鏁伴噺
- /// </summary>
- public int? CgRkqty { get; set; }
-
+ /// 閲囪喘鍏ュ簱鏁伴噺
+ ///</summary>
+
+ public int? CgRkqty { get; set; }
/// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public int? ItemId { get; set; }
-
+ /// 鐗╂枡ID
+ ///</summary>
+
+ public int? ItemId { get; set; }
/// <summary>
- /// 閫�璐ф爣璇�
- /// 榛樿鍊�: ((0))
- /// </summary>
- public int? ReturnFlag { get; set; }
-
+ /// 閫�璐ф爣璇�
+ /// 榛樿鍊�: ((0))
+ ///</summary>
+
+ public int? ReturnFlag { get; set; }
/// <summary>
- /// 鎺ㄩ�佺姸鎬�
- /// </summary>
- public string States { get; set; }
+ /// 鎺ㄩ�佺姸鎬�
+ ///</summary>
+
+ public string States { get; set; }
}
-}
\ No newline at end of file
+}
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
index b2d5397..01a727d 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
@@ -63,7 +63,6 @@
//await Task.Delay(1000);
await Task.Run(() =>
{
-
for (int i = 0; i < 10000; i++)
{
c = c + i;
--
Gitblit v1.9.3