diff --git a/Stone.WinForm/Stone.Common.Dlls/Stone.Entity.dll b/Stone.WinForm/Stone.Common.Dlls/Stone.Entity.dll index 940254b..4bb8033 100644 Binary files a/Stone.WinForm/Stone.Common.Dlls/Stone.Entity.dll and b/Stone.WinForm/Stone.Common.Dlls/Stone.Entity.dll differ diff --git a/Stone.WinForm/Stone.Entity/Entity_t_PartOutQty.cs b/Stone.WinForm/Stone.Entity/Entity_t_PartOutQty.cs new file mode 100644 index 0000000..dd63417 --- /dev/null +++ b/Stone.WinForm/Stone.Entity/Entity_t_PartOutQty.cs @@ -0,0 +1,27 @@ +using Gm_WMS.DataAccess.DataService; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Stone.Entity +{ + public class Entity_t_PartOutQty:EntityBase + + { + public static string TableNameNew = "t_PartOutQty"; + + public Entity_t_PartOutQty() + { + base.TableName = TableNameNew; + base.Init(); + } + + public Entity_t_PartOutQty(LocalDBService myDB) + { + base.db = myDB; + base.TableName = TableNameNew; + base.Init(); + } + } +} diff --git a/Stone.WinForm/Stone.Entity/Stone.Entity.csproj b/Stone.WinForm/Stone.Entity/Stone.Entity.csproj index ec7f735..90124c5 100644 --- a/Stone.WinForm/Stone.Entity/Stone.Entity.csproj +++ b/Stone.WinForm/Stone.Entity/Stone.Entity.csproj @@ -62,6 +62,7 @@ + diff --git a/Stone.WinForm/Stone.WinBiz/BasicData/F_PartOutQty.cs b/Stone.WinForm/Stone.WinBiz/BasicData/F_PartOutQty.cs new file mode 100644 index 0000000..abbb7c6 --- /dev/null +++ b/Stone.WinForm/Stone.WinBiz/BasicData/F_PartOutQty.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using System.Data; +using Stone.Entity; +using Gm_WMS.DataAccess.DataService; +using Stone.Common; + +namespace Stone.WinBiz.BasicData +{ + public class F_PartOutQty : F_Base + { + public F_PartOutQty() + { + this.type = "PartOutQty"; + this.name = "基础资料_累计发货数量"; + this.entity = new Entity_t_PartOutQty(); + //this.entityView = new Entity_v_Product(); + } + + public override void GetView(DataGridView dgv) + { + base.GetView(dgv); + + dgv.Columns["Code"].HeaderText = "存货代码"; + dgv.Columns["PartOutQty"].HeaderText = "累计发货数量"; + + + } + + public override void Checking(DataRow drData, bool isNew) + { + //base.Checking(drData, isNew); + + + //if ((new F_CarModel()).GetData("Code='" + drData["CarModelCode"].ToString() + "'") == null) + // throw new Exception("车型代码 " + drData["CarModelCode"].ToString() + " 不存在！"); + + //if ((new F_Color()).GetData("Code='" + drData["ColorCode"].ToString() + "'") == null) + // throw new Exception("颜色代码 " + drData["ColorCode"].ToString() + " 不存在！"); + + + //if (MyStrings.GetLength(drData["Name"].ToString()) > 255) throw new Exception("名称不能超过255个字符！"); + } + + + public override void InputData(DataSet dsData, LocalDBService db) + { + //Entity_t_Product t_Input = new Entity_t_Product(db); + //DataRow drInput = null; + + //foreach (DataRow drData in dsData.Tables[0].Rows) + //{ + + // drInput = t_Input.Table.NewRow(); + // drInput["Code"] = drData["存货代码"].ToString().Trim(); + // drInput["Name"] = drData["存货名称"].ToString().Trim(); + // drInput["CarModelCode"] = drData["车型代码"].ToString().Trim(); + // drInput["ColorCode"] = drData["颜色代码"].ToString().Trim(); + // drInput["Model"] = drData["规格型号"].ToString().Trim(); + // drInput["Deploy"] = drData["配置"].ToString().Trim(); + // drInput["BarCode"] = drData["条码号"].ToString(); + // drInput["PackNumer"] = drData["装箱数量"].ToString(); + // drInput["IsStandard"] = drData["是否STD件"].ToString(); + // drInput["State"] = drData["启用"].ToString(); + + // if (drInput["Code"].ToString().Trim() == "") + // throw new Exception("代码不能为空!"); + + + // if (t_Input.GetData("", "Code='" + drInput["Code"].ToString() + "'", "id asc").Tables[0].Rows.Count > 0) + // throw new Exception("代码 " + drInput["Code"].ToString() + " 已经存在！"); + + + // if ((new Entity_t_CarModel(db)).GetData("", "Code='" + drInput["CarModelCode"].ToString() + "'", "id asc").Tables[0].Rows.Count == 0) + // throw new Exception("车型代码 " + drInput["CarModelCode"].ToString() + " 不存在！"); + + // if ((new Entity_t_Color(db)).GetData("", "Code='" + drInput["ColorCode"].ToString() + "'", "id asc").Tables[0].Rows.Count == 0) + // throw new Exception("颜色代码 " + drInput["ColorCode"].ToString() + " 不存在！"); + + + // if (MyStrings.GetLength(drInput["Name"].ToString()) > 255) throw new Exception("名称不能超过255个字符！"); + + // //Checking(drInput, true); + // t_Input.Add(drInput); + + //} + } + } +} diff --git a/Stone.WinForm/Stone.WinBiz/Stone.WinBiz.csproj b/Stone.WinForm/Stone.WinBiz/Stone.WinBiz.csproj index 9375af7..e38ea14 100644 --- a/Stone.WinForm/Stone.WinBiz/Stone.WinBiz.csproj +++ b/Stone.WinForm/Stone.WinBiz/Stone.WinBiz.csproj @@ -52,6 +52,7 @@ AllRules.ruleset + False ..\Stone.Common.Dlls\Gm_WMS.DataAccess.DataService.dll @@ -64,7 +65,8 @@ ..\Stone.Common.Dlls\Stone.Common.dll - + + False ..\Stone.Common.Dlls\Stone.Entity.dll @@ -79,6 +81,7 @@ + diff --git a/Stone.WinForm/Stone.WinForm.sln b/Stone.WinForm/Stone.WinForm.sln index bd3ef48..01b775d 100644 --- a/Stone.WinForm/Stone.WinForm.sln +++ b/Stone.WinForm/Stone.WinForm.sln @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stone.WinModule", "Stone.Wi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stone.WinService", "Stone.WinService\Stone.WinService.csproj", "{7A9CCBC9-CD6C-4521-93D8-BB4D5EEF44E9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stone.Entity", "Stone.Entity\Stone.Entity.csproj", "{A9970B1D-13B1-4500-900E-2E429A1CA6FF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -61,6 +63,18 @@ Global {7A9CCBC9-CD6C-4521-93D8-BB4D5EEF44E9}.Release|Mixed Platforms.Build.0 = Release|x86 {7A9CCBC9-CD6C-4521-93D8-BB4D5EEF44E9}.Release|x86.ActiveCfg = Release|x86 {7A9CCBC9-CD6C-4521-93D8-BB4D5EEF44E9}.Release|x86.Build.0 = Release|x86 + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Debug|x86.ActiveCfg = Debug|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Debug|x86.Build.0 = Debug|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Release|Any CPU.Build.0 = Release|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Release|x86.ActiveCfg = Release|Any CPU + {A9970B1D-13B1-4500-900E-2E429A1CA6FF}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Stone.WinForm/Stone.WinForm/frmMain.cs b/Stone.WinForm/Stone.WinForm/frmMain.cs index c107df3..2f2df49 100644 --- a/Stone.WinForm/Stone.WinForm/frmMain.cs +++ b/Stone.WinForm/Stone.WinForm/frmMain.cs @@ -147,6 +147,15 @@ namespace Stone.WinForm ShowWindow(frm); } + if (e.Node.Text == "累计发货数量") + { + Stone.WinModule.BasicData.frmPartOutQty frm = new WinModule.BasicData.frmPartOutQty(); + frm.m_Base = new WinBiz.BasicData.F_PartOutQty(); + frm.init(); + + ShowWindow(frm); + } + diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmPartOutQty.Designer.cs b/Stone.WinForm/Stone.WinModule/BasicData/frmPartOutQty.Designer.cs new file mode 100644 index 0000000..d7b8cf2 --- /dev/null +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmPartOutQty.Designer.cs @@ -0,0 +1,36 @@ +namespace Stone.WinModule.BasicData +{ + partial class frmPartOutQty + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows 窗体设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + } + + #endregion + } +} diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmPartOutQty.cs b/Stone.WinForm/Stone.WinModule/BasicData/frmPartOutQty.cs new file mode 100644 index 0000000..1b924dc --- /dev/null +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmPartOutQty.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace Stone.WinModule.BasicData +{ + public partial class frmPartOutQty : Stone.WinModule.BasicData.frmBaseMain + { + public frmPartOutQty() + { + InitializeComponent(); + } + + public override void Search(string code) + { + base.Search(code); + + strWhere += " or [Code] like '%" + code + "%'"; + + } + } +} diff --git a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs index 9cca0b6..336768f 100644 --- a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs +++ b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs @@ -304,6 +304,7 @@ namespace Stone.WinModule.Standard } } + //号码预分配 private void CreateVDA(DataTable dtData, bool quantity_new) { LocalDBService db = null; @@ -321,6 +322,9 @@ namespace Stone.WinModule.Standard string LabelDate = MyDateTime.GetServerDateTime().ToString("yyyy-MM-dd HH:mm"); string Date = MyDateTime.GetServerDateTime().ToString("yyyy-MM-dd"); string AsnNumbers = ""; + + + foreach (DataRow drData in dtData.Rows) { string Location = drData["Location"].ToString(); @@ -384,6 +388,7 @@ namespace Stone.WinModule.Standard drVDA["LocationCode"] = drData["LocationCode"].ToString(); drVDA["releaseId"] = drData["releaseId"].ToString(); t_JIS_VDA.Add(drVDA); + PackageNos += drVDA["PackageNo"].ToString() + ","; } @@ -403,7 +408,7 @@ namespace Stone.WinModule.Standard drVDA["LocationCode"] = drData["LocationCode"].ToString(); drVDA["releaseId"] = drData["releaseId"].ToString(); t_JIS_VDA.Add(drVDA); - + PackageNos += drVDA["PackageNo"].ToString() + ","; } @@ -643,5 +648,17 @@ namespace Stone.WinModule.Standard this.chkAuto.Checked = LastAutoCheck; } } + + /// + /// 修改t_PartOutQty表的数量 + /// + /// 零件号 + /// 数量 + //public void UpdatePartOutQty(string code, int qty) + //{ + // Entity_t_PartOutQty partOutQty = new Entity_t_PartOutQty(); + // partOutQty.GetData()[] + // partOutQty.Edit(part, qty); + //} } } diff --git a/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj b/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj index 5e546a4..ad58418 100644 --- a/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj +++ b/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj @@ -172,6 +172,12 @@ frmJISLimitsList.cs + + Form + + + frmPartOutQty.cs + Form