Compare commits

...

4 Commits

  1. 6
      Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs
  2. 17
      Stone.WinForm/Stone.WinBiz/Standard/F_JIS_VDA_ASN.cs
  3. 8
      Stone.WinForm/Stone.WinForm/frmMain.cs
  4. 98
      Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.Designer.cs
  5. 79
      Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.cs
  6. 120
      Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.resx
  7. 15
      Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs
  8. 10
      Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs
  9. 9
      Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj
  10. 10
      Stone.WinForm/Stone.WinModule/SystemData/frmPassword.Designer.cs

6
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;
}
}

17
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)
{

8
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);
}

98
Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.Designer.cs

@ -0,0 +1,98 @@
namespace Stone.WinModule.BasicData
{
partial class frmASNManager
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
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;
}
}

79
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单当前最大流水号成功!");
}
}
}

120
Stone.WinForm/Stone.WinModule/BasicData/frmASNManager.resx

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

15
Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs

@ -231,7 +231,18 @@ namespace Stone.WinModule.Standard
if (ids.Length > 0) ids = ids.Substring(0, ids.Length - 1);
Entity_v_JIS_Lab_List v_JIS_Lab = new Entity_v_JIS_Lab_List();
DataTable dtData = v_JIS_Lab.GetData("*, quantity as quantity_new", $"[ID] in({ids})", "[PartNumber] asc").Tables[0];
//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,min(startDate) as startDate" +
" from v_JIS_Lab_List" +
" where 1 =1 " +
" and ID in (" + ids + ")" +
" group by IsStandard,fileType, partNumber, PackNumer,Location, OrderNumber, LocationCode, releaseId";
var db = new LocalDBService();
DataTable dtData = db.Exec_DataSet(strsql).Tables[0];
if (dtData.Rows.Count == 0) throw new Exception("记录不存在");
@ -357,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")

10
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)
{

9
Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj

@ -136,6 +136,12 @@
<Compile Include="AssembleAdmin\frmViewAssemblyNew.Designer.cs">
<DependentUpon>frmViewAssemblyNew.cs</DependentUpon>
</Compile>
<Compile Include="BasicData\frmASNManager.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="BasicData\frmASNManager.Designer.cs">
<DependentUpon>frmASNManager.cs</DependentUpon>
</Compile>
<Compile Include="BasicData\frmBaseMain.cs">
<SubType>Form</SubType>
</Compile>
@ -658,6 +664,9 @@
<EmbeddedResource Include="AssembleAdmin\frmViewAssemblyNew.resx">
<DependentUpon>frmViewAssemblyNew.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BasicData\frmASNManager.resx">
<DependentUpon>frmASNManager.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BasicData\frmBaseMain.resx">
<DependentUpon>frmBaseMain.cs</DependentUpon>
</EmbeddedResource>

10
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 = "系统管理_密码修改";

Loading…
Cancel
Save