From f37d405e2f52828f337ab17b5209b5708dc4e261 Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Thu, 20 Mar 2025 16:32:15 +0800 Subject: [PATCH] 1 --- AddMaterial/App_Code/Function.cs | 24 +- AddMaterial/Handler.ashx | 36 +- AddMaterial/PaintView.html | 10 +- AddMaterial/PlanScreen.html | 4 +- AddMaterial/StyleSheet.css | 20 +- BBMPT.sln | 56 +- FiveScreen/FrmCenter.Designer.cs | 29 +- MESClassLibrary/BLL/Mistake243/RecordBLL.cs | 40 + MESClassLibrary/BLL/Mistake247/BoxBLL.cs | 173 +++- MESClassLibrary/BLL/Mistake247/Plan247BLL.cs | 7 +- MESClassLibrary/BLL/Mistake247/RecordBLL.cs | 109 +++ .../DAL/Mistake243/Assembly243DAL.cs | 2 +- MESClassLibrary/DAL/Mistake243/RecordDAL.cs | 54 ++ MESClassLibrary/DAL/Mistake247/AssemblyDAL.cs | 3 +- MESClassLibrary/DAL/Mistake247/BoxDAL.cs | 216 ++++- MESClassLibrary/DAL/Mistake247/RecordDAL.cs | 119 ++- MESWebSite/MESWebSite.csproj | 3 + MESWebSite/Manage/Index.aspx | 4 +- MESWebSite/images/北汽模塑.gif | Bin 0 -> 560211 bytes .../Manage/PaintingResultScreen2.html | 8 +- .../Manage/PaintingScreenPaoGuang.html | 2 +- PaintingView/Form1.Designer.cs | 148 +-- PaintingView/Form1.cs | 4 +- PunchAndWeld/FrmProScreen_WheelBrow_New.cs | 7 +- PunchAndWeld/Program.cs | 3 +- PunchAndWeld/bin/Debug/aa.grf | 7 +- PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs | 4 +- PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs | 4 +- .../PunchAndWeld/FrmDoorSill_214_2.cs | 4 +- PunchAssemble/PunchAndWeld/FrmHybridS.cs | 4 +- PunchAssemble/PunchAndWeld/FrmProScreen.cs | 4 +- .../PunchAndWeld/FrmProScreenBumper.cs | 3 + PunchAssemble/PunchAndWeld/FrmProScreenS.cs | 17 +- .../PunchAndWeld/FrmProScreen_WheelBrow.cs | 5 +- PunchAssemble/PunchAndWeld/Program.cs | 14 +- .../PunchAndWeld/Properties/AssemblyInfo.cs | 4 +- PurchingMistakeNew/Form1.cs | 448 +++------ PurchingMistakeNew/Form3.cs | 880 ++++++++++++------ PurchingMistakeNew/Form4.cs | 189 +++- PurchingMistakeNew/Form5.cs | 402 +++++--- PurchingMistakeNew/Form6.cs | 122 ++- PurchingMistakeNew/Form7.cs | 45 +- PurchingMistakeNew/Form8.cs | 296 ++++-- PurchingMistakeNew/Form9.cs | 180 +++- PurchingMistakeNew/FrmCheck243.cs | 302 ++++-- PurchingMistakeNew/FrmProduct_243.cs | 147 ++- PurchingMistakeNew/Program.cs | 28 +- PurchingMistakeNew/PurchingMistakeNew.csproj | 30 +- PurchingMistakeNew/Report/22.grf | Bin 728 -> 0 bytes .../Report/X247 右侧前门板.grf | 223 ----- .../Report/X247 右侧前门板装箱单.grf | 221 ----- .../Report/X247 右侧后门板.grf | 222 ----- .../Report/X247 右侧后门板装箱单.grf | 225 ----- .../Report/X247 左侧前门板.grf | 225 ----- .../Report/X247 左侧前门板装箱单.grf | 241 ----- .../Report/X247 左侧后门板.grf | 225 ----- .../Report/X247 左侧后门板装箱单.grf | 241 ----- .../Report/X247右侧前门板1.grf | 223 ----- .../Report/X247右侧前门板装箱单.grf | 221 ----- .../Report/X247右侧后门板1.grf | 222 ----- .../Report/X247右侧后门板装箱单.grf | 225 ----- .../Report/X247后部中间扰流板.grf | 268 ------ .../Report/X247后部扰流板装箱单.grf | 184 ---- .../Report/X247左侧前门板1.grf | 225 ----- .../Report/X247左侧前门板装箱单.grf | 241 ----- .../Report/X247左侧后门板1.grf | 225 ----- .../Report/X247左侧后门板装箱单.grf | 241 ----- PurchingMistakeNew/Report/X247装箱单.grf | 254 ----- PurchingMistakeNew/Report/X247门板.grf | 224 ----- PurchingMistakeNew/ReportHelper.cs | 75 ++ WebService/WMSWebService.asmx.cs | 1 + 71 files changed, 3064 insertions(+), 5808 deletions(-) create mode 100644 MESWebSite/images/北汽模塑.gif delete mode 100644 PurchingMistakeNew/Report/22.grf delete mode 100644 PurchingMistakeNew/Report/X247 右侧前门板.grf delete mode 100644 PurchingMistakeNew/Report/X247 右侧前门板装箱单.grf delete mode 100644 PurchingMistakeNew/Report/X247 右侧后门板.grf delete mode 100644 PurchingMistakeNew/Report/X247 右侧后门板装箱单.grf delete mode 100644 PurchingMistakeNew/Report/X247 左侧前门板.grf delete mode 100644 PurchingMistakeNew/Report/X247 左侧前门板装箱单.grf delete mode 100644 PurchingMistakeNew/Report/X247 左侧后门板.grf delete mode 100644 PurchingMistakeNew/Report/X247 左侧后门板装箱单.grf delete mode 100644 PurchingMistakeNew/Report/X247右侧前门板1.grf delete mode 100644 PurchingMistakeNew/Report/X247右侧前门板装箱单.grf delete mode 100644 PurchingMistakeNew/Report/X247右侧后门板1.grf delete mode 100644 PurchingMistakeNew/Report/X247右侧后门板装箱单.grf delete mode 100644 PurchingMistakeNew/Report/X247后部中间扰流板.grf delete mode 100644 PurchingMistakeNew/Report/X247后部扰流板装箱单.grf delete mode 100644 PurchingMistakeNew/Report/X247左侧前门板1.grf delete mode 100644 PurchingMistakeNew/Report/X247左侧前门板装箱单.grf delete mode 100644 PurchingMistakeNew/Report/X247左侧后门板1.grf delete mode 100644 PurchingMistakeNew/Report/X247左侧后门板装箱单.grf delete mode 100644 PurchingMistakeNew/Report/X247装箱单.grf delete mode 100644 PurchingMistakeNew/Report/X247门板.grf diff --git a/AddMaterial/App_Code/Function.cs b/AddMaterial/App_Code/Function.cs index bba0ab1..23fc0d7 100644 --- a/AddMaterial/App_Code/Function.cs +++ b/AddMaterial/App_Code/Function.cs @@ -87,7 +87,11 @@ public class Function return list; } } - + /// + /// + /// + /// 桶号 + /// public static string GetLastMaterialCode(string drumBarCode) { try @@ -105,8 +109,24 @@ public class Function } else { - return DateTime.Now.ToString(); + return DateTime.Now.ToString(); } + + //string sql = @"select top 2 * from tb_InjectPlanReport where Drum='" + drumBarCode + "' order by time1 desc"; + + //DataTable res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); + //if (res.Rows.Count == 2) + //{ + // string stockNo = ""; + // string batchNo = ""; + // string partNo = ""; + // GetCode(res.Rows[1]["BarCode"].ToString(), out stockNo, out batchNo, out partNo); + // return partNo; + //} + //else + //{ + // return DateTime.Now.ToString(); + //} } catch { diff --git a/AddMaterial/Handler.ashx b/AddMaterial/Handler.ashx index 16cc371..0c6fe91 100644 --- a/AddMaterial/Handler.ashx +++ b/AddMaterial/Handler.ashx @@ -131,6 +131,10 @@ public class Handler : IHttpHandler if (i == 0) { html += "" + "加料时间" + ""; + } + if(list[i].Drum == "LT09") + { + } if (i % 2 == 0) { @@ -153,9 +157,10 @@ public class Handler : IHttpHandler //} else { - string lastMaterial = Function.GetLastMaterialCode(list[i].Drum); - string currentMaterial = list[i].PartNo; - if(lastMaterial!= currentMaterial) + //string lastMaterial = Function.GetLastMaterialCode(list[i].Drum); + //string currentMaterial = list[i].PartNo; + //if(lastMaterial!= currentMaterial) + if(list[i].Flag == "0") { html += "" + list[i].Time1 + ""; } @@ -194,9 +199,10 @@ public class Handler : IHttpHandler //} else { - string lastMaterial = Function.GetLastMaterialCode(list[i].Drum); - string currentMaterial = list[i].PartNo; - if(lastMaterial!= currentMaterial) + //string lastMaterial = Function.GetLastMaterialCode(list[i].Drum); + //string currentMaterial = list[i].PartNo; + //if(lastMaterial!= currentMaterial) + if(list[i].Flag == "0") { html += "" + list[i].Time1 + ""; } @@ -317,6 +323,10 @@ public class Handler : IHttpHandler if (i == 5) { html += "" + "加料时间" + ""; + } + if(list[i].Drum == "LT09") + { + } if (i % 2 == 0) { @@ -338,9 +348,10 @@ public class Handler : IHttpHandler //} else { - string lastMaterial = Function.GetLastMaterialCode(list[i].Drum); - string currentMaterial = list[i].PartNo; - if(lastMaterial!= currentMaterial) + //string lastMaterial = Function.GetLastMaterialCode(list[i].Drum); + // string currentMaterial = list[i].PartNo; + //if(lastMaterial!= currentMaterial) + if(list[i].Flag == "0") { html += "" + list[i].Time1 + ""; } @@ -380,9 +391,10 @@ public class Handler : IHttpHandler //} else { - string lastMaterial = Function.GetLastMaterialCode(list[i].Drum); - string currentMaterial = list[i].PartNo; - if(lastMaterial!= currentMaterial) + //string lastMaterial = Function.GetLastMaterialCode(list[i].Drum); + //string currentMaterial = list[i].PartNo; + //if(lastMaterial!= currentMaterial) + if(list[i].Flag == "0") { html += "" + list[i].Time1 + ""; } diff --git a/AddMaterial/PaintView.html b/AddMaterial/PaintView.html index 19cf43d..67da626 100644 --- a/AddMaterial/PaintView.html +++ b/AddMaterial/PaintView.html @@ -11,7 +11,7 @@