Browse Source
1.厂内参考号可重复采集 2.标签模板调整 3.ASN增加SwetDate字段 4.增加Supper Net Lable导入功能 5.生成Pre-DN时由操作者选择PickUp Date 6.卸货点增加卸货点代码 7.读取Lab时 将零件校验信息、地点校验信息、LAB解析失败信息写入日志 8.LAB解析Release号获取Bug修复master
20 changed files with 1205 additions and 279 deletions
@ -0,0 +1,91 @@ |
|||
namespace Stone.WinModule.Standard |
|||
{ |
|||
partial class frmPickUpDate |
|||
{ |
|||
/// <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.btnOK = new System.Windows.Forms.Button(); |
|||
this.btnClose = new System.Windows.Forms.Button(); |
|||
this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker(); |
|||
this.SuspendLayout(); |
|||
//
|
|||
// btnOK
|
|||
//
|
|||
this.btnOK.Location = new System.Drawing.Point(26, 111); |
|||
this.btnOK.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7); |
|||
this.btnOK.Name = "btnOK"; |
|||
this.btnOK.Size = new System.Drawing.Size(150, 51); |
|||
this.btnOK.TabIndex = 2; |
|||
this.btnOK.Text = "确定"; |
|||
this.btnOK.UseVisualStyleBackColor = true; |
|||
this.btnOK.Click += new System.EventHandler(this.btnOK_Click); |
|||
//
|
|||
// btnClose
|
|||
//
|
|||
this.btnClose.Location = new System.Drawing.Point(282, 111); |
|||
this.btnClose.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7); |
|||
this.btnClose.Name = "btnClose"; |
|||
this.btnClose.Size = new System.Drawing.Size(150, 51); |
|||
this.btnClose.TabIndex = 3; |
|||
this.btnClose.Text = "取消"; |
|||
this.btnClose.UseVisualStyleBackColor = true; |
|||
this.btnClose.Click += new System.EventHandler(this.btnClose_Click); |
|||
//
|
|||
// dateTimePicker1
|
|||
//
|
|||
this.dateTimePicker1.CustomFormat = " yyyy-MM-dd HH:mm:ss"; |
|||
this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; |
|||
this.dateTimePicker1.Location = new System.Drawing.Point(28, 35); |
|||
this.dateTimePicker1.Name = "dateTimePicker1"; |
|||
this.dateTimePicker1.Size = new System.Drawing.Size(404, 47); |
|||
this.dateTimePicker1.TabIndex = 4; |
|||
//
|
|||
// frmPickUpDate
|
|||
//
|
|||
this.AutoScaleDimensions = new System.Drawing.SizeF(18F, 39F); |
|||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |
|||
this.ClientSize = new System.Drawing.Size(461, 200); |
|||
this.Controls.Add(this.dateTimePicker1); |
|||
this.Controls.Add(this.btnClose); |
|||
this.Controls.Add(this.btnOK); |
|||
this.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); |
|||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; |
|||
this.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7); |
|||
this.Name = "frmPickUpDate"; |
|||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; |
|||
this.Text = "Required Pick-up Date"; |
|||
this.Load += new System.EventHandler(this.frmPasswordVerify_Load); |
|||
this.ResumeLayout(false); |
|||
|
|||
} |
|||
|
|||
#endregion
|
|||
private System.Windows.Forms.Button btnOK; |
|||
private System.Windows.Forms.Button btnClose; |
|||
private System.Windows.Forms.DateTimePicker dateTimePicker1; |
|||
} |
|||
} |
|||
@ -0,0 +1,47 @@ |
|||
using Stone.Common; |
|||
using Stone.Entity; |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.ComponentModel; |
|||
using System.Data; |
|||
using System.Drawing; |
|||
using System.Linq; |
|||
using System.Text; |
|||
using System.Windows.Forms; |
|||
|
|||
namespace Stone.WinModule.Standard |
|||
{ |
|||
public partial class frmPickUpDate : Form |
|||
{ |
|||
public DateTime dtPickUp; |
|||
public DateTime dtSwetDate; |
|||
public frmPickUpDate() |
|||
{ |
|||
InitializeComponent(); |
|||
} |
|||
|
|||
private void frmPasswordVerify_Load(object sender, EventArgs e) |
|||
{ |
|||
dateTimePicker1.Value = dtSwetDate.Date; |
|||
} |
|||
|
|||
private void btnOK_Click(object sender, EventArgs e) |
|||
{ |
|||
try |
|||
{ |
|||
dtPickUp = dateTimePicker1.Value; |
|||
this.DialogResult = DialogResult.OK; |
|||
this.Close(); |
|||
} |
|||
catch (Exception ex) |
|||
{ |
|||
MyMessageBox.ShowErrorMessage(ex.Message); |
|||
} |
|||
} |
|||
|
|||
private void btnClose_Click(object sender, EventArgs e) |
|||
{ |
|||
this.Close(); |
|||
} |
|||
} |
|||
} |
|||
@ -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> |
|||
Loading…
Reference in new issue