Browse Source

STD系统修改

1.厂内参考号可重复采集
2.标签模板调整
3.ASN增加SwetDate字段
4.增加Supper Net Lable导入功能
5.生成Pre-DN时由操作者选择PickUp Date
6.卸货点增加卸货点代码
7.读取Lab时 将零件校验信息、地点校验信息、LAB解析失败信息写入日志
8.LAB解析Release号获取Bug修复
master
hao.jin 3 years ago
parent
commit
e5f723391d
  1. 22
      Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs
  2. 1
      Stone.WinForm/Stone.WinBiz/BasicData/F_Location.cs
  3. 70
      Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs
  4. 13
      Stone.WinForm/Stone.WinBiz/JISAdmin/F_JIS5000_Print.cs
  5. 2
      Stone.WinForm/Stone.WinBiz/Standard/F_JIS_VDA_ASN.cs
  6. 368
      Stone.WinForm/Stone.WinForm/Report/ASN.grf
  7. 312
      Stone.WinForm/Stone.WinForm/Report/VDA.grf
  8. 4
      Stone.WinForm/Stone.WinForm/Stone.WinForm.csproj
  9. 1
      Stone.WinForm/Stone.WinModule/BasicData/frmLocation.cs
  10. 65
      Stone.WinForm/Stone.WinModule/BasicData/frmLocationDetail.Designer.cs
  11. 4
      Stone.WinForm/Stone.WinModule/BasicData/frmLocationDetail.cs
  12. 234
      Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs
  13. 17
      Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs
  14. 7
      Stone.WinForm/Stone.WinModule/Standard/frmPREDN.cs
  15. 91
      Stone.WinForm/Stone.WinModule/Standard/frmPickUpDate.Designer.cs
  16. 47
      Stone.WinForm/Stone.WinModule/Standard/frmPickUpDate.cs
  17. 120
      Stone.WinForm/Stone.WinModule/Standard/frmPickUpDate.resx
  18. 12
      Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj
  19. 8
      Stone.WinForm/Stone.WinService/Stone.WinForm.xml
  20. 38
      Stone.WinForm/Stone.WinService/Stone.WinService.csproj

22
Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs

@ -51,8 +51,8 @@ namespace Stone.DataService.Biz.Bill
t_JIS_VDA.Edit($"[IsPackingVerification]=1", $"[ID]={dtVDA.Rows[0]["ID"]}");
if (t_VerifyBill.GetData($"[BarCode]='{BarCode}'").Tables[0].Rows.Count > 0)
throw new Exception($"内部装箱单号 {BarCode} 重复扫描");
//if (t_VerifyBill.GetData($"[BarCode]='{BarCode}'").Tables[0].Rows.Count > 0)
// throw new Exception($"内部装箱单号 {BarCode} 重复扫描");
DataRow drVerify = t_VerifyBill.Table.NewRow();
drVerify["AsnNumber"] = dtVDA.Rows[0]["AsnNumber"].ToString();
@ -97,6 +97,14 @@ namespace Stone.DataService.Biz.Bill
{
throw new Exception($"不存在 VDA标签 {VDA} 的校验记录!");
}
else
{
var oldBarCode = dsVerifyBill.Tables[0].Rows[0]["BarCode"].ToString();
if (BarCode != oldBarCode)
{
throw new Exception($"VDA标签 {VDA} 对应的内部条码号应为{oldBarCode}!");
}
}
var strID = dsVerifyBill.Tables[0].Rows[0]["ID"].ToString();
var strsql = "";
@ -107,11 +115,11 @@ namespace Stone.DataService.Biz.Bill
db.Exec_NonQuery(strsql);
//插入新记录
strsql = "Insert into t_VerifyBill(AsnNumber,PackageNo,PackageNo1,PackageNo2,PartNumber,Qty,BarCode,UserName)" +
" select AsnNumber,PackageNo,PackageNo1,PackageNo2,PartNumber,Qty,'" + BarCode + "'," +
"'" + UserName + "'" +
" from t_VerifyBill where ID = " + strID;
db.Exec_NonQuery(strsql);
// strsql = "Insert into t_VerifyBill(AsnNumber,PackageNo,PackageNo1,PackageNo2,PartNumber,Qty,BarCode,UserName)" +
// " select AsnNumber,PackageNo,PackageNo1,PackageNo2,PartNumber,Qty,'" + BarCode + "'," +
// "'" + UserName + "'" +
// " from t_VerifyBill where ID = " + strID;
// db.Exec_NonQuery(strsql);
db.Commit();
return Stone.DataService.Biz.BizPublic.MyDataSet.GetDataByString("OK");

1
Stone.WinForm/Stone.WinBiz/BasicData/F_Location.cs

@ -26,6 +26,7 @@ namespace Stone.WinBiz.BasicData
dgv.Columns["Address1"].HeaderText = "地址1";
dgv.Columns["Address2"].HeaderText = "地址2";
dgv.Columns["Address3"].HeaderText = "地址3";
dgv.Columns["LocCode"].HeaderText = "卸货点代码";
dgv.Columns["State"].HeaderText = "状态";
}

70
Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs

@ -8,6 +8,7 @@ using Stone.Entity;
using System.Data;
using System.Threading;
using System.Data.SqlClient;
using System.Linq;
namespace Stone.WinBiz.JISAdmin
@ -91,9 +92,10 @@ namespace Stone.WinBiz.JISAdmin
DateTime StartTime = DateTime.Now;
var partMsg = "";
if (file.Name.ToUpper().IndexOf("DEL") >= 0)
{
ProcessDataLab(text, fileType, file.Name); //解析LAB数据
ProcessDataLab(text, fileType, file.Name, out partMsg); //解析LAB数据
}
TimeSpan TimeOut = DateTime.Now - StartTime;
@ -111,7 +113,7 @@ namespace Stone.WinBiz.JISAdmin
drJIS_Log["EndTime"] = MyDateTime.GetServerDateTime();
drJIS_Log["ProcessState"] = "Success";
drJIS_Log["Memo"] = partMsg;
t_JIS_Log.Edit(drJIS_Log);
}
@ -142,7 +144,7 @@ namespace Stone.WinBiz.JISAdmin
private static void ProcessDataLab(string text, string fileType, string filename)
private static void ProcessDataLab(string text, string fileType, string filename,out string Msg)
{
Entity_t_JIS_Lab t_JIS_Lab = new Entity_t_JIS_Lab();
@ -170,6 +172,29 @@ namespace Stone.WinBiz.JISAdmin
string sql = "";
List<string> items = new List<string>();
//获取零件对应的版本号 add by jinh 20220419
//版本号在需求日期之后,目前是在需求日期处进行的数据插入
var lstPartRelease = new List<PartRelease>();
var partRelese = new PartRelease();
foreach (var line_text in sp_text)
{
if (line_text.Trim() == "") continue;
string[] sp_line = line_text.Split('+');
var partCode = "";
var release = "";
if (sp_line[0] == "ARD")
{
partRelese.PartCode = sp_line[1].Split(':')[0];
}
if (sp_line[0] == "ADI")
{
partRelese.Release = sp_line[1].Trim();
lstPartRelease.Add(partRelese);
partRelese = new PartRelease();
}
}
foreach (string line_text in sp_text)
{
if (line_text.Trim() == "") continue;
@ -182,7 +207,6 @@ namespace Stone.WinBiz.JISAdmin
sql = $"delete from t_JIS_Lab where [fileType]='{fileType}' and [partNumber]='{partNumber}'";
sqls.AppendLine(sql);
if (sqls.Length > 20000)
{
db.Exec_NonQuery(sqls.ToString());
@ -211,11 +235,11 @@ namespace Stone.WinBiz.JISAdmin
// releaseIdNew = releaseId.Replace("S", "").Replace("/", "").Replace("-", "").Replace(" ", "0");
//}
if (sp_line[0] == "PDI")
{
releaseId = sp_line[1].Trim();
}
// if (sp_line[0] == "PDI")
// if (sp_line[0] == "ADI")
// {
// releaseId = sp_line[1].Trim();
// }
if (sp_line[0] == "SAD")
{
@ -226,6 +250,8 @@ namespace Stone.WinBiz.JISAdmin
{
partNumber = sp_line[1].Split(':')[0];
orderNumber = sp_line[3];
//add by jinh 20220419 从list获取该零件的版本号
releaseId = lstPartRelease.FirstOrDefault(p => p.PartCode == partNumber).Release;
//校验零件号是否失效
var strsql = "";
@ -237,6 +263,10 @@ namespace Stone.WinBiz.JISAdmin
if (strState == "0" || string.IsNullOrEmpty(strState))
strPartMsg += "零件号 " + partNumber + " 已失效!" + Environment.NewLine;
}
else
{
strPartMsg += "零件号 " + partNumber + " 未定义!" + Environment.NewLine;
}
}
@ -249,13 +279,23 @@ namespace Stone.WinBiz.JISAdmin
//校验卸货点是否失效
var strsql = "";
strsql = "select top 1 * from t_Location where Code = '" + LocationCode + "' order by id desc";
strsql = "select top 1 * from t_Location where Code = '" + location + "' order by id desc";
var dsLoc = db.Exec_DataSet(strsql);
if (dsLoc.Tables[0].Rows.Count > 0)
{
var strState = dsLoc.Tables[0].Rows[0]["State"].ToString();
if (strState == "0" || string.IsNullOrEmpty(strState))
strPartMsg += "卸货点 " + partNumber + " 已失效!" + Environment.NewLine;
strPartMsg += "卸货点 " + location + " 已失效!" + Environment.NewLine;
}
//校验卸货点、卸货点代码是否匹配
strsql = "select top 1 * from t_Location" +
" where Code = '" + location + "'" +
" and LocCode = '" + LocationCode + "'" +
" order by id desc";
dsLoc = db.Exec_DataSet(strsql);
if (dsLoc.Tables[0].Rows.Count == 0)
{
strPartMsg += "卸货点 " + location + " 对应的代码 " + LocationCode + " 未在系统中定义效!" + Environment.NewLine;
}
}
@ -339,6 +379,8 @@ namespace Stone.WinBiz.JISAdmin
{
F_Mail.Send(strPartMsg);
}
Msg = strPartMsg;
}
@ -703,5 +745,11 @@ namespace Stone.WinBiz.JISAdmin
#endregion
public partial class PartRelease
{
public string PartCode { get; set;}
public string Release { get; set; }
}
}
}

13
Stone.WinForm/Stone.WinBiz/JISAdmin/F_JIS5000_Print.cs

@ -831,7 +831,9 @@ namespace Stone.WinBiz.JISAdmin
foreach (DataRow drData in dsData.Tables[0].Rows)
{
//ARD+9169691-03+24+L723190709++90000841838'
string line = "ARD+{0}+{1}+{2}:000000++{3}'\r\n";
//金杯李尔不换行
//string line = "ARD+{0}+{1}+{2}:000000++{3}'\r\n";
string line = "ARD+{0}+{1}+{2}:000000++{3}'";
object[] obj = new object[4];
obj[0] = drData["PartNumber"].ToString().Trim(); //零件号
obj[1] = drData["Qty"].ToString().Trim(); //数量
@ -1134,19 +1136,20 @@ namespace Stone.WinBiz.JISAdmin
private static List< string> WriteANSFile_Standard(string text, string fileType, string AsnNumber)
{
string filename = Application.StartupPath + "\\ASN_BAK\\";
string filename = Application.StartupPath + "\\ASN_OUT\\";
if (!Directory.Exists(filename))
{
Directory.CreateDirectory(filename);
}
filename += MyDateTime.Format(MyDateTimeType.Date);
// filename += MyDateTime.Format(MyDateTimeType.Date);
if (!Directory.Exists(filename))
{
Directory.CreateDirectory(filename);
}
string name = "BMW." + fileType + ".JIT.AVIEXP." + AsnNumber + ".txt";
//金杯李尔不要后缀名
// string name = "BMW." + fileType + ".JIT.AVIEXP." + AsnNumber + ".txt";
string name = "BMW." + fileType + ".JIT.AVIEXP." + AsnNumber + "";
filename = filename + "\\" + name;
StreamWriter sw = null;

2
Stone.WinForm/Stone.WinBiz/Standard/F_JIS_VDA_ASN.cs

@ -51,9 +51,9 @@ namespace Stone.WinBiz.Standard
dgv.Columns["IsPrintLabel"].HeaderText = "打印标签";
dgv.Columns["IsPackingVerification"].HeaderText = "装箱校验";
dgv.Columns["IsShipingVerification"].HeaderText = "发货校验";
dgv.Columns["IsPrintASN"].HeaderText = "打印ASN";
dgv.Columns["PrintASNTime"].HeaderText = "ASN打印时间";
dgv.Columns["IsShipingVerification"].HeaderText = "发货校验";
dgv.Columns["IsUpload"].HeaderText = "是否上传";
dgv.Columns["UploadTime"].HeaderText = "上传时间";

368
Stone.WinForm/Stone.WinForm/Report/ASN.grf

@ -9,13 +9,18 @@
Charset=134
End
Object Printer
LeftMargin=1
TopMargin=1
RightMargin=1
BottomMargin=1
LeftMargin=0.8
TopMargin=0.8
RightMargin=0
BottomMargin=0
End
Object DetailGrid
CenterView=T
ShowColLine=F
ShowRowLine=F
Object Border
Styles=[]
End
Object Recordset
Items Field
Item
@ -70,26 +75,50 @@ Object ColumnContent
Items ColumnContentCell
Item
Column='Column6'
Object Font
Name='Arial'
Weight=400
End
DataField='OrderNumber'
End
Item
Column='Column1'
Object Font
Name='Arial'
Weight=400
End
DataField='PackageNo'
End
Item
Column='Column2'
Object Font
Name='Arial'
Weight=400
End
DataField='PartNumber'
End
Item
Column='Column3'
Object Font
Name='Arial'
Weight=400
End
DataField='Description'
End
Item
Column='Column4'
Object Font
Name='Arial'
Weight=400
End
DataField='Qty'
End
Item
Column='Column5'
Object Font
Name='Arial'
Weight=400
End
DataField='Remark'
End
End
@ -100,31 +129,57 @@ Object ColumnTitle
Item
GroupTitle=F
Column='Column6'
Object Font
Name='Arial'
Bold=T
End
Text='Order'
End
Item
GroupTitle=F
Column='Column1'
Object Font
Name='Arial'
Bold=T
End
Text='Package Nr.'
End
Item
GroupTitle=F
Column='Column2'
Object Font
Name='Arial'
Bold=T
End
Text='Part'
End
Item
GroupTitle=F
Column='Column3'
Object Font
Name='Arial'
Bold=T
End
Text='Description'
End
Item
GroupTitle=F
Column='Column4'
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleCenter
Text='QTY'
End
Item
GroupTitle=F
Column='Column5'
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleCenter
Text='Remark'
End
End
@ -161,6 +216,9 @@ Items Parameter
Item
Name='Time'
End
Item
Name='SwetDate'
End
End
Items ReportHeader
Item
@ -175,10 +233,9 @@ Items ReportHeader
Width=2.40771
Height=0.79375
Object Font
Name='黑体'
Size=180000,0
Name='Arial'
Size=142500,0
Bold=T
Charset=134
End
TextAlign=MiddleCenter
Text='ASN'
@ -186,11 +243,16 @@ Items ReportHeader
Item
Type=MemoBox
Name='MemoBox1'
Left=2.80458
Top=4.7625
Left=4.20688
Top=4.445
Width=4.60375
Height=0.608542
Text='Date: [#Date#]'
Object Font
Name='Arial'
Size=82500,0
Weight=400
End
Text='[#Date#]'
End
Item
Type=MemoBox
@ -201,7 +263,7 @@ Items ReportHeader
Height=0.608542
Object Font
Name='宋体'
Size=150000,0
Size=120000,0
Bold=T
Charset=134
End
@ -214,16 +276,25 @@ Items ReportHeader
Top=0.767292
Width=1.53458
Height=0.608542
Object Font
Name='Arial'
Bold=T
End
Text='PLANT: '
End
Item
Type=MemoBox
Name='MemoBox5'
Left=1.19063
Top=3.4925
Width=6.21771
Left=4.20688
Top=3.28083
Width=5.79438
Height=0.608542
Text='Delivery Note: [#ASNNo_New#]'
Object Font
Name='Arial'
Size=82500,0
Weight=400
End
Text='[#ASNNo_New#]'
End
Item
Type=Barcode
@ -232,37 +303,56 @@ Items ReportHeader
Top=1.40229
Width=6.21771
Height=1.19063
BarcodeType=Code128Auto
BarcodeType=Code128A
CaptionPosition=Above
CaptionAlignment=Near
Text='[#ASNNo#]'
Object Font
Name='Arial'
Weight=400
End
End
Item
Type=MemoBox
Name='MemoBox16'
Left=1.19063
Top=4.1275
Width=6.21771
Left=1.00542
Top=3.83646
Width=2.80458
Height=0.608542
Text='Supplier Code: 12538410'
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleRight
Text='Supplier Code:'
End
Item
Type=MemoBox
Name='MemoBox17'
Left=1.21708
Top=6.0325
Width=6.29708
Left=1.03188
Top=5.66208
Width=2.77813
Height=0.608542
Text='Dispatch Date: [#DispatchDate#]'
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleRight
Text='Dispatch Date:'
End
Item
Type=MemoBox
Name='MemoBox18'
Left=1.21708
Top=6.6675
Width=6.16479
Left=4.20688
Top=6.27063
Width=4.60375
Height=0.608542
Text='Dispatch Time: [#DispatchTime#]'
Object Font
Name='Arial'
Size=82500,0
Weight=400
End
Text='[#DispatchTime#]'
End
Item
Type=MemoBox
@ -272,10 +362,8 @@ Items ReportHeader
Width=2.59292
Height=0.608542
Object Font
Name='宋体'
Size=157500,0
Name='Arial'
Bold=T
Charset=134
End
Text='[#PlantCode#]'
End
@ -283,14 +371,12 @@ Items ReportHeader
Type=StaticBox
Name='StaticBox2'
Left=11.1919
Top=3.54542
Top=2.67229
Width=5.00063
Height=0.582083
Object Font
Name='宋体'
Size=120000,0
Name='Arial'
Bold=T
Charset=134
End
Text='Delivery Address'
End
@ -298,64 +384,229 @@ Items ReportHeader
Type=StaticBox
Name='StaticBox6'
Left=11.1919
Top=6.35
Top=5.47688
Width=8.38729
Height=0.608542
Object Font
Name='宋体'
Size=82500,0
Weight=400
Charset=134
End
Text='沈阳市/Shenyang'
End
Item
Type=MemoBox
Name='MemoBox20'
Left=11.1919
Top=4.33917
Top=3.46604
Width=7.19667
Height=0.608542
Object Font
Name='宋体'
Size=82500,0
Weight=400
Charset=134
End
Text='[#Address1#]'
End
Item
Type=MemoBox
Name='MemoBox21'
Left=11.1919
Top=5.00063
Top=4.1275
Width=7.19667
Height=0.608542
Object Font
Name='宋体'
Size=82500,0
Weight=400
Charset=134
End
Text='[#Address2#]'
End
Item
Type=MemoBox
Name='MemoBox22'
Left=11.1919
Top=5.68854
Top=4.81542
Width=7.19667
Height=0.608542
Object Font
Name='宋体'
Size=82500,0
Weight=400
Charset=134
End
Text='[#Address3#]'
End
Item
Type=MemoBox
Name='MemoBox23'
Left=2.80458
Top=5.3975
Left=4.20688
Top=5.05354
Width=4.60375
Height=0.608542
Text='Time: [#Time#]'
Object Font
Name='Arial'
Size=82500,0
Weight=400
End
Text='[#Time#]'
End
Item
Type=MemoBox
Name='MemoBox24'
Left=1.95792
Top=7.3025
Width=6.29708
Left=1.56104
Top=6.87917
Width=2.24896
Height=0.608542
Text='SWET Date: '
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleRight
Text='SWET Date:'
End
Item
Type=MemoBox
Name='MemoBox25'
Left=1.95792
Top=7.9375
Width=6.16479
Left=1.42875
Top=7.48771
Width=2.38125
Height=0.608542
Text='SWET Time: '
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleRight
Text='SWET Time:'
End
Item
Type=StaticBox
Name='StaticBox15'
Left=1.00542
Top=3.36021
Width=2.80458
Height=0.47625
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleRight
Text='Delivery Note:'
End
Item
Type=StaticBox
Name='StaticBox16'
Left=4.20688
Top=3.83646
Width=2.59292
Height=0.582083
Object Font
Name='Arial'
Size=82500,0
Weight=400
End
Text='12538410'
End
Item
Type=MemoBox
Name='MemoBox26'
Left=1.19063
Top=4.445
Width=2.61938
Height=0.608542
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleRight
Text='Date:'
End
Item
Type=MemoBox
Name='MemoBox27'
Left=0.820208
Top=5.05354
Width=2.98979
Height=0.608542
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleRight
Text='Time:'
End
Item
Type=MemoBox
Name='MemoBox28'
Left=4.20688
Top=5.66208
Width=4.18042
Height=0.608542
Object Font
Name='Arial'
Size=82500,0
Weight=400
End
Text='[#DispatchDate#]'
End
Item
Type=MemoBox
Name='MemoBox29'
Left=0.820208
Top=6.27063
Width=2.98979
Height=0.608542
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleRight
Text='Dispatch Time:'
End
Item
Type=MemoBox
Name='MemoBox30'
Left=4.23333
Top=6.87917
Width=4.60375
Height=0.608542
Object Font
Name='Arial'
Size=82500,0
Weight=400
End
Text='[#{SwetDate}#]'
End
Item
Type=MemoBox
Name='MemoBox31'
Left=4.23333
Top=8.06979
Width=4.60375
Height=0.608542
Object Font
Name='Arial'
Size=82500,0
Weight=400
End
Text='沈阳市浑南区航天路12-1'
End
Item
Type=MemoBox
Name='MemoBox32'
Left=1.42875
Top=8.09625
Width=2.38125
Height=0.608542
Object Font
Name='Arial'
Bold=T
End
TextAlign=MiddleRight
Text='Dispatch Loc:'
End
End
End
@ -374,7 +625,7 @@ Items ReportFooter
Height=0.608542
Object Font
Name='宋体'
Size=90000,0
Size=82500,0
Weight=400
Charset=134
End
@ -389,7 +640,7 @@ Items ReportFooter
Height=0.608542
Object Font
Name='宋体'
Size=90000,0
Size=82500,0
Weight=400
Charset=134
End
@ -404,7 +655,7 @@ Items ReportFooter
Height=0.608542
Object Font
Name='宋体'
Size=90000,0
Size=82500,0
Weight=400
Charset=134
End
@ -440,7 +691,7 @@ Items ReportFooter
Height=0.608542
Object Font
Name='宋体'
Size=90000,0
Size=82500,0
Weight=400
Charset=134
End
@ -455,7 +706,7 @@ Items ReportFooter
Height=0.608542
Object Font
Name='宋体'
Size=90000,0
Size=82500,0
Weight=400
Charset=134
End
@ -470,7 +721,7 @@ Items ReportFooter
Height=0.608542
Object Font
Name='宋体'
Size=90000,0
Size=82500,0
Weight=400
Charset=134
End
@ -506,7 +757,7 @@ Items ReportFooter
Height=0.608542
Object Font
Name='宋体'
Size=90000,0
Size=82500,0
Weight=400
Charset=134
End
@ -521,13 +772,14 @@ Items ReportFooter
Height=0.608542
Object Font
Name='宋体'
Size=90000,0
Size=82500,0
Weight=400
Charset=134
End
Text='Date 日期:'
End
End
PrintAtBottom=T
End
End
End

312
Stone.WinForm/Stone.WinForm/Report/VDA.grf

@ -9,8 +9,10 @@
Charset=134
End
Object Printer
Size=256
Height=14.8
Size=11
Width=14.8
Height=21
Oriention=Landscape
LeftMargin=0
TopMargin=0
RightMargin=0
@ -131,8 +133,8 @@ Object ColumnContent
Width=3.01625
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(1) GOODS RECEIVER'
@ -140,7 +142,7 @@ Object ColumnContent
Item
Type=Line
Name='Line22'
Left=14.3933
Left=14.605
Top=0.396875
Height=3.41313
Object Pen
@ -210,9 +212,9 @@ Object ColumnContent
Item
Type=Line
Name='Line41'
Left=10.3981
Left=9.60438
Top=2.59292
Width=9.78961
Width=10.5833
Object Pen
Width=2
End
@ -222,7 +224,7 @@ Object ColumnContent
Name='Line42'
Left=0.79375
Top=2.59292
Width=9.63082
Width=8.81062
Object Pen
Width=2
End
@ -288,9 +290,9 @@ Object ColumnContent
Item
Type=Line
Name='Line48'
Left=11.5888
Left=9.60438
Top=8.38729
Width=8.59896
Width=10.5833
Object Pen
Width=2
End
@ -330,11 +332,12 @@ Object ColumnContent
Type=FieldBox
Name='FieldBox1'
Left=1.00542
Top=1.00542
Top=0.926042
Width=8.46667
Height=0.396875
Height=0.529167
Object Font
Name='宋体'
Size=90000,0
Bold=T
Charset=134
End
@ -344,11 +347,12 @@ Object ColumnContent
Type=FieldBox
Name='FieldBox2'
Left=1.00542
Top=1.50813
Top=1.45521
Width=8.46667
Height=0.396875
Height=0.529167
Object Font
Name='宋体'
Size=90000,0
Bold=T
Charset=134
End
@ -358,13 +362,13 @@ Object ColumnContent
Type=FieldBox
Name='FieldBox3'
Left=1.00542
Top=2.01083
Top=1.98438
Width=8.46667
Height=0.396875
Height=0.529167
Object Font
Name='宋体'
Size=90000,0
Bold=T
Charset=134
End
DataField='Address3'
End
@ -373,7 +377,7 @@ Object ColumnContent
Name='Line55'
Left=0.79375
Top=8.38729
Width=10.9273
Width=8.83708
Height=0.0264583
Object Pen
Width=2
@ -412,8 +416,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(2) FITMENT POINT-EPLOCATION'
@ -426,8 +430,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(21)VERIFICATION'
@ -440,8 +444,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(3) ASN NO(N)'
@ -454,8 +458,8 @@ Object ColumnContent
Width=4.41854
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(4) SUPPLIER ADDR.,NAME,CITY'
@ -463,13 +467,13 @@ Object ColumnContent
Item
Type=StaticBox
Name='StaticBox6'
Left=14.605
Top=2.80458
Left=14.7902
Top=2.69875
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(22)DISPATCH LOCATION'
@ -477,13 +481,13 @@ Object ColumnContent
Item
Type=StaticBox
Name='StaticBox7'
Left=9.78958
Top=3.99521
Left=9.76313
Top=3.96875
Width=2.40771
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(5) NET WEIGHT'
@ -491,13 +495,13 @@ Object ColumnContent
Item
Type=StaticBox
Name='StaticBox8'
Left=12.8058
Top=3.99521
Left=12.8852
Top=3.96875
Width=2.40771
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(6) GROSS WEIGHT'
@ -505,13 +509,13 @@ Object ColumnContent
Item
Type=StaticBox
Name='StaticBox9'
Left=15.6104
Top=3.99521
Left=15.4517
Top=3.91583
Width=2.40771
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(7) TARA WEIGHT'
@ -519,13 +523,13 @@ Object ColumnContent
Item
Type=StaticBox
Name='StaticBox10'
Left=15.7956
Top=5.00063
Left=15.9015
Top=4.92125
Width=2.40771
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(20) PLANT'
@ -538,8 +542,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(8) PART NUMBER(P)'
@ -547,13 +551,13 @@ Object ColumnContent
Item
Type=StaticBox
Name='StaticBox12'
Left=1.00542
Top=7.19667
Left=0.899583
Top=7.11729
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(10) QUANTITY(Q)'
@ -566,8 +570,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(12) DATE(D)'
@ -580,8 +584,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(14) BATCH-NO.(H)'
@ -594,8 +598,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(16) PACKAGE NO.(S)'
@ -608,8 +612,8 @@ Object ColumnContent
Width=2.40771
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(17) BIN TYPE'
@ -617,13 +621,13 @@ Object ColumnContent
Item
Type=StaticBox
Name='StaticBox17'
Left=9.78958
Top=7.19667
Left=9.65729
Top=7.06438
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(11) DESCRIPTION,DELIVER,SERVICE'
@ -636,8 +640,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(13) SUPPLIER PART-NO.(308)'
@ -650,8 +654,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(15) SUPPLIER NO.(V)'
@ -664,8 +668,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(18) CHANGE LEVEL COSTR.'
@ -678,8 +682,8 @@ Object ColumnContent
Width=3.78354
Height=0.396875
Object Font
Name='Arial'
Size=75000,0
Name='Calibri'
Size=60000,0
Weight=400
End
Text='(19) EXPIRY DATE (E)'
@ -691,25 +695,37 @@ Object ColumnContent
Top=1.19063
Width=3.59833
Height=0.608542
Object Font
Name='宋体'
Size=90000,0
Bold=T
Charset=134
End
Text='沈阳市/SHENYANG'
End
Item
Type=FieldBox
Name='FieldBox4'
Left=9.78958
Top=2.01083
Width=2.59292
Height=0.396875
Top=1.87854
Width=2.93688
Height=0.661458
Object Font
Name='Arial'
Size=157500,0
Bold=T
End
DataField='location'
End
Item
Type=Barcode
Name='Barcode5'
Left=15.0019
Top=1.79917
Width=3.81
Height=0.608542
BarcodeType=Code128Auto
Left=15.1342
Top=1.69333
Width=4.25979
Height=0.661458
PaddingLeft=2
BarcodeType=Code128A
Alignment=Near
CaptionPosition=None
Text='[#PackageNoNew#]'
@ -724,11 +740,12 @@ Object ColumnContent
Type=FieldBox
Name='FieldBox5'
Left=15.6104
Top=1.19063
Top=1.00542
Width=2.98979
Height=0.608542
Object Font
Name='Arial'
Size=127500,0
Bold=T
End
TextAlign=MiddleCenter
@ -739,9 +756,10 @@ Object ColumnContent
Name='Barcode6'
Left=1.19063
Top=3.81
Width=3.81
Width=4.41854
Height=0.79375
BarcodeType=Code128Auto
PaddingLeft=5
BarcodeType=Code128A
Alignment=Near
CaptionPosition=None
Text='[#AsnNumber#]'
@ -762,7 +780,7 @@ Object ColumnContent
Object Font
Name='Arial'
Size=142500,0
Weight=400
Bold=T
End
DataField='AsnNumber'
End
@ -773,6 +791,12 @@ Object ColumnContent
Top=4.20688
Width=1.00542
Height=0.555625
Object Font
Name='Calibri'
Size=60000,0
Weight=400
End
TextAlign=MiddleCenter
Text='---'
End
Item
@ -782,6 +806,12 @@ Object ColumnContent
Top=4.20688
Width=1.00542
Height=0.555625
Object Font
Name='Calibri'
Size=60000,0
Weight=400
End
TextAlign=MiddleCenter
Text='---'
End
Item
@ -792,11 +822,11 @@ Object ColumnContent
Width=1.00542
Height=0.529167
Object Font
Name='宋体'
Size=120000,0
Name='Calibri'
Size=60000,0
Bold=T
Charset=134
End
TextAlign=MiddleCenter
Text='---'
End
Item
@ -804,9 +834,10 @@ Object ColumnContent
Name='Barcode7'
Left=1.19063
Top=6.00604
Width=3.81
Width=4.60375
Height=0.79375
BarcodeType=Code128Auto
PaddingLeft=5
BarcodeType=Code128A
Alignment=Near
CaptionPosition=None
Text='[#PartNumber#]'
@ -826,8 +857,8 @@ Object ColumnContent
Height=0.608542
Object Font
Name='Arial'
Size=142500,0
Weight=400
Size=157500,0
Bold=T
End
DataField='PartNumber'
End
@ -840,8 +871,8 @@ Object ColumnContent
Height=1.00542
Object Font
Name='Arial'
Size=240000,0
Weight=400
Size=217500,0
Bold=T
End
DataField='fileType'
End
@ -849,13 +880,13 @@ Object ColumnContent
Type=FieldBox
Name='FieldBox10'
Left=9.78958
Top=7.64646
Top=7.59354
Width=10.2129
Height=0.582083
Object Font
Name='Arial'
Size=142500,0
Weight=400
Name='Calibri'
Size=127500,0
Bold=T
End
DataField='Description'
End
@ -867,24 +898,24 @@ Object ColumnContent
Width=9.60438
Height=0.582083
Object Font
Name='Arial'
Size=142500,0
Weight=400
Name='宋体'
Bold=T
End
DataField='PartNumber'
End
Item
Type=MemoBox
Name='MemoBox5'
Left=4.60375
Top=10.795
Left=4.20688
Top=10.3981
Width=2.40771
Height=0.79375
Object Font
Name='Arial'
Size=360000,0
Weight=400
Size=157500,0
Bold=T
End
TextAlign=MiddleCenter
Text='---'
End
Item
@ -897,19 +928,20 @@ Object ColumnContent
Object Font
Name='Arial'
Size=240000,0
Weight=400
Bold=T
End
Text='12538410'
End
Item
Type=FieldBox
Name='FieldBox13'
Left=10.0013
Top=11.5094
Left=9.78958
Top=11.4035
Width=2.59292
Height=0.396875
Object Font
Name='Arial'
Size=90000,0
Bold=T
End
DataField='AI'
@ -920,8 +952,9 @@ Object ColumnContent
Left=1.19063
Top=12.991
Width=3.81
Height=0.79375
BarcodeType=Code128Auto
Height=0.608542
PaddingLeft=5
BarcodeType=Code128A
Alignment=Near
CaptionPosition=None
Text='[#PackageNo#]'
@ -935,14 +968,14 @@ Object ColumnContent
Item
Type=FieldBox
Name='FieldBox14'
Left=1.19063
Top=12.409
Left=0.926042
Top=12.3825
Width=5.26521
Height=0.608542
Object Font
Name='Arial'
Size=142500,0
Weight=400
Bold=T
End
DataField='PackageNo'
End
@ -955,8 +988,8 @@ Object ColumnContent
Height=0.79375
Object Font
Name='Arial'
Size=360000,0
Weight=400
Size=240000,0
Bold=T
End
Text='---'
End
@ -968,23 +1001,23 @@ Object ColumnContent
Width=0.79375
Height=0.608542
Object Font
Name='Arial'
Size=82500,0
Bold=T
Name='Calibri'
Size=60000,0
Weight=400
End
Text='V1.1'
End
Item
Type=MemoBox
Name='MemoBox9'
Left=9.60438
Left=9.68375
Top=3.30729
Width=4.78896
Width=4.94771
Height=0.396875
Object Font
Name='宋体'
Size=82500,0
Weight=400
Size=90000,0
Bold=T
Charset=134
End
Text='沈阳金杯李尔汽车座椅有限公司'
@ -993,12 +1026,12 @@ Object ColumnContent
Type=MemoBox
Name='MemoBox10'
Left=14.7902
Top=3.20146
Top=3.12208
Width=5.00063
Height=0.608542
Object Font
Name='宋体'
Size=82500,0
Size=67500,0
Weight=400
Charset=134
End
@ -1013,24 +1046,43 @@ Object ColumnContent
Height=0.79375
Object Font
Name='Arial'
Size=262500,0
Weight=400
Size=240000,0
Bold=T
End
Text='[#LabelDate:dd.MM.yyyy#]'
End
Item
Type=MemoBox
Name='MemoBox12'
Left=1.19063
Top=7.59354
Width=7.96396
Left=0.926042
Top=7.51417
Width=4.28625
Height=0.79375
Object Font
Name='Arial'
Size=262500,0
Weight=400
Size=240000,0
Bold=T
End
Text='[#Qty#].000'
End
Item
Type=Barcode
Name='Barcode9'
Left=6.40292
Top=7.19667
Width=2.40771
Height=0.79375
PaddingLeft=5
BarcodeType=Code128A
Alignment=Near
CaptionPosition=None
Text='[#Qty#]'
Object Font
Name='微软雅黑'
Size=120000,0
Bold=T
Charset=134
End
End
End
End

4
Stone.WinForm/Stone.WinForm/Stone.WinForm.csproj

@ -113,10 +113,10 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<None Include="Report\ASN.grf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Report\VDA.grf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="装配看板.bat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

1
Stone.WinForm/Stone.WinModule/BasicData/frmLocation.cs

@ -23,6 +23,7 @@ namespace Stone.WinModule.BasicData
strWhere += " or [Address1] like '%" + code + "%'";
strWhere += " or [Address2] like '%" + code + "%'";
strWhere += " or [Address3] like '%" + code + "%'";
strWhere += " or [LocCode] like '%" + code + "%'";
}
}
}

65
Stone.WinForm/Stone.WinModule/BasicData/frmLocationDetail.Designer.cs

@ -39,27 +39,29 @@
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.cbState = new System.Windows.Forms.CheckBox();
this.txtLocCode = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// btnAddNewLine
//
this.btnAddNewLine.Location = new System.Drawing.Point(62, 293);
this.btnAddNewLine.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.btnAddNewLine.Location = new System.Drawing.Point(62, 320);
this.btnAddNewLine.Margin = new System.Windows.Forms.Padding(6);
//
// btnClose
//
this.btnClose.Location = new System.Drawing.Point(381, 293);
this.btnClose.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.btnClose.Location = new System.Drawing.Point(381, 320);
this.btnClose.Margin = new System.Windows.Forms.Padding(6);
//
// btnOK
//
this.btnOK.Location = new System.Drawing.Point(250, 293);
this.btnOK.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.btnOK.Location = new System.Drawing.Point(250, 320);
this.btnOK.Margin = new System.Windows.Forms.Padding(6);
//
// txtAddress2
//
this.txtAddress2.Location = new System.Drawing.Point(170, 162);
this.txtAddress2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtAddress2.Location = new System.Drawing.Point(170, 153);
this.txtAddress2.Margin = new System.Windows.Forms.Padding(4);
this.txtAddress2.MaxLength = 200;
this.txtAddress2.Name = "txtAddress2";
this.txtAddress2.Size = new System.Drawing.Size(331, 28);
@ -68,7 +70,7 @@
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(86, 165);
this.label3.Location = new System.Drawing.Point(86, 156);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(71, 18);
@ -77,8 +79,8 @@
//
// txtAddress1
//
this.txtAddress1.Location = new System.Drawing.Point(170, 111);
this.txtAddress1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtAddress1.Location = new System.Drawing.Point(170, 105);
this.txtAddress1.Margin = new System.Windows.Forms.Padding(4);
this.txtAddress1.MaxLength = 100;
this.txtAddress1.Name = "txtAddress1";
this.txtAddress1.Size = new System.Drawing.Size(331, 28);
@ -87,7 +89,7 @@
// txtCode
//
this.txtCode.Location = new System.Drawing.Point(170, 60);
this.txtCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtCode.Margin = new System.Windows.Forms.Padding(4);
this.txtCode.MaxLength = 10;
this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(331, 28);
@ -96,7 +98,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(86, 116);
this.label2.Location = new System.Drawing.Point(86, 110);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(71, 18);
@ -115,8 +117,8 @@
//
// txtAddress3
//
this.txtAddress3.Location = new System.Drawing.Point(170, 213);
this.txtAddress3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtAddress3.Location = new System.Drawing.Point(170, 200);
this.txtAddress3.Margin = new System.Windows.Forms.Padding(4);
this.txtAddress3.MaxLength = 200;
this.txtAddress3.Name = "txtAddress3";
this.txtAddress3.Size = new System.Drawing.Size(331, 28);
@ -125,7 +127,7 @@
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(86, 214);
this.label4.Location = new System.Drawing.Point(86, 201);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(71, 18);
@ -135,7 +137,7 @@
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(88, 256);
this.label5.Location = new System.Drawing.Point(88, 283);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(62, 18);
@ -147,17 +149,38 @@
this.cbState.AutoSize = true;
this.cbState.Checked = true;
this.cbState.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbState.Location = new System.Drawing.Point(170, 255);
this.cbState.Location = new System.Drawing.Point(170, 282);
this.cbState.Name = "cbState";
this.cbState.Size = new System.Drawing.Size(70, 22);
this.cbState.TabIndex = 116;
this.cbState.Text = "启用";
this.cbState.UseVisualStyleBackColor = true;
//
// txtLocCode
//
this.txtLocCode.Location = new System.Drawing.Point(172, 246);
this.txtLocCode.Margin = new System.Windows.Forms.Padding(4);
this.txtLocCode.MaxLength = 200;
this.txtLocCode.Name = "txtLocCode";
this.txtLocCode.Size = new System.Drawing.Size(331, 28);
this.txtLocCode.TabIndex = 117;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(41, 247);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(116, 18);
this.label6.TabIndex = 118;
this.label6.Text = "卸货点代码:";
//
// frmLocationDetail
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.ClientSize = new System.Drawing.Size(572, 416);
this.Controls.Add(this.txtLocCode);
this.Controls.Add(this.label6);
this.Controls.Add(this.cbState);
this.Controls.Add(this.label5);
this.Controls.Add(this.txtAddress3);
@ -168,7 +191,7 @@
this.Controls.Add(this.txtCode);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.Margin = new System.Windows.Forms.Padding(6);
this.Name = "frmLocationDetail";
this.Load += new System.EventHandler(this.frmColorDetail_Load);
this.Controls.SetChildIndex(this.btnOK, 0);
@ -184,6 +207,8 @@
this.Controls.SetChildIndex(this.txtAddress3, 0);
this.Controls.SetChildIndex(this.label5, 0);
this.Controls.SetChildIndex(this.cbState, 0);
this.Controls.SetChildIndex(this.label6, 0);
this.Controls.SetChildIndex(this.txtLocCode, 0);
this.ResumeLayout(false);
this.PerformLayout();
@ -202,5 +227,7 @@
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.CheckBox cbState;
private System.Windows.Forms.TextBox txtLocCode;
private System.Windows.Forms.Label label6;
}
}

4
Stone.WinForm/Stone.WinModule/BasicData/frmLocationDetail.cs

@ -33,6 +33,7 @@ namespace Stone.WinModule.BasicData
drData["Address1"] = MyStrings.GetString(this.txtAddress1.Text.Trim());
drData["Address2"] = MyStrings.GetString(this.txtAddress2.Text.Trim());
drData["Address3"] = MyStrings.GetString(this.txtAddress3.Text.Trim());
drData["LocCode"] = MyStrings.GetString(this.txtLocCode.Text.Trim());
if (cbState.Checked)
{
drData["State"] = "1";
@ -56,7 +57,7 @@ namespace Stone.WinModule.BasicData
this.txtAddress1.Text = drData["Address1"].ToString();
this.txtAddress2.Text = drData["Address2"].ToString();
this.txtAddress3.Text = drData["Address3"].ToString();
this.txtLocCode.Text = drData["LocCode"].ToString();
var strState = drData["State"].ToString();
if (strState == "1")
{
@ -78,6 +79,7 @@ namespace Stone.WinModule.BasicData
this.txtAddress1.Text = "";
this.txtAddress2.Text = "";
this.txtAddress3.Text = "";
this.txtLocCode.Text = "";
cbState.Checked = true;
this.txtCode.Focus();

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

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using Stone.Common;
@ -10,6 +11,8 @@ using Stone.Entity;
using Stone.WinModule.JISData;
using Stone.WinBiz.Standard;
using Gm_WMS.DataAccess.DataService;
using iTextSharp.text.pdf;
using iTextSharp.text.pdf.parser;
namespace Stone.WinModule.Standard
{
@ -69,6 +72,24 @@ namespace Stone.WinModule.Standard
btnPrint.Click += new EventHandler(btnPrint_Click);
this.toolStrip1.Items.Insert(0, btnPrint);
ToolStripButton btnAddVDAPrint = new ToolStripButton("增加VDA");
btnAddVDAPrint.Image = this.imageList1.Images[0];
btnAddVDAPrint.TextImageRelation = TextImageRelation.ImageAboveText;
btnAddVDAPrint.Click += new EventHandler(btnAddVDAPrint_Click);
this.toolStrip1.Items.Insert(1, btnAddVDAPrint);
ToolStripButton btnImportPDFVDA = new ToolStripButton("VDA导入-已校验");
btnImportPDFVDA.Image = this.imageList1.Images[1];
btnImportPDFVDA.TextImageRelation = TextImageRelation.ImageAboveText;
btnImportPDFVDA.Click += new EventHandler(btnImportVDA_Click);
this.toolStrip1.Items.Insert(1, btnImportPDFVDA);
ToolStripButton btnImportPDFVDA2 = new ToolStripButton("VDA导入-未校验");
btnImportPDFVDA2.Image = this.imageList1.Images[1];
btnImportPDFVDA2.TextImageRelation = TextImageRelation.ImageAboveText;
btnImportPDFVDA2.Click += new EventHandler(btnImportVDA2_Click);
this.toolStrip1.Items.Insert(1, btnImportPDFVDA2);
}
private void timer1_Tick(object sender, EventArgs e)
@ -97,8 +118,8 @@ namespace Stone.WinModule.Standard
}
#region old bak 2022-03-16
/*
private void btnPrint_Click(object sender, EventArgs e)
private void btnAddVDAPrint_Click(object sender, EventArgs e)
{
LastAutoCheck = this.chkAuto.Checked;
@ -181,7 +202,7 @@ namespace Stone.WinModule.Standard
this.chkAuto.Checked = LastAutoCheck;
}
}
*/
#endregion
private bool LastAutoCheck = true;
@ -299,6 +320,11 @@ namespace Stone.WinModule.Standard
string PackageNos = "";
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();
if (Location == "") throw new Exception("卸货点不能为空");
#region 取ASN号
@ -327,12 +353,8 @@ namespace Stone.WinModule.Standard
throw new Exception("ASN编号 必需13长");
}
#endregion
foreach (DataRow drData in dtData.Rows)
{
string Location = drData["Location"].ToString();
if (Location == "") throw new Exception("卸货点不能为空");
#endregion
int PageQty = 0; //整箱数量
int Odd = 0; //零头数量
@ -387,7 +409,8 @@ namespace Stone.WinModule.Standard
}
MyMessageBox.ShowInfoMessage($"ASN编号:{AsnNumber}\r\n装箱单号:{PackageNos} 生成完成!");
//MyMessageBox.ShowInfoMessage($"ASN编号:{AsnNumber}\r\n装箱单号:{PackageNos} 生成完成!");
MyMessageBox.ShowInfoMessage($"装箱单号:{PackageNos} 生成完成!");
db.Commit();
}
@ -427,5 +450,198 @@ namespace Stone.WinModule.Standard
{
}
private void btnImportVDA_Click(object sender, EventArgs e)
{
LastAutoCheck = this.chkAuto.Checked;
this.chkAuto.Checked = false;
this.chkAuto.Update();
try
{
LocalDBService db = null;
db = new LocalDBService();
db.BeginTrans();
OpenFileDialog dialog = new OpenFileDialog();
dialog.Filter = "PDF文件(*.PDF)|*.PDF|所有文件|*.*";
dialog.ValidateNames = true;
dialog.CheckPathExists = true;
dialog.CheckFileExists = true;
var dr = dialog.ShowDialog();
if (dr != DialogResult.OK) return;
string strFileName = dialog.FileName;
PdfReader pdfReader = new PdfReader(strFileName);
int numberOfPages = pdfReader.NumberOfPages;
//读取PDF文件 生成ASN信息 和VDA信息
Entity_t_JIS_VDA t_JIS_VDA = new Entity_t_JIS_VDA(db);
string fileType = ((F_JIS_VDA)m_Base).fileType;
string LabelDate = MyDateTime.GetServerDateTime().ToString("yyyy-MM-dd HH:mm");
string Date = MyDateTime.GetServerDateTime().ToString("yyyy-MM-dd");
var packageNo = "";
var asnNum = "";
var partNumber = "";
var qty = "";
var location = "";
var orderNumber = "";
var locationCode = "";
for (int i = 1; i <= numberOfPages; ++i)
{
//获取PDF文件的文本内容
var strPage = PdfTextExtractor.GetTextFromPage(pdfReader, i);
var lstStr = strPage.Split(new[] { "\n" }, StringSplitOptions.None).ToList();
if ((i & 1) == 1)
{
packageNo = lstStr[32].Split(new[] {"\n", " "}, StringSplitOptions.None)[0];
asnNum = lstStr[10].Split(new[] { "\n", " " }, StringSplitOptions.None)[0];
partNumber = lstStr[16].Split(new[] { "\n", " " }, StringSplitOptions.None)[0];
qty = lstStr[23].Split(new[] { "\n", " " }, StringSplitOptions.None)[0].Split('.')[0];
var lstLoc = lstStr[27].Split(new[] {"\n", " "}, StringSplitOptions.None);
if (lstLoc.Length < 2)
{
throw new Exception("PDF文件中Location解析失败!");
}
//todo location 的取值需要确定
location = lstStr[4].Split(new[] { "\n", " " }, StringSplitOptions.None)[0];
//todo orderNumber 的取值需要确定
orderNumber = "";
//todo locationCode 的取值需要确定
locationCode = lstStr[4].Split(new[] { "\n", " " }, StringSplitOptions.None)[0];
// .Replace("SNP工厂", string.Empty);
DataRow drVDA = t_JIS_VDA.Table.NewRow();
drVDA["fileType"] = fileType;
drVDA["LabelDate"] = LabelDate;
drVDA["Date"] = Date;
drVDA["PackageNo"] = packageNo;
drVDA["AsnNumber"] = asnNum;
drVDA["PartNumber"] = partNumber;
drVDA["Qty"] = qty;
drVDA["location"] = location;
drVDA["OrderNumber"] = orderNumber;
drVDA["LocationCode"] = locationCode;
drVDA["releaseId"] = "";
drVDA["IsPrintLabel"] = 1;
drVDA["IsPackingVerification"] = 1;
drVDA["IsShipingVerification"] = 1;
drVDA["IsPrintASN"] = 1;
drVDA["IsUpload"] = 1;
drVDA["UploadTime"] = DateTime.Now;
drVDA["PrintASNTime"] = DateTime.Now;
t_JIS_VDA.Add(drVDA);
}
}
pdfReader.Close();
MyMessageBox.ShowInfoMessage($"VDA导入完成!");
db.Commit();
}
catch (Exception ex)
{
MyMessageBox.ShowErrorMessage(ex.Message);
}
finally
{
this.chkAuto.Checked = LastAutoCheck;
}
}
private void btnImportVDA2_Click(object sender, EventArgs e)
{
LastAutoCheck = this.chkAuto.Checked;
this.chkAuto.Checked = false;
this.chkAuto.Update();
try
{
LocalDBService db = null;
db = new LocalDBService();
db.BeginTrans();
OpenFileDialog dialog = new OpenFileDialog();
dialog.Filter = "PDF文件(*.PDF)|*.PDF|所有文件|*.*";
dialog.ValidateNames = true;
dialog.CheckPathExists = true;
dialog.CheckFileExists = true;
var dr = dialog.ShowDialog();
if (dr != DialogResult.OK) return;
string strFileName = dialog.FileName;
PdfReader pdfReader = new PdfReader(strFileName);
int numberOfPages = pdfReader.NumberOfPages;
//读取PDF文件 生成ASN信息 和VDA信息
Entity_t_JIS_VDA t_JIS_VDA = new Entity_t_JIS_VDA(db);
string fileType = ((F_JIS_VDA)m_Base).fileType;
string LabelDate = MyDateTime.GetServerDateTime().ToString("yyyy-MM-dd HH:mm");
string Date = MyDateTime.GetServerDateTime().ToString("yyyy-MM-dd");
var packageNo = "";
var asnNum = "";
var partNumber = "";
var qty = "";
var location = "";
var orderNumber = "";
var locationCode = "";
for (int i = 1; i <= numberOfPages; ++i)
{
//获取PDF文件的文本内容
var strPage = PdfTextExtractor.GetTextFromPage(pdfReader, i);
var lstStr = strPage.Split(new[] { "\n" }, StringSplitOptions.None).ToList();
if ((i & 1) == 1)
{
packageNo = lstStr[32].Split(new[] { "\n", " " }, StringSplitOptions.None)[0];
asnNum = lstStr[10].Split(new[] { "\n", " " }, StringSplitOptions.None)[0];
partNumber = lstStr[16].Split(new[] { "\n", " " }, StringSplitOptions.None)[0];
qty = lstStr[23].Split(new[] { "\n", " " }, StringSplitOptions.None)[0].Split('.')[0];
var lstLoc = lstStr[27].Split(new[] { "\n", " " }, StringSplitOptions.None);
if (lstLoc.Length < 2)
{
throw new Exception("PDF文件中Location解析失败!");
}
//todo location 的取值需要确定
location = lstStr[4].Split(new[] { "\n", " " }, StringSplitOptions.None)[0];
//todo orderNumber 的取值需要确定
orderNumber = "";
//todo locationCode 的取值需要确定
locationCode = lstStr[4].Split(new[] { "\n", " " }, StringSplitOptions.None)[0];
// .Replace("SNP工厂", string.Empty);
DataRow drVDA = t_JIS_VDA.Table.NewRow();
drVDA["fileType"] = fileType;
drVDA["LabelDate"] = LabelDate;
drVDA["Date"] = Date;
drVDA["PackageNo"] = packageNo;
drVDA["AsnNumber"] = asnNum;
drVDA["PartNumber"] = partNumber;
drVDA["Qty"] = qty;
drVDA["location"] = location;
drVDA["OrderNumber"] = orderNumber;
drVDA["LocationCode"] = locationCode;
drVDA["releaseId"] = "";
// drVDA["IsPrintLabel"] = 1;
// drVDA["IsPackingVerification"] = 1;
// drVDA["IsShipingVerification"] = 1;
// drVDA["IsPrintASN"] = 1;
// drVDA["IsUpload"] = 1;
// drVDA["UploadTime"] = DateTime.Now;
// drVDA["PrintASNTime"] = DateTime.Now;
t_JIS_VDA.Add(drVDA);
}
}
pdfReader.Close();
MyMessageBox.ShowInfoMessage($"VDA导入完成!");
db.Commit();
}
catch (Exception ex)
{
MyMessageBox.ShowErrorMessage(ex.Message);
}
finally
{
this.chkAuto.Checked = LastAutoCheck;
}
}
}
}

17
Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs

@ -421,8 +421,12 @@ namespace Stone.WinModule.Standard
if (dtData.Rows[0]["IsPrintASN"].ToString() == "1")
throw new Exception($"{AsnNumber}已经完成,不能生成PREDN");
var frmPickUpDate = new frmPickUpDate();
frmPickUpDate.dtSwetDate = Convert.ToDateTime(dtData.Rows[0]["Date"]);
frmPickUpDate.ShowDialog();
frmPickUpDate.Dispose();
frmPREDN frm = new frmPREDN();
frm.dtPickUpTime = frmPickUpDate.dtPickUp;
frm.dtData = dtData;
frm.ShowDialog();
frm.Dispose();
@ -506,10 +510,10 @@ namespace Stone.WinModule.Standard
if (dsData.Tables[0].Select("[IsPrintASN]=True").Length == dsData.Tables[0].Rows.Count)
throw new Exception(AsnNumber + " 已经打印过了");
if (dsData.Tables[0].Select("[IsShipingVerification]=False").Length > 0)
{
throw new Exception(AsnNumber + " 有数据做发货校验");
}
// if (dsData.Tables[0].Select("[IsShipingVerification]=False").Length > 0)
// {
// throw new Exception(AsnNumber + " 有数据做发货校验");
// }
DateTime PrintASNTime = t_JIS_VDA.GetDateTime();
for (int i = 0; i < dsData.Tables[0].Rows.Count; i++)
@ -564,6 +568,8 @@ namespace Stone.WinModule.Standard
dtHead.Columns.Add("Address1");
dtHead.Columns.Add("Address2");
dtHead.Columns.Add("Address3");
dtHead.Columns.Add("SwetDate");
dtHead.Columns.Add("SwetTime");
DataRow drHead = dtHead.NewRow();
drHead["ASNNo"] = dsData.Tables[0].Rows[0]["AsnNumber"].ToString();
@ -582,6 +588,7 @@ namespace Stone.WinModule.Standard
drHead["Address2"] = dtLocation.Rows[0]["Address2"].ToString();
drHead["Address3"] = dtLocation.Rows[0]["Address3"].ToString();
}
drHead["SwetDate"] = Convert.ToDateTime(dsData.Tables[0].Rows[0]["Date"]).ToString("dd.MM.yyyy");
dtHead.Rows.Add(drHead);

7
Stone.WinForm/Stone.WinModule/Standard/frmPREDN.cs

@ -16,6 +16,7 @@ namespace Stone.WinModule.Standard
private DataSet dsExport = new DataSet();
private DataTable dtExport = new DataTable();
public DateTime dtPickUpTime;
public frmPREDN()
{
InitializeComponent();
@ -55,8 +56,10 @@ namespace Stone.WinModule.Standard
drNew["ASN Number"] = drData["ASNNumber"].ToString();
drNew["Kolli No."] = drData["PackageNo"].ToString();
drNew["Plant Code"] = drData["fileType"].ToString();
drNew["Required Pick-up Date"] = Convert.ToDateTime(drData["Date"]).AddDays(-1).ToString("yyyy-MM-dd");
drNew["Required Pick-up Time"] = "23:59:59";
// drNew["Required Pick-up Date"] = Convert.ToDateTime(drData["Date"]).AddDays(-1).ToString("yyyy-MM-dd");
// drNew["Required Pick-up Time"] = "23:59:59";
drNew["Required Pick-up Date"] = dtPickUpTime.Date.ToString("yyyy-MM-dd");
drNew["Required Pick-up Time"] = dtPickUpTime.Hour.ToString("00") + ":" + dtPickUpTime.Minute.ToString("00");
drNew["Required Swet Date"] = Convert.ToDateTime(drData["Date"]).ToString("yyyy-MM-dd");
drNew["Required Swet Time"] = "23:59:59";
drNew["Material Number"] = drData["PartNumber"].ToString();

91
Stone.WinForm/Stone.WinModule/Standard/frmPickUpDate.Designer.cs

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

47
Stone.WinForm/Stone.WinModule/Standard/frmPickUpDate.cs

@ -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();
}
}
}

120
Stone.WinForm/Stone.WinModule/Standard/frmPickUpDate.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>

12
Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj

@ -64,6 +64,9 @@
<HintPath>..\Stone.Common.Dlls\Interop.grproLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="itextsharp">
<HintPath>..\Stone.WinForm\bin\Debug\itextsharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>True</EmbedInteropTypes>
@ -350,6 +353,12 @@
<Compile Include="Standard\frmMessageQuestion.Designer.cs">
<DependentUpon>frmMessageQuestion.cs</DependentUpon>
</Compile>
<Compile Include="Standard\frmPickUpDate.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Standard\frmPickUpDate.Designer.cs">
<DependentUpon>frmPickUpDate.cs</DependentUpon>
</Compile>
<Compile Include="Standard\frmPasswordVerify.cs">
<SubType>Form</SubType>
</Compile>
@ -717,6 +726,9 @@
<EmbeddedResource Include="Standard\frmMessageQuestion.resx">
<DependentUpon>frmMessageQuestion.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Standard\frmPickUpDate.resx">
<DependentUpon>frmPickUpDate.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Standard\frmPasswordVerify.resx">
<DependentUpon>frmPasswordVerify.cs</DependentUpon>
</EmbeddedResource>

8
Stone.WinForm/Stone.WinService/Stone.WinForm.xml

@ -2,7 +2,7 @@
<NewDataSet>
<AppConfig>
<Name>LocalDB</Name>
<Value>DATA SOURCE=127.0.0.1:12017;USER ID = sa;PASSWORD = sa;INITIAL CATALOG = STD</Value>
<Value>DATA SOURCE=127.0.0.1;USER ID = sa;PASSWORD = Microsoft2008;INITIAL CATALOG = STD</Value>
</AppConfig>
<AppConfig>
<Name>解析刷新时间(秒)</Name>
@ -10,15 +10,15 @@
</AppConfig>
<AppConfig>
<Name>接收路径</Name>
<Value>D:\work\2022Project\沈阳金杯李尔STD系统\Data\Receive</Value>
<Value>D:\工作项目\沈阳金杯李尔\STDCode\jbLear-STD\Data\Receive</Value>
</AppConfig>
<AppConfig>
<Name>错误路径</Name>
<Value>D:\work\2022Project\沈阳金杯李尔STD系统\Data\Error</Value>
<Value>D:\工作项目\沈阳金杯李尔\STDCode\jbLear-STD\Data\Error</Value>
</AppConfig>
<AppConfig>
<Name>备份路径</Name>
<Value>D:\work\2022Project\沈阳金杯李尔STD系统\Data\Bak</Value>
<Value>D:\工作项目\沈阳金杯李尔\STDCode\jbLear-STD\Data\Bak</Value>
</AppConfig>
<AppConfig>
<Name>MailServer</Name>

38
Stone.WinForm/Stone.WinService/Stone.WinService.csproj

@ -13,6 +13,22 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>D:\工作项目\沈阳金杯李尔\WebSite\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@ -33,6 +49,18 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>5F4DC08A1D30281FD3FD763931A4297DB5B74EEB</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>Stone.WinService_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="Gm_WMS.DataAccess.DataService">
<HintPath>..\Stone.Common.Dlls\Gm_WMS.DataAccess.DataService.dll</HintPath>
@ -90,10 +118,11 @@
<None Include="Stone.WinService.Install.exe.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Stone.WinService_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<Content Include="Stone.WinForm.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType>
</Content>
<Content Include="Stone.WinService.Install.exe">
@ -106,6 +135,13 @@
<Name>Stone.WinBiz</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

Loading…
Cancel
Save