From a7cec01977a141a92128b01d65b341677cee470a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 23 五月 2025 13:15:35 +0800
Subject: [PATCH] 受退
---
/dev/null | 51 -----------------
DevApp/Gs.DevApp/Gs.DevApp.csproj.user | 2
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs | 28 +++++++--
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs | 37 ++++++------
DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs | 52 +++++++++++------
6 files changed, 76 insertions(+), 98 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index cee2aa3..057f052 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
index 302fe21..dc569ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
@@ -119,6 +119,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -214,6 +215,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -226,7 +228,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -458,7 +461,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -469,6 +472,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 143;
this.splitMx1.TabIndex = 0;
@@ -918,7 +922,8 @@
this.gvMx1remark,
this.gridColumn6,
this.gridColumn8,
- this.gvMxDel});
+ this.gvMxDel,
+ this.gridColumn9});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1024,7 +1029,7 @@
this.gvMx1sqNum.AppearanceCell.Options.UseForeColor = true;
this.gvMx1sqNum.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1sqNum.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1sqNum.Caption = "鐢宠鏁伴噺";
+ this.gvMx1sqNum.Caption = "鏈鐢宠鏁伴噺";
this.gvMx1sqNum.FieldName = "fQty";
this.gvMx1sqNum.MinWidth = 50;
this.gvMx1sqNum.Name = "gvMx1sqNum";
@@ -1036,7 +1041,7 @@
// gvMx1ysNum
//
this.gvMx1ysNum.AppearanceCell.Options.UseFont = true;
- this.gvMx1ysNum.Caption = "宸叉壂鏁伴噺";
+ this.gvMx1ysNum.Caption = "鏈宸叉壂鏁伴噺";
this.gvMx1ysNum.FieldName = "sQty";
this.gvMx1ysNum.MinWidth = 50;
this.gvMx1ysNum.Name = "gvMx1ysNum";
@@ -1115,7 +1120,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 11;
+ this.gvMxDel.VisibleIndex = 12;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -1128,6 +1133,16 @@
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鍏ュ簱鎬婚噺";
+ this.gridColumn9.FieldName = "rkQty";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 11;
+ this.gridColumn9.Width = 94;
//
// picCheckBox
//
@@ -1285,5 +1300,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ 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
deleted file mode 100644
index 54f7a33..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
+++ /dev/null
@@ -1,213 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-
-namespace MES.Service.Modes
-{
- /// <summary>
- ///
- ///</summary>
-
- public class MesInvItemArn
- {
- /// <summary>
- /// 涓婚敭
- /// 榛樿鍊�: (newid())
- ///</summary>
-
- public Guid Guid { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿
- ///</summary>
-
- public string BillNo { get; set; }
- /// <summary>
- /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
- /// 榛樿鍊�: ((0))
- ///</summary>
-
- public int? Status { get; set; }
- /// <summary>
- /// 鍘熷洜
- ///</summary>
-
- public string Reason { 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>
- /// 鍗曟嵁绫诲瀷ID
- ///</summary>
-
- public int? BillTypeId { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷ID
- ///</summary>
-
- public int? TransactionId { get; set; }
- /// <summary>
- /// 澶囨敞
- ///</summary>
-
- public string Remark { get; set; }
- /// <summary>
- /// 閫佽揣鍗曞彿
- ///</summary>
-
- public string PaperBillNo { get; set; }
- /// <summary>
- /// 閫�鏂欎汉宸ュ彿
- ///</summary>
-
- public string UserNoBack { get; set; }
- /// <summary>
- /// 鎻愪氦浜�
- ///</summary>
-
- public string CheckUser { get; set; }
- /// <summary>
- /// 鎻愪氦鏃ユ湡
- ///</summary>
-
- public DateTime? CheckDate { get; set; }
- /// <summary>
- /// 鍏ュ簱鏃ユ湡
- ///</summary>
-
- public DateTime? InsDate { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- ///</summary>
-
- public string CheckRes { get; set; }
- /// <summary>
- /// 宸叉崱鏁伴噺
- ///</summary>
-
- public int? CheckQty { get; set; }
- /// <summary>
- /// 浠撳簱id
- ///</summary>
-
- public string DepotsId { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- ///</summary>
-
- public string TransctionNo { get; set; }
- /// <summary>
- /// 渚涘簲鍟唅d
- ///</summary>
-
- public string SuppId { get; set; }
- /// <summary>
- /// 鎻愪氦鐘舵��
- /// 榛樿鍊�: ((0))
- ///</summary>
-
- public bool? Fstatus { get; set; }
- /// <summary>
- /// 宸ュ巶缂栫爜
- ///</summary>
-
- public string Factory { get; set; }
- /// <summary>
- /// 鏄惁宸插洖鍐橲AP
- /// 榛樿鍊�: ((0))
- ///</summary>
-
- public int? Sapstatus { get; set; }
- /// <summary>
- /// 鏄惁妫�楠�
- ///</summary>
-
- public bool? Ischeck { get; set; }
- /// <summary>
- /// 瀹℃牳鍏ュ簱浜�
- ///</summary>
-
- public string Insby { get; set; }
- /// <summary>
- /// 鍏徃浠ｇ爜
- ///</summary>
-
- public string Company { get; set; }
- /// <summary>
- /// 鎬ユ枡鏍囪瘑
- /// 榛樿鍊�: ((0))
- ///</summary>
-
- public bool? UrgentFlag { get; set; }
- /// <summary>
- /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
- ///</summary>
-
- public int? MttransctionNo { get; set; }
- /// <summary>
- /// IQC妫�楠屽崟鍙�
- ///</summary>
-
- public string IqcReleaseNo { get; set; }
- /// <summary>
- /// 鏄惁鏄剧ず
- /// 榛樿鍊�: ((0))
- ///</summary>
-
- public int? IsVisual { get; set; }
- /// <summary>
- /// 0=閲囪喘锛�1=濮斿
- /// 榛樿鍊�: ((1))
- ///</summary>
-
- public bool? FType { get; set; }
- /// <summary>
- /// ERP鍒拌揣鍗旾D
- ///</summary>
-
- public string EbelnK3id { get; set; }
- /// <summary>
- /// 鏉＄爜鏉″嵃杩涘害
- ///</summary>
-
- public int? BarcodeRatio { get; set; }
- /// <summary>
- /// ERP鍗曞彿
- ///</summary>
-
- public string Erpno { get; set; }
- /// <summary>
- /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
- ///</summary>
-
- public int? Thstatus { get; set; }
- /// <summary>
- /// ERP閫�璐у崟鍙�
- ///</summary>
-
- public string Erpthno { get; set; }
- /// <summary>
- /// 缁勭粐缂栫爜
- ///</summary>
-
- 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
deleted file mode 100644
index 66ad7ec..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-锘縰sing System;
-
-namespace MES.Service.Modes
-{
- /// <summary>
- ///
- ///</summary>
-
- public class MesInvItemArnDetail
- {
- /// <summary>
- ///
- /// 榛樿鍊�: (newid())
- ///</summary>
-
- public Guid? Guid { get; set; }
- /// <summary>
- ///
- ///</summary>
-
- public Guid? ParentGuid { get; set; }
- /// <summary>
- /// MES_ROH_IN_DATA鐨刧uid
- ///</summary>
-
- public Guid? AboutGuid { get; set; }
- /// <summary>
- /// 閲囪喘鍗曞彿
- ///</summary>
-
- public string Ebeln { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- ///</summary>
-
- public int? EbelnLine { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟鏁伴噺
- ///</summary>
-
- public decimal? EbelnQty { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- ///</summary>
-
- public string ItemNo { get; set; }
- /// <summary>
- /// 鏀惰揣鏁伴噺
- ///</summary>
-
- public decimal? Quantity { 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 Factory { get; set; }
- /// <summary>
- /// 鍏徃浠ｇ爜
- ///</summary>
-
- public string Company { get; set; }
- /// <summary>
- /// 閲囪喘鍗旾D
- ///</summary>
-
- public int? EbelnK3id { get; set; }
- /// <summary>
- /// 閲囪喘鍗曡ID
- ///</summary>
-
- public int? LineK3id { get; set; }
- /// <summary>
- /// 鏈搴旀敹鏁伴噺
- ///</summary>
-
- public decimal? SubQty { get; set; }
- /// <summary>
- /// 浣欓噺
- ///</summary>
-
- public int? MarginQty { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- ///</summary>
-
- public string WorkNo { get; set; }
- /// <summary>
- /// 鎬ユ枡鏍囪瘑
- /// 榛樿鍊�: ((0))
- ///</summary>
-
- public bool? UrgentFlag { get; set; }
- /// <summary>
- /// 澶囨敞
- ///</summary>
-
- public string Memo { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- ///</summary>
-
- public string CheckRes { get; set; }
- /// <summary>
- /// 妫�楠岀姸鎬� 锛堝緟妫�銆佸垎閫夈�佺壒閲囥�佸凡妫�锛�
- /// 榛樿鍊�: ('寰呮')
- ///</summary>
-
- public string CheckStates { get; set; }
- /// <summary>
- /// 鏀惰揣浣欓噺
- ///</summary>
-
- public int? QuantityM { get; set; }
- /// <summary>
- /// 鏈搴旀敹浣欓噺
- ///</summary>
-
- public int? SubMqty { get; set; }
- /// <summary>
- /// 妫�楠屾棩鏈�
- ///</summary>
-
- public DateTime? CheckDate { get; set; }
- /// <summary>
- /// 鏄惁妫�楠�
- /// 榛樿鍊�: ((0))
- ///</summary>
-
- public int? Ischeck { get; set; }
- /// <summary>
- /// 宸叉敹鏁伴噺
- ///</summary>
-
- public int? OkQty { get; set; }
- /// <summary>
- /// 宸叉敹浣欓噺
- ///</summary>
-
- public int? OkMqty { get; set; }
- /// <summary>
- /// 浜у搧鍨嬪彿
- ///</summary>
-
- public string BoardStyle { get; set; }
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- ///</summary>
-
- public int? WorkLine { get; set; }
- /// <summary>
- /// 0銆侀噰璐崟锛�1銆佸澶栧崟
- /// 榛樿鍊�: ((0))
- ///</summary>
-
- public int? FType { get; set; }
- /// <summary>
- /// 鏄惁鍏ュ簱
- /// 榛樿鍊�: ((0))
- ///</summary>
-
- public bool? IsdepsIn { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿
- ///</summary>
-
- public string Dha001 { get; set; }
- /// <summary>
- /// 宸插叆搴撴暟閲�
- ///</summary>
-
- public int? OkRkqty { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿
- ///</summary>
-
- public string CbillNo { get; set; }
- /// <summary>
- /// 閲囪喘鍏ュ簱鏁伴噺
- ///</summary>
-
- public int? CgRkqty { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- ///</summary>
-
- public int? ItemId { get; set; }
- /// <summary>
- /// 閫�璐ф爣璇�
- /// 榛樿鍊�: ((0))
- ///</summary>
-
- public int? ReturnFlag { get; set; }
- /// <summary>
- /// 鎺ㄩ�佺姸鎬�
- ///</summary>
-
- public string States { get; set; }
-
-
- }
-}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemBarcodes.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemBarcodes.cs
deleted file mode 100644
index 9e65984..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemBarcodes.cs
+++ /dev/null
@@ -1,357 +0,0 @@
-锘縰sing System;
-
-namespace MES.Service.Modes
-{
- /// <summary>
- /// 鐗╂枡鏉＄爜琛�
- ///</summary>
- public class MesInvItemBarcodes
- {
- /// <summary>
- ///
- /// 榛樿鍊�: (newid())
- ///</summary>
- public Guid Guid { get; set; }
- /// <summary>
- /// SEQ_BARCODE_PSN_ID
- ///</summary>
- public long? Id { get; set; }
- /// <summary>
- /// 鐗╂枡鏉＄爜
- ///</summary>
- public string ItemBarcode { get; set; }
- /// <summary>
- /// 瀹㈡埛鎴愬搧缂栫爜
- ///</summary>
- public string CProductCode { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡鏉＄爜
- ///</summary>
- public string CItemBarcode { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜
- ///</summary>
- public string CItemCode { get; set; }
- /// <summary>
- /// 鏈徃鐗╂枡缂栫爜
- ///</summary>
- public string ItemNo { get; set; }
- /// <summary>
- /// 鍘傚鎵规
- ///</summary>
- public string LotNo { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// 榛樿鍊�: ((0))
- ///</summary>
- public decimal? Quantity { get; set; }
- /// <summary>
- /// 鏄惁鐜繚(0:鍚�,1:鏄�)
- ///</summary>
- public bool? EpFlag { get; set; }
- /// <summary>
- /// 鐢熶骇宸ュ崟
- ///</summary>
- public string TaskNo { 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 CustNo { get; set; }
- /// <summary>
- /// 鐗╂枡鏉＄爜娉ㄩ噴琛孾鍐椾綑锛屾潯鐮侀噸鎵撲娇鐢╙
- ///</summary>
- public string ItemBarcodeText { get; set; }
- /// <summary>
- /// 鍘烶SN鐗╂枡鏉＄爜
- ///</summary>
- public string OldItemBarcode { get; set; }
- /// <summary>
- /// SAP鏀惰揣鐗╂枡鍑瘉鍙� --閲囪喘鍗曞彿
- ///</summary>
- public string Mblnr { get; set; }
- /// <summary>
- /// SAP鏀惰揣鐗╂枡鍑瘉琛屽彿 --閲囪喘鍗曡鍙�
- ///</summary>
- public int? Zeile { get; set; }
- /// <summary>
- /// 鏀舵枡琛↖D
- ///</summary>
- public long? RohInId { get; set; }
- /// <summary>
- /// 0涓烘湁鏁堟潯鐮侊紱1涓烘棤鏁堟潯鐮�
- /// 榛樿鍊�: ((0))
- ///</summary>
- public bool? Barcodestatus { get; set; }
- /// <summary>
- /// 鍘熷鏁伴噺
- /// 榛樿鍊�: ((0))
- ///</summary>
- public long? Oldqty { get; set; }
- /// <summary>
- /// 浣跨敤鏁伴噺
- /// 榛樿鍊�: ((0))
- ///</summary>
- public long? Useqty { get; set; }
- /// <summary>
- /// 0鍦ㄥ簱锛�1鍦ㄧ嚎锛�2浣滃簾
- /// 榛樿鍊�: ((0))
- ///</summary>
- public byte? Location { get; set; }
- /// <summary>
- /// 鍗曚綅
- ///</summary>
- public string Unit { get; set; }
- /// <summary>
- /// 閲嶉噺锛堝崟浣嶏細鍏枻锛�
- /// 榛樿鍊�: ((0))
- ///</summary>
- public decimal? WeightUnit { get; set; }
- /// <summary>
- /// 鍗曚环
- ///</summary>
- public decimal? Price { get; set; }
- /// <summary>
- /// 鍘熸潯鐮佹暟閲�
- ///</summary>
- public long? OldBarQuantity { get; set; }
- /// <summary>
- /// 姹囨�绘潯鐮�
- ///</summary>
- public string SumBarcode { get; set; }
- /// <summary>
- /// 鎵规鏃ユ湡
- ///</summary>
- public string LotDate { get; set; }
- /// <summary>
- /// 鎴愬搧鏉＄爜
- ///</summary>
- public string Mocode { get; set; }
- /// <summary>
- /// 澶囨敞
- ///</summary>
- public string Memo { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- ///</summary>
- public string SuppNo { get; set; }
- /// <summary>
- /// 鍙戣揣浣嶇疆
- ///</summary>
- public string Spostion { get; set; }
- /// <summary>
- /// 鍒拌揣浣嶇疆
- ///</summary>
- public string Epostion { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- ///</summary>
- public string ItemSname { get; set; }
- /// <summary>
- /// 鏄惁鍙
- /// 榛樿鍊�: ((0))
- ///</summary>
- public bool? Visable { get; set; }
- /// <summary>
- /// 澶栧彂鎵规鍙�
- ///</summary>
- public string TrLotno { get; set; }
- /// <summary>
- /// 鍙戣揣鏃ユ湡
- ///</summary>
- public DateTime? FlezzDate { get; set; }
- /// <summary>
- /// 澶栧彂鍘熷洜
- ///</summary>
- public string FlezzReason { get; set; }
- /// <summary>
- /// 澶栧彂浜�
- ///</summary>
- public string FlezzBy { get; set; }
- /// <summary>
- /// 鍙戣揣鏈�
- /// 榛樿鍊�: ((0))
- ///</summary>
- public int? DelanyMonth { get; set; }
- /// <summary>
- /// 鏄惁鏈�灏忓寘瑁�
- ///</summary>
- public bool? MinpackFlag { get; set; }
- /// <summary>
- /// 鎵撳嵃ID
- ///</summary>
- public string PrintId { get; set; }
- /// <summary>
- /// 鐜鐗╂枡
- ///</summary>
- public string EpItem { get; set; }
- /// <summary>
- /// 宸ュ巶
- ///</summary>
- public string Factory { get; set; }
- /// <summary>
- /// 鍏徃
- ///</summary>
- public string Company { get; set; }
- /// <summary>
- /// 鍙戠エ鍙风爜
- ///</summary>
- public string CbNo { get; set; }
- /// <summary>
- /// 琛屽彿
- ///</summary>
- public string Linfline { get; set; }
- /// <summary>
- /// 鏈夋晥鏃堕棿
- ///</summary>
- public DateTime? ValidTime { get; set; }
- /// <summary>
- /// 璐ㄦ鐘舵��
- ///</summary>
- public string IqcStatus { get; set; }
- /// <summary>
- /// 杞﹀彿
- ///</summary>
- public string Fcar { get; set; }
- /// <summary>
- /// 姣涢噸
- ///</summary>
- public string Gweight { get; set; }
- /// <summary>
- /// 鍑�閲�
- ///</summary>
- public string Nweight { get; set; }
- /// <summary>
- /// 鎵╁睍鏃ユ湡
- ///</summary>
- public long? ExtDate { get; set; }
- /// <summary>
- /// 鏉＄爜绫诲瀷
- ///</summary>
- public string Barcodetype { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- ///</summary>
- public string SuppName { get; set; }
- /// <summary>
- /// 鍙戠エ缂栧彿
- ///</summary>
- public string BillNo { get; set; }
- /// <summary>
- /// 鏄惁绱ф��
- ///</summary>
- public bool? UrgentFlag { get; set; }
- /// <summary>
- /// 棰滆壊鍚嶇О
- ///</summary>
- public string ColorName { get; set; }
- /// <summary>
- /// 鏉垮瀷
- ///</summary>
- public string BoardStyle { get; set; }
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- ///</summary>
- public DateTime? InsDate { get; set; }
- /// <summary>
- /// 宸ュ簭绾�
- ///</summary>
- public int? WorkLine { get; set; }
- /// <summary>
- /// 涓嶈壇澶囨敞
- ///</summary>
- public string MemoBad { get; set; }
- /// <summary>
- /// 宸ュ崟
- ///</summary>
- public string WorkNo { get; set; }
- /// <summary>
- /// 鍒拌揣鏍囪
- /// 榛樿鍊�: ((0))
- ///</summary>
- public bool? ComeFlg { get; set; }
- /// <summary>
- /// 琛屽彿
- ///</summary>
- public string LineNo { get; set; }
- /// <summary>
- /// 涓濆嵃鏁伴噺
- /// 榛樿鍊�: ((0))
- ///</summary>
- public long? SilkPqty { get; set; }
- /// <summary>
- /// 涓濆嵃瑙勬牸
- ///</summary>
- public string Silk { get; set; }
- /// <summary>
- /// 涓濆嵃ID
- ///</summary>
- public long? SilkId { get; set; }
- /// <summary>
- /// 宸ュ崟鐘舵��
- /// 榛樿鍊�: ((0))
- ///</summary>
- public bool? WorkFlg { get; set; }
- /// <summary>
- /// 宸ュ崟鏈�鍚庤
- ///</summary>
- public int? WorkLast { get; set; }
- /// <summary>
- /// HBDY
- ///</summary>
- public int? Hbdy { get; set; }
- /// <summary>
- /// HBDYTM
- ///</summary>
- public int? Hbdytm { get; set; }
- /// <summary>
- /// 宸ュ簭鏃堕棿
- ///</summary>
- public string WorkFlgtime { get; set; }
- /// <summary>
- /// K3ID璁㈠崟
- ///</summary>
- public long? EbelnK3id { get; set; }
- /// <summary>
- /// K3ID琛�
- ///</summary>
- public long? LineK3id { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- ///</summary>
- public long? ItemId { get; set; }
- /// <summary>
- ///
- ///</summary>
- public long? GxId { get; set; }
- /// <summary>
- ///
- ///</summary>
- public string OrgName { get; set; }
- /// <summary>
- ///
- ///</summary>
- public string OrgOwner { get; set; }
-
- public string DepotSectionsCode { get; set; }
-
- public string DepotsCode { get; set; }
-
- public string DepotName { get; set; }
- }
-}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemInCDetails.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemInCDetails.cs
deleted file mode 100644
index a8167bf..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemInCDetails.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-锘�
-
-using System;
-
-namespace Gs.Warehouse.Models
-{
-
- /// <summary>
- /// 鐗╂枡鍏ュ簱鏉＄爜鏄庣粏
- /// </summary>
- public class MesInvItemInCDetails
- {
- /// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
- public Guid Guid { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗昳d
- /// </summary>
- public long? ItemInId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜PSN
- /// </summary>
- public string ItemBarcode { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- /// </summary>
- public string CItemCode { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鐗╂枡鏉＄爜
- /// </summary>
- public string CItemBarcode { get; set; }
-
- /// <summary>
- /// 楠屾敹鏁伴噺
- /// </summary>
- public decimal? Quantity { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鏂瑰紡(1:鏈夋潯鐮�,0:鏃犳潯鐮�)
- /// 榛樿鍊�: ((1))
- /// </summary>
- public bool? BarcodeFlag { get; set; }
-
- /// <summary>
- /// 鐜繚鏍囧織锛�0-闈炵幆淇�,1-鐜繚.鏃犳潯鐮佹墜宸ュ綍鍏ワ紝鏈夋潯鐮佷负鍐椾綑瀛楁锛�
- /// 榛樿鍊�: ((1))
- /// </summary>
- public bool? EpFlag { 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>
- /// 浣滀笟鏂瑰紡0-鏈夌嚎鏉＄爜鏋�1-鏃犵嚎鏉＄爜鏋�
- /// </summary>
- public long? WorkType { get; set; }
-
- /// <summary>
- /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- /// </summary>
- public string ItemNo { get; set; }
-
- /// <summary>
- /// 鍘傚鎵规
- /// </summary>
- public string LotNo { get; set; }
-
- /// <summary>
- /// 鏄惁鍏辩鐗╂枡(0:鍚︼紝1:鏄�)
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? ComanagementFlag { get; set; }
-
- /// <summary>
- /// 瀹㈡埛缂栫爜
- /// </summary>
- public string CustNo { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- public string CheckRes { get; set; }
-
- /// <summary>
- /// 杩涜揣鏁伴噺
- /// </summary>
- public decimal? CheckQty { get; set; }
-
- /// <summary>
- /// 妫�楠岀姸鎬�
- /// </summary>
- public string CheckStates { get; set; }
-
- /// <summary>
- /// 寮哄埗鍏ュ簱鏍囪0鏃狅紝1-寮哄埗鍏ュ簱 閫�鏂欏崟浣跨敤
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? ForceInFlag { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
- public string DepotCode { get; set; }
-
- /// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
- public string DepotSectionCode { get; set; }
-
- /// <summary>
- /// 鐗硅浜嬮」
- /// </summary>
- public string Remark { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- public string ItemBarcode2 { get; set; }
-
- /// <summary>
- /// 鏂版潯鐮�
- /// </summary>
- public string ItemBarcode3 { get; set; }
-
- /// <summary>
- /// 宸蹭娇鐢ㄦ暟閲�
- /// </summary>
- public decimal? UseQty { get; set; }
-
- /// <summary>
- /// 鍑哄簱鏁伴噺
- /// </summary>
- public decimal? OutQty { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string ItemSname { get; set; }
-
- /// <summary>
- /// 璧峰浣嶇疆
- /// </summary>
- public int? Spostion { get; set; }
-
- /// <summary>
- /// 缁撴潫浣嶇疆
- /// </summary>
- public int? Epostion { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- public string Unit { get; set; }
-
- /// <summary>
- /// 鏄惁妫�楠�
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? Ischeck { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- public string Ebeln { get; set; }
-
- /// <summary>
- /// 鎵规鏃ユ湡
- /// </summary>
- public string LotDate { get; set; }
-
- /// <summary>
- /// 鍙戠エ鍙�
- /// </summary>
- public string BillNo { get; set; }
-
- /// <summary>
- /// 鏄惁鍏ュ簱鎴愬姛
- /// 榛樿鍊�: ((0))
- /// </summary>
- public bool? StockOk { get; set; }
-
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- public string Factory { get; set; }
-
- /// <summary>
- /// 鍏徃
- /// </summary>
- public string Company { get; set; }
-
- /// <summary>
- /// CB鍗曞彿
- /// </summary>
- public string CbNo { get; set; }
-
- /// <summary>
- /// 绠卞彿
- /// </summary>
- public string BoxNo { get; set; }
-
- /// <summary>
- /// 浠撳簱ID
- /// </summary>
- public long? DepotId { get; set; }
-
- /// <summary>
- /// 璐т綅ID
- /// </summary>
- public long? DepotSectionId { get; set; }
-
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public string LineNum { get; set; }
-
- /// <summary>
- /// 鎵弿鏁伴噺
- /// </summary>
- public decimal? SmQty { get; set; }
-
- /// <summary>
- /// 鍙戣揣鍗曞彿
- /// </summary>
- public string Vgbel { get; set; }
-
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public long? Kdpos { get; set; }
-
- /// <summary>
- /// 浣滀笟鍗曞彿
- /// </summary>
- public string WorkNo { get; set; }
-
- /// <summary>
- /// 琛屽彿
- /// </summary>
- public long? EbelnLineNo { get; set; }
-
- /// <summary>
- /// CB鍗曞彿
- /// </summary>
- public string CbillNo { get; set; }
-
- /// <summary>
- /// 绱ф�ユ爣璁�
- /// </summary>
- public bool? UrgentFlag { get; set; }
-
- /// <summary>
- /// 鏉垮瀷
- /// </summary>
- public string BoardStyle { get; set; }
-
- /// <summary>
- /// 宸ヤ綔琛屽彿
- /// </summary>
- public int? WorkLine { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
- public string SuppNo { get; set; }
-
- /// <summary>
- /// 鏀惰揣鍗曞彿
- /// </summary>
- public string RbillNo { get; set; }
-
- /// <summary>
- /// K3 閲囪喘鍗曞彿
- /// </summary>
- public long? EbelnK3id { get; set; }
-
- /// <summary>
- /// K3 琛屽彿
- /// </summary>
- public long? LineK3id { get; set; }
-
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- public long? ItemId { get; set; }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOuts.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOuts.cs
deleted file mode 100644
index fe85058..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOuts.cs
+++ /dev/null
@@ -1,251 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-
-
-namespace MES.Service.Modes
-{
- /// <summary>
- ///
- ///</summary>
- public class MesInvItemOuts
- {
- /// <summary>
- /// 鍑哄簱鍗曞彿
- ///</summary>
- public string ItemOutNo { get; set; }
- /// <summary>
- /// 鐢熶骇璁㈠崟
- ///</summary>
- public string TaskNo { get; set; }
- /// <summary>
- /// 宸ュ簭鍙�
- ///</summary>
- public string ProcNo { get; set; }
- /// <summary>
- /// 鐘舵�亅0-鏈鏍�1-瀹℃牳
- /// 榛樿鍊�: ((0))
- ///</summary>
- public int? Status { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- ///</summary>
- public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// 榛樿鍊�: (getdate())
- ///</summary>
- public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- ///</summary>
- public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// 榛樿鍊�: (getdate())
- ///</summary>
- public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷ID
- ///</summary>
- public int? BillTypeId { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷
- ///</summary>
- public int? TransactionNo { get; set; }
- /// <summary>
- /// 澶囨敞淇℃伅
- ///</summary>
- public string Remark { get; set; }
- /// <summary>
- /// 鍑哄簱鍘熷洜
- ///</summary>
- public string Reason { get; set; }
- /// <summary>
- /// 鐢熶骇绾跨紪鐮�
- ///</summary>
- public string ProduceLineNo { get; set; }
- /// <summary>
- /// 瀹℃牳浜�
- ///</summary>
- public string CheckUser { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- ///</summary>
- public DateTime? CheckDate { get; set; }
- /// <summary>
- /// 棰嗘枡鏃ユ湡
- ///</summary>
- public DateTime? OutDate { get; set; }
- /// <summary>
- /// 棰嗘枡宸ユ
- ///</summary>
- public string Mmlist { get; set; }
- /// <summary>
- /// 瀛愬簱CODE
- ///</summary>
- public string DepotCode { get; set; }
- /// <summary>
- /// SAP杩斿洖鍗曟嵁
- ///</summary>
- public string Sapno { get; set; }
- /// <summary>
- /// 鏄惁宸插洖鍐橲AP
- /// 榛樿鍊�: ((0))
- ///</summary>
- public bool? Sapstatus { get; set; }
- /// <summary>
- /// SAP杩斿洖骞翠唤
- ///</summary>
- public int? Sapyear { get; set; }
- /// <summary>
- /// SAP杩斿洖淇℃伅
- ///</summary>
- public string Saptext { get; set; }
- /// <summary>
- /// 宸ュ簭绾夸綋
- ///</summary>
- public string ProcLineNo { get; set; }
- /// <summary>
- /// 棰嗘枡閮ㄩ棬
- ///</summary>
- public string OutPart { get; set; }
- /// <summary>
- /// 0 鐢熶骇,1 濮斿
- /// 榛樿鍊�: ((0))
- ///</summary>
- public int? FType { get; set; }
- /// <summary>
- /// 褰曞叆鎻愪氦
- /// 榛樿鍊�: ((0))
- ///</summary>
- public bool? OutStatus { get; set; }
- /// <summary>
- /// 鏄惁鍙
- /// 榛樿鍊�: ((1))
- ///</summary>
- public bool? IsVisual { get; set; }
- /// <summary>
- /// 鎺ユ敹浜�
- ///</summary>
- public string Receiver { get; set; }
- /// <summary>
- /// 宸ュ巶缂栧彿
- ///</summary>
- public string Factory { get; set; }
- /// <summary>
- /// 鍏徃缂栧彿
- ///</summary>
- public string Company { get; set; }
- /// <summary>
- /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- public int? MtransctionNo { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- ///</summary>
- public string WorkNo { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿琛屽彿
- ///</summary>
- public int? WorkLine { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- ///</summary>
- public string SuppNo { get; set; }
- /// <summary>
- /// 璁㈠崟鍙�
- ///</summary>
- public string Cmpocode { get; set; }
- /// <summary>
- /// 鍘熺墿鏂欏嚭璐ф爣璇�
- /// 榛樿鍊�: ((0))
- ///</summary>
- public bool? ItemFlag { get; set; }
- /// <summary>
- /// 1=鍗婃垚鍝佸嚭璐�
- /// 榛樿鍊�: ((0))
- ///</summary>
- public bool? BoardFlag { get; set; }
- /// <summary>
- /// 鍑哄簱绫诲埆
- ///</summary>
- public string OutType { get; set; }
- /// <summary>
- /// 涓氬姟绫诲瀷
- ///</summary>
- public string BusinessType { get; set; }
- /// <summary>
- /// 浜у搧缂栧彿
- ///</summary>
- public string BoardItem { get; set; }
- /// <summary>
- /// 浜ч噺
- ///</summary>
- public int? PlanQty { get; set; }
- /// <summary>
- /// 棰嗘枡缂栧彿/濮斿璁㈠崟/鍏朵粬鍑哄簱鍗曞彿
- ///</summary>
- public string PbillNo { get; set; }
- /// <summary>
- /// 琛ユ枡鐢宠鍗曞彿
- ///</summary>
- public string BbillNo { get; set; }
- /// <summary>
- /// 鏍囪瘑 /1宸叉帹閫�
- ///</summary>
- public int? Nflag { 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>
- ///
- ///</summary>
- public Guid Guid { get; set; }
- /// <summary>
- ///
- ///</summary>
- public int? SuppId { get; set; }
- /// <summary>
- ///
- ///</summary>
- public int? DepotId { get; set; }
-
- public string BillNo { get; set; }
-
- public string DepotName { get; set; }
-
- public string SuppName { get; set; }
-
- public string CreateByFname { get; set; }
-
- public string CheckUserFname { get; set; }
-
- 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
deleted file mode 100644
index 1ca6f02..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemStocks.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-锘縰sing System;
-
-namespace MES.Service.Modes
-{
- /// <summary>
- /// 鐗╂枡搴撳瓨琛�
- ///</summary>
- public class MesInvItemStocks
- {
- /// <summary>
- ///
- /// 榛樿鍊�: (newid())
- ///</summary>
- public Guid Guid { get; set; }
- /// <summary>
- /// 鐢熶骇璁㈠崟
- ///</summary>
- public string TaskNo { get; set; }
- /// <summary>
- /// 鐗╂枡鏉＄爜
- ///</summary>
- public string ItemBarcode { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- ///</summary>
- public string CItemCode { get; set; }
- /// <summary>
- /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- ///</summary>
- public string ItemNo { get; set; }
- /// <summary>
- /// 瀛愬簱id
- ///</summary>
- public long? DepotsId { get; set; }
- /// <summary>
- /// 璐т綅id
- ///</summary>
- public long? DepotSectionsId { get; set; }
- /// <summary>
- /// 鍘傚鎵规
- ///</summary>
- public string LotNo { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// 榛樿鍊�: ((0))
- ///</summary>
- public decimal? Quantity { get; set; }
- /// <summary>
- /// 鐜繚鏍囧織锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級(0-鍚︼紝1-鏄�)
- ///</summary>
- public byte? EpFlag { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栫爜
- ///</summary>
- public string CustomerNo { get; set; }
- /// <summary>
- /// 閲嶉噺
- ///</summary>
- public decimal? ItemWt { get; set; }
- /// <summary>
- /// 瀛愬簱CODE
- ///</summary>
- public string DepotsCode { get; set; }
- /// <summary>
- /// 璐т綅CODE
- ///</summary>
- public string DepotSectionsCode { get; set; }
- /// <summary>
- /// 妫�楠屾棩鏈�
- ///</summary>
- public DateTime? CheckDate { get; set; }
- /// <summary>
- /// 0 鐗╂枡 1 鍗婃垚鍝� 2 鎴愬搧
- /// 榛樿鍊�: ((0))
- ///</summary>
- public byte? ItemType { get; set; }
- /// <summary>
- /// 鍏ュ簱鏃ユ湡
- /// 榛樿鍊�: (getdate())
- ///</summary>
- public DateTime? IndepDate { get; set; }
- /// <summary>
- /// 宸ュ巶缂栧彿
- ///</summary>
- public string Factory { get; set; }
- /// <summary>
- /// 鍏徃缂栧彿
- ///</summary>
- public string Company { get; set; }
- /// <summary>
- /// 璐ㄩ噺鐘舵��
- ///</summary>
- public string IqcStatus { get; set; }
- /// <summary>
- /// F鍗�
- ///</summary>
- public string Fcar { get; set; }
- /// <summary>
- /// 鍙鎻愪氦鏍囧織锛�0-鍚︼紝1-鏄級
- /// 榛樿鍊�: ((0))
- ///</summary>
- public byte? VisableSubmit { get; set; }
- /// <summary>
- /// 鍙鎻愪氦浜�
- ///</summary>
- public string VisableSubmitBy { get; set; }
- /// <summary>
- /// 鍙鎻愪氦鏃堕棿
- ///</summary>
- public DateTime? VisableSubmitDate { get; set; }
- /// <summary>
- /// 鏉垮瀷
- ///</summary>
- public string BoardStyle { get; set; }
- /// <summary>
- /// 宸ュ崟鍙�
- ///</summary>
- public string WorkNo { get; set; }
- /// <summary>
- /// 宸ュ崟琛屽彿
- ///</summary>
- public int? WorkLine { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- ///</summary>
- public string SuppNo { get; set; }
- /// <summary>
- /// 琛屽彿
- ///</summary>
- public string LineNo { get; set; }
- /// <summary>
- /// 鍗曟嵁缂栧彿
- ///</summary>
- public string BillNo { get; set; }
- /// <summary>
- /// K3ID
- ///</summary>
- public long? EbelnK3id { get; set; }
- /// <summary>
- /// 琛孠3ID
- ///</summary>
- public long? LineK3id { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- ///</summary>
- public long? ItemId { 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
deleted file mode 100644
index 40f2f1c..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesItems.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-锘縰sing System;
-
-namespace MES.Service.Modes
-{
- /// <summary>
- ///
- ///</summary>
- public class MesItems
- {
- /// <summary>
- ///
- ///</summary>
- public Guid Guid { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- ///</summary>
- public long Id { get; set; }
- /// <summary>
- /// 宸ュ巶
- ///</summary>
- public string Factory { get; set; }
- /// <summary>
- /// 鍏徃缂栧彿
- ///</summary>
- public string Company { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
- ///</summary>
- public string ItemNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- ///</summary>
- public string ItemName { get; set; }
- /// <summary>
- /// 鐗╂枡绠�绉�
- ///</summary>
- public string ItemSname { get; set; }
- /// <summary>
- /// 瑙勬牸鍨嬪彿
- ///</summary>
- public string ItemModel { get; set; }
- /// <summary>
- /// 鐗╂枡鎻忚堪
- ///</summary>
- public string ItemDescription { get; set; }
- /// <summary>
- /// 鐗╂枡鍗曚綅
- ///</summary>
- public string ItemUnit { get; set; }
- /// <summary>
- /// 鐗╂枡绫诲瀷
- ///</summary>
- public string ItemType { get; set; }
- /// <summary>
- /// 浜у搧鐗堟湰
- ///</summary>
- public string ItemVersion { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栧彿
- ///</summary>
- public string CustNo { 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 decimal? Lowlimit { get; set; }
- /// <summary>
- /// 鏈�澶у簱瀛�
- ///</summary>
- public decimal? Highlimit { get; set; }
- /// <summary>
- /// 鏈�灏忓寘瑁呮暟
- ///</summary>
- public decimal? PrdPack { get; set; }
- /// <summary>
- /// 璁㈠崟鍗曚綅
- ///</summary>
- public string Orderunit { get; set; }
- /// <summary>
- /// 閿�鍞崟浣�
- ///</summary>
- public string Saleunit { get; set; }
- /// <summary>
- /// 搴撴埧鍗曚綅
- ///</summary>
- public string Storeunit { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- ///</summary>
- public long? EItemId { get; set; }
- /// <summary>
- /// ERP鏂欏彿
- ///</summary>
- public string ErpItemNo { get; set; }
- /// <summary>
- /// 榛樿浠撳簱
- ///</summary>
- public string DepotCode { get; set; }
- /// <summary>
- /// 鐗╂枡鍒嗙被缂栧彿
- ///</summary>
- public string Ppbom00019124 { get; set; }
- /// <summary>
- /// 鐗╂枡鍒嗙粍
- ///</summary>
- public string Remarks { get; set; }
- /// <summary>
- /// 閲囪喘鍛�
- ///</summary>
- public string Fpurchaserid { get; set; }
- /// <summary>
- /// 绂佺敤鐘舵��
- ///</summary>
- public string Fforbidstatus { get; set; }
- /// <summary>
- /// 鐗╂枡鍒嗙粍
- ///</summary>
- public string Fmaterialgroup { get; set; }
- /// <summary>
- /// 瀹屽伐瓒呮敹姣斾緥
- ///</summary>
- public int? Ffinishreceiptoverrate { get; set; }
- /// <summary>
- /// 鍙戞枡鏂瑰紡
- ///</summary>
- public string Fissuetype { get; set; }
- /// <summary>
- /// 鍚敤鎵瑰彿绠＄悊
- ///</summary>
- public int? Fisbatchmanage { get; set; }
- /// <summary>
- /// 閲囪喘鍗曚綅
- ///</summary>
- public string Fpurchaseunitid { get; set; }
- /// <summary>
- /// 鎹熻�楃巼
- ///</summary>
- public string LossPercent { get; set; }
- /// <summary>
- /// 鍔╄鐮�
- ///</summary>
- public string MnemonicCode { get; set; }
- /// <summary>
- /// 淇濊川鏈�
- ///</summary>
- public string ExpPeriod { get; set; }
- /// <summary>
- /// 鐢熶骇杞﹂棿
- ///</summary>
- public string ProductionWorkshop { get; set; }
- /// <summary>
- /// 鐗╂枡灞炴��
- ///</summary>
- public string MaterialProperti { get; set; }
- /// <summary>
- /// 鐢熶骇鍗曚綅
- ///</summary>
- public string ProduceUnit { get; set; }
- /// <summary>
- /// 濮斿鍗曚綅
- ///</summary>
- public string SubconUnit { get; set; }
- /// <summary>
- /// 鍥剧墖1
- ///</summary>
- public string Bz06 { get; set; }
- /// <summary>
- /// 鍥剧墖2
- ///</summary>
- public string Bz07 { get; set; }
- /// <summary>
- /// 鍥剧墖3
- ///</summary>
- public string Bz08 { get; set; }
- /// <summary>
- /// 鍥剧墖4
- ///</summary>
- public string Bz09 { get; set; }
- /// <summary>
- /// 鍥剧墖5
- ///</summary>
- public string Bz10 { get; set; }
- /// <summary>
- /// QC鍒嗙粍ID
- ///</summary>
- public string QcTeamid { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- ///</summary>
- public int? ItemId { get; set; }
- /// <summary>
- /// 棰滆壊
- ///</summary>
- public string ColorName { get; set; }
- /// <summary>
- /// 鍒涘缓缁勭粐
- ///</summary>
- public string Fumbrella { get; set; }
- /// <summary>
- /// 浣跨敤缁勭粐
- ///</summary>
- public string FSubsidiary { get; set; }
- }
-}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcode.cs
deleted file mode 100644
index 67a20d6..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcode.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.Modes;
-using System;
-using System.Collections.Generic;
-
-namespace Gs.Warehouse.Models
-{
-
- /// <summary>
- /// 鏁版嵁婧愬鍏�
- /// </summary>
- public class VArrivalBarcode
- {
- /// <summary>
- /// </summary>
- public Guid? guid { get; set; }
-
- /// <summary>
- /// </summary>
- public string depotsCode { get; set; }
-
- /// <summary>
- /// </summary>
- public string remark { get; set; }
-
- /// <summary>
- /// </summary>
- public DateTime? insDate { get; set; }
-
- /// <summary>
- /// </summary>
- public int? status { get; set; }
-
- /// <summary>
- /// </summary>
- public DateTime? checkDate { get; set; }
-
- /// <summary>
- /// </summary>
- public string suppNo { get; set; }
-
- /// <summary>
- /// </summary>
- public bool? fstatus { get; set; }
-
- /// <summary>
- /// </summary>
- public bool? urgentFlag { get; set; }
-
- /// <summary>
- /// </summary>
- public string billNo { get; set; }
-
- /// <summary>
- /// </summary>
- public string createBy { get; set; }
-
- /// <summary>
- /// </summary>
- public string depotName { get; set; }
-
- /// <summary>
- /// </summary>
- public string suppName { get; set; }
-
- /// <summary>
- /// </summary>
- public decimal? oldqty { get; set; }
-
- /// <summary>
- /// </summary>
- public string percentage { get; set; }
-
-
- public List<VArrivalBarcodeItem> list { get; set; }
-
- public List<VArrivalBarcodeItem3> list3 { get; set; }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem.cs
deleted file mode 100644
index 0557822..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-锘縰sing System;
-
-namespace Gs.Warehouse.Models
-{
-
- /// <summary>
- /// 鏁版嵁婧愬鍏�
- /// </summary>
- public class VArrivalBarcodeItem
- {
- /// <summary>
- /// </summary>
- public Guid? guid { get; set; }
-
- /// <summary>
- /// </summary>
- public Guid parentGuid { get; set; }
-
- /// <summary>
- /// </summary>
- public int? workLine { get; set; }
-
- /// <summary>
- /// </summary>
- public bool? urgentFlag { get; set; }
-
- /// <summary>
- /// </summary>
- public string ebeln { get; set; }
-
- /// <summary>
- /// </summary>
- public int? okRkqty { get; set; }
-
- /// <summary>
- /// </summary>
- public decimal? quantity { get; set; }
-
- /// <summary>
- /// </summary>
- public string itemNo { get; set; }
-
- /// <summary>
- /// </summary>
- public string itemName { get; set; }
-
- /// <summary>
- /// </summary>
- public string fname { get; set; }
-
- /// <summary>
- /// </summary>
- public string cgUnit { get; set; }
-
- /// <summary>
- /// </summary>
- public string kcUnit { get; set; }
-
- /// <summary>
- /// </summary>
- public string itemModel { get; set; }
-
- /// <summary>
- /// </summary>
- public decimal? icount { get; set; }
-
- /// <summary>
- /// </summary>
- public long? prnQty { get; set; }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs
deleted file mode 100644
index 3a9259b..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/VArrivalBarcodeItem3.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-锘縰sing System;
-
-namespace MES.Service.Modes
-{
- /// <summary>
- /// 鏁版嵁婧愬鍏�
- ///</summary>
- public class VArrivalBarcodeItem3
- {
- /// <summary>
- ///
- ///</summary>
- public Guid? Guid { get; set; }
- /// <summary>
- ///
- ///</summary>
- public string BILL_NO { get; set; }
- /// <summary>
- ///
- ///</summary>
- public string ITEM_BARCODE { get; set; }
- /// <summary>
- ///
- ///</summary>
- public string ITEM_NO { get; set; }
- /// <summary>
- ///
- ///</summary>
- public string LOT_DATE { get; set; }
- /// <summary>
- ///
- ///</summary>
- public long? OLDQTY { get; set; }
- /// <summary>
- ///
- ///</summary>
- public string ITEM_NAME { get; set; }
- /// <summary>
- ///
- ///</summary>
- public string ITEM_MODEL { get; set; }
- /// <summary>
- ///
- ///</summary>
- public int? ICOUNT { get; set; }
- /// <summary>
- ///
- ///</summary>
- public bool? COME_FLG { get; set; }
- }
-}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs
index c4c3350..771c783 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs
@@ -31,7 +31,6 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -43,6 +42,7 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -69,8 +69,8 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
this.gv_guid,
- this.gv_chk,
this.gridColumn4,
this.gv_supplierItemCode,
this.gv_supplierItemName,
@@ -100,19 +100,6 @@
this.gv_guid.OptionsColumn.ReadOnly = true;
this.gv_guid.Tag = "query_a.guid";
this.gv_guid.Width = 94;
- //
- // gv_chk
- //
- this.gv_chk.Caption = "閫夋嫨";
- this.gv_chk.FieldName = "gvChk";
- this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
- this.gv_chk.MaxWidth = 50;
- this.gv_chk.MinWidth = 50;
- this.gv_chk.Name = "gv_chk";
- this.gv_chk.Tag = "edit";
- this.gv_chk.Visible = true;
- this.gv_chk.VisibleIndex = 0;
- this.gv_chk.Width = 50;
//
// gridColumn4
//
@@ -245,6 +232,16 @@
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Width = 94;
//
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.MinWidth = 25;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 94;
+ //
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
@@ -256,9 +253,11 @@
//
// btnIn
//
- this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
- this.btnIn.Location = new System.Drawing.Point(2, 2);
+ this.btnIn.Location = new System.Drawing.Point(960, 2);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(94, 39);
this.btnIn.TabIndex = 4;
@@ -276,7 +275,7 @@
this.MinimizeBox = false;
this.Name = "SelectShuoTuiSq";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨閫�璐ф槑缁�";
+ this.Text = "閫夋嫨鍙楁墭鍏ュ簱鏄庣粏锛堝彧鏄剧ず鍙��鏁伴噺澶т簬0鐨勶級";
this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -290,7 +289,6 @@
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
@@ -304,5 +302,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
index 6b1a95b..c293210 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs
@@ -2,6 +2,7 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -24,6 +25,14 @@
public SelectShuoTuiSq(string _cusId, string _inOrgId, string _ckId, string _isSource)
{
InitializeComponent();
+ this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
+ this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+ this.colChkInt.OptionsFilter.AllowFilter = false;
+ this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.colChkInt.VisibleIndex = 0;
this.cusId = _cusId;
this.inOrgId = _inOrgId;
this.ckId = _ckId;
@@ -32,27 +41,33 @@
getPageList(1);
btnIn.Click += (s, e) =>
{
- var list = new List<dynamic>();
- for (var i = 0; i < gridView1.DataRowCount; i++)
+ var list = new List<dynamic>();
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
+ DataTable dt = this.gcMain.DataSource as DataTable;
{
- var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
- if (checkBox == "Checked")
+ foreach (DataRow dr in dt.Rows)
{
- list.Add(new
+ string checkBox = dr["chkInt"].ToString();
+ string _guid = dr["rkmxGuid"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
{
- rkmxGuid = gridView1.GetRowCellDisplayText(i, "rkmxGuid"),
- invBillNo = gridView1.GetRowCellDisplayText(i, "invBillNo"),
- itemNo = gridView1.GetRowCellDisplayText(i, "itemNo"),
- itemName = gridView1.GetRowCellDisplayText(i, "itemName"),
- itemModel = gridView1.GetRowCellDisplayText(i, "itemModel"),
- itemId = gridView1.GetRowCellDisplayText(i, "itemId"),
- rksl = gridView1.GetRowCellDisplayText(i, "rksl"),
- dwName = gridView1.GetRowCellDisplayText(i, "dwName"),
- yt = gridView1.GetRowCellDisplayText(i, "yt"),
- kt = gridView1.GetRowCellDisplayText(i, "kt"),
- khName = gridView1.GetRowCellDisplayText(i, "khName"),
- receivingOrg = gridView1.GetRowCellDisplayText(i, "receivingOrg"),
- });
+ list.Add(new
+ {
+ rkmxGuid = dr["rkmxGuid"].ToString(),
+ invBillNo = dr["invBillNo"].ToString(),
+ itemNo = dr["itemNo"].ToString(),
+ itemName = dr["itemName"].ToString(),
+ itemModel = dr["itemModel"].ToString(),
+ itemId = dr["itemId"].ToString(),
+ rksl = dr["rksl"].ToString(),
+ dwName = dr["dwName"].ToString(),
+ yt = dr["yt"].ToString(),
+ kt = dr["kt"].ToString(),
+ khName = dr["khName"].ToString(),
+ receivingOrg = dr["receivingOrg"].ToString(),
+ });
+ }
}
}
UpdateParent?.Invoke(this,
@@ -96,7 +111,6 @@
gcMain.DataSource = dt;
gcMain.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
- var dddd = dd.rtnData.pages; //鎬婚〉
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
index ea14450..78c201e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
--
Gitblit v1.9.3