From 7871d5a0050a6c9ffd0b389b9ae42b8c427e8112 Mon Sep 17 00:00:00 2001 From: "hao.jin" Date: Tue, 26 Dec 2023 09:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=94=E8=AE=B0=E6=9C=AC=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JISAdmin/F_EDI_JIS5000Sequence.cs | 6 +- .../Stone.WinBiz/Standard/F_JIS_VDA_ASN.cs | 17 ++- Stone.WinForm/Stone.WinForm/frmMain.cs | 8 +- .../BasicData/frmASNManager.Designer.cs | 98 ++++++++++++++ .../BasicData/frmASNManager.cs | 79 ++++++++++++ .../BasicData/frmASNManager.resx | 120 ++++++++++++++++++ .../Stone.WinModule/Standard/frmJISVDA.cs | 4 +- .../Stone.WinModule/Standard/frmJISVDAASN.cs | 10 +- .../Stone.WinModule/Stone.WinModule.csproj | 9 ++ .../SystemData/frmPassword.Designer.cs | 10 +- 10 files changed, 350 insertions(+), 11 deletions(-) create mode 100644 Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.Designer.cs create mode 100644 Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.cs create mode 100644 Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.resx diff --git a/Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs b/Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs index a3b908a..92f96ef 100644 --- a/Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs +++ b/Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs @@ -228,6 +228,7 @@ namespace Stone.WinBiz.JISAdmin string version = string.Empty; string releaseId = string.Empty; string partNumber = string.Empty; + string partDesc = string.Empty; string orderNumber = string.Empty; string status = string.Empty; string startDate = string.Empty; @@ -330,6 +331,7 @@ namespace Stone.WinBiz.JISAdmin if (sp_line[0] == "ARD") { partNumber = sp_line[1].Split(':')[0]; + partDesc = sp_line[1].Split(':')[2]; orderNumber = sp_line[3]; //add by jinh 20220419 从list获取该零件的版本号 releaseId = lstPartRelease.FirstOrDefault(p => p.PartCode == partNumber).Release; @@ -349,8 +351,8 @@ namespace Stone.WinBiz.JISAdmin } else { - strPartMsg += "零件号 " + partNumber + " 未定义！" + Environment.NewLine; - alertMsg4 += "零件号 " + partNumber + " 未定义！" + Environment.NewLine; + strPartMsg += "零件号," + partNumber + "," + partDesc + ",未定义!" + Environment.NewLine; + alertMsg4 += "零件号," + partNumber + "," + partDesc + ",未定义!" + Environment.NewLine; } } diff --git a/Stone.WinForm/Stone.WinBiz/Standard/F_JIS_VDA_ASN.cs b/Stone.WinForm/Stone.WinBiz/Standard/F_JIS_VDA_ASN.cs index 074d317..edc7b2c 100644 --- a/Stone.WinForm/Stone.WinBiz/Standard/F_JIS_VDA_ASN.cs +++ b/Stone.WinForm/Stone.WinBiz/Standard/F_JIS_VDA_ASN.cs @@ -126,7 +126,7 @@ namespace Stone.WinBiz.Standard } //取ASN编号 - public static string GetVDA_AsnNumber(LocalDBService db, string filetype, int len) + public static string GetVDA_AsnNumber_OLD(LocalDBService db, string filetype, int len) { string n = ""; if (filetype == "SY78") n = "7"; @@ -140,6 +140,21 @@ namespace Stone.WinBiz.Standard return $"ADT{n}{date}" + MyStrings.PadLeftString(sn.ToString(), '0', len); } + public static string GetVDA_AsnNumber(LocalDBService db, string filetype, int len) + { + string n = ""; + if (filetype == "SY78") n = "7"; + if (filetype == "SY88") n = "8"; + + string date = Convert.ToDateTime(MyDateTime.GetServerDateTime()).Date.ToString("yyyy"); + string type = $"VDAASN编号_{n}{date}"; + + int sn = Convert.ToInt32(db.Exec_Object($"exec p_GetBillNo 'VDAASN编号_{filetype}_{date}'")); + + n = "S"; + return $"ADT{n}{date}" + MyStrings.PadLeftString(sn.ToString(), '0', len); + } + //取装箱单号 public static string GetVDA_PackNumber(LocalDBService db, string type, int len) { diff --git a/Stone.WinForm/Stone.WinForm/frmMain.cs b/Stone.WinForm/Stone.WinForm/frmMain.cs index f7c45b6..e817804 100644 --- a/Stone.WinForm/Stone.WinForm/frmMain.cs +++ b/Stone.WinForm/Stone.WinForm/frmMain.cs @@ -8,6 +8,7 @@ using System.Windows.Forms; using WeifenLuo.WinFormsUI.Docking; using Stone.Common; using Stone.WinBiz.SystemData; +using Stone.WinModule.BasicData; namespace Stone.WinForm @@ -84,7 +85,6 @@ namespace Stone.WinForm if (e.Node.Text == "用户管理") { Stone.WinModule.SystemData.frmUsers frm = new Stone.WinModule.SystemData.frmUsers(); - ShowWindow(frm); } @@ -175,6 +175,12 @@ namespace Stone.WinForm ShowWindow(frm); } + if (e.Node.Text == "ASN单流水管理") + { + Stone.WinModule.BasicData.frmASNManager frm = new WinModule.BasicData.frmASNManager(); + frm.Text = "ASN单流水管理"; + ShowWindow(frm); + } diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.Designer.cs b/Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.Designer.cs new file mode 100644 index 0000000..6b66786 --- /dev/null +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.Designer.cs @@ -0,0 +1,98 @@ +namespace Stone.WinModule.BasicData +{ + partial class frmASNManager + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnModify = new System.Windows.Forms.Button(); + this.tbSerNum = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.btnUpdate = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // btnModify + // + this.btnModify.Location = new System.Drawing.Point(114, 139); + this.btnModify.Name = "btnModify"; + this.btnModify.Size = new System.Drawing.Size(86, 38); + this.btnModify.TabIndex = 0; + this.btnModify.Text = "修改"; + this.btnModify.UseVisualStyleBackColor = true; + this.btnModify.Click += new System.EventHandler(this.btnModify_Click); + // + // tbSerNum + // + this.tbSerNum.Location = new System.Drawing.Point(292, 61); + this.tbSerNum.Name = "tbSerNum"; + this.tbSerNum.Size = new System.Drawing.Size(100, 28); + this.tbSerNum.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(89, 64); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(197, 18); + this.label1.TabIndex = 2; + this.label1.Text = "当前ASN单最大流水号："; + // + // btnUpdate + // + this.btnUpdate.Location = new System.Drawing.Point(292, 139); + this.btnUpdate.Name = "btnUpdate"; + this.btnUpdate.Size = new System.Drawing.Size(76, 38); + this.btnUpdate.TabIndex = 3; + this.btnUpdate.Text = "更新"; + this.btnUpdate.UseVisualStyleBackColor = true; + this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click); + // + // frmASNManager + // + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(671, 369); + this.Controls.Add(this.btnUpdate); + this.Controls.Add(this.label1); + this.Controls.Add(this.tbSerNum); + this.Controls.Add(this.btnModify); + this.Name = "frmASNManager"; + this.TabText = "ASN单流水管理"; + this.Text = "ASN单流水管理"; + this.Load += new System.EventHandler(this.frmASNManager_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnModify; + private System.Windows.Forms.TextBox tbSerNum; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btnUpdate; + } +} \ No newline at end of file diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.cs b/Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.cs new file mode 100644 index 0000000..c2475b7 --- /dev/null +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Windows.Forms; +using Gm_WMS.DataAccess.DataService; +using Stone.Common; + +namespace Stone.WinModule.BasicData +{ + public partial class frmASNManager : Stone.WinModule.frmBase + { + public frmASNManager() + { + InitializeComponent(); + } + + + private void frmASNManager_Load(object sender, EventArgs e) + { + tbSerNum.ReadOnly = true; + RefreshAsnNum(); + } + + private void RefreshAsnNum() + { + var strsql = ""; + var sysDate = ""; + sysDate = Convert.ToDateTime(MyDateTime.GetServerDateTime()).Date.ToString("yyyy"); + strsql = "select * from t_BillNo" + + " where type = 'VDAASN编号_SY88_" + sysDate + "'"; + var db = new LocalDBService(); + DataTable dtData = db.Exec_DataSet(strsql).Tables[0]; + if (dtData.Rows.Count > 0) + { + tbSerNum.Text = dtData.Rows[0]["value"].ToString(); + } + else + { + tbSerNum.Text = "0"; + } + } + + private void btnModify_Click(object sender, EventArgs e) + { + tbSerNum.ReadOnly = false; + tbSerNum.Focus(); + tbSerNum.SelectAll(); + } + + private void btnUpdate_Click(object sender, EventArgs e) + { + var serNum = 0; + try + { + serNum = int.Parse(tbSerNum.Text); + } + catch (Exception exception) + { + MessageBox.Show("请输入有效的数值！"); + tbSerNum.SelectAll(); + return; + } + var sysDate = ""; + sysDate = Convert.ToDateTime(MyDateTime.GetServerDateTime()).Date.ToString("yyyy"); + var strsql = "Update t_BillNo set value = " + serNum + + " where type = 'VDAASN编号_SY88_" + sysDate + "'"; + var db = new LocalDBService(); + db.Exec_NonQuery(strsql); + tbSerNum.ReadOnly = true; + RefreshAsnNum(); + MessageBox.Show("修改ASN单当前最大流水号成功！"); + } + } +} diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.resx b/Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs index f3f502e..8446dca 100644 --- a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs +++ b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs @@ -234,7 +234,7 @@ namespace Stone.WinModule.Standard //DataTable dtData = v_JIS_Lab.GetData("*, quantity as quantity_new", $"[ID] in({ids})", "[PartNumber] asc").Tables[0]; var strsql = "select IsStandard,fileType,partNumber,sum(quantity) as quantity,sum(quantity) as quantity_new,sum(quantity_transit) as quantity_transit,PackNumer," + - "Location,OrderNumber,LocationCode,releaseId" + + "Location,OrderNumber,LocationCode,releaseId,min(startDate) as startDate" + " from v_JIS_Lab_List" + " where 1 =1 " + " and ID in (" + ids + ")" + @@ -368,7 +368,7 @@ namespace Stone.WinModule.Standard } else { - AsnNumber = F_JIS_VDA_ASN.GetVDA_AsnNumber(db, fileType, 3); + AsnNumber = F_JIS_VDA_ASN.GetVDA_AsnNumber(db, fileType, 5); } if (AsnNumber.Substring(0, 3) != "ADT") diff --git a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs index 70cb7d1..bc36e38 100644 --- a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs +++ b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs @@ -423,7 +423,7 @@ namespace Stone.WinModule.Standard Entity_t_JIS_VDA t_JIS_VDA = new Entity_t_JIS_VDA(db); - t_JIS_VDA.Edit($"[IsUpload]=0, [UploadTime]=null,IsShipingVerification = 0,IsPrintASN = 0", $"[AsnNumber]='{AsnNumber}'"); + t_JIS_VDA.Edit($"[IsUpload]=0, [UploadTime]=null,[PrintASNTime] = null,IsShipingVerification = 0,IsPrintASN = 0", $"[AsnNumber]='{AsnNumber}'"); db.Commit(); } @@ -467,6 +467,14 @@ namespace Stone.WinModule.Standard frm.dtData = dtData; frm.ShowDialog(); frm.Dispose(); + //更新需求日期 todo + var db = new Gm_WMS.DataAccess.DataService.LocalDBService(); + db.BeginTrans(); + Entity_v_JIS_VDA t_JIS_VDA = new Entity_v_JIS_VDA(db); + t_JIS_VDA.Edit($"[Date]='" + frmPickUpDate.dtPickUp + "'", $"[AsnNumber]='{AsnNumber}'"); + db.Commit(); + Search(AsnNumber); + btnSerach_Click(sender,null); } catch (Exception ex) { diff --git a/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj b/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj index b092a0e..09c9c6e 100644 --- a/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj +++ b/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj @@ -136,6 +136,12 @@ frmViewAssemblyNew.cs + + Form + + + frmASNManager.cs + Form @@ -658,6 +664,9 @@ frmViewAssemblyNew.cs + + frmASNManager.cs + frmBaseMain.cs diff --git a/Stone.WinForm/Stone.WinModule/SystemData/frmPassword.Designer.cs b/Stone.WinForm/Stone.WinModule/SystemData/frmPassword.Designer.cs index 0c9108b..1ad1525 100644 --- a/Stone.WinForm/Stone.WinModule/SystemData/frmPassword.Designer.cs +++ b/Stone.WinForm/Stone.WinModule/SystemData/frmPassword.Designer.cs @@ -33,16 +33,18 @@ // // panel1 // - this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Location = new System.Drawing.Point(18, 18); + this.panel1.Margin = new System.Windows.Forms.Padding(4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(602, 351); + this.panel1.Size = new System.Drawing.Size(903, 526); this.panel1.TabIndex = 1; // // frmPassword // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.ClientSize = new System.Drawing.Size(711, 501); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); + this.ClientSize = new System.Drawing.Size(1066, 752); this.Controls.Add(this.panel1); + this.Margin = new System.Windows.Forms.Padding(6); this.Name = "frmPassword"; this.TabText = "系统管理_密码修改"; this.Text = "系统管理_密码修改";