|
@@ -57,6 +57,7 @@ using HandyControl.Data;
|
|
|
using static SkiaSharp.HarfBuzz.SKShaper;
|
|
|
using System.Windows.Forms;
|
|
|
using Application = System.Windows.Application;
|
|
|
+using LogoForceTestApp.Modules.MainModule.Views;
|
|
|
|
|
|
namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
{
|
|
@@ -602,6 +603,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
string result = mes.Split(":")[2];
|
|
|
string opname = Operator15;
|
|
|
TestRes(sp, result, opname);
|
|
|
+ WriteCSV_Test(opname, sp, result);
|
|
|
client.Send("TeR:检测结果上传成功");
|
|
|
WriteLog("检测1#检测结果上传成功");
|
|
|
}
|
|
@@ -723,6 +725,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
string result = mes.Split(":")[2];
|
|
|
string opname = Operator16;
|
|
|
TestRes(sp, result, opname);
|
|
|
+ WriteCSV_Test(opname, sp, result);
|
|
|
client.Send("TeR:检测结果上传成功");
|
|
|
WriteLog("检测2#检测结果上传成功");
|
|
|
}
|
|
@@ -842,7 +845,8 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
string sp = mes.Split(":")[1];
|
|
|
string result = mes.Split(":")[2];
|
|
|
string opname = Operator17;
|
|
|
- TestRes(sp, result, opname);
|
|
|
+ TestRes(sp, result, opname);
|
|
|
+ WriteCSV_Test(opname, sp, result);
|
|
|
client.Send("TeR:检测结果上传成功");
|
|
|
WriteLog("检测3#检测结果上传成功");
|
|
|
}
|
|
@@ -963,6 +967,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
string result = mes.Split(":")[2];
|
|
|
string opname = Operator18;
|
|
|
TestRes(sp, result, opname);
|
|
|
+ WriteCSV_Test(opname, sp, result);
|
|
|
client.Send("TeR:检测结果上传成功");
|
|
|
WriteLog("检测4#检测结果上传成功");
|
|
|
}
|
|
@@ -1091,6 +1096,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
if (mes.Split(":")[0] == "Fix")
|
|
|
{
|
|
|
string sp = mes.Split(":")[1];
|
|
|
+ string wu = ResWord(mes.Split(":")[2]);
|
|
|
var res = repository.GetFirstDefault<Information>(c => c.ProCode == sp);
|
|
|
if (res != null)
|
|
|
{
|
|
@@ -1099,7 +1105,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
var productNew = new InformationNew
|
|
|
{
|
|
|
OperatorCode = Operator19,
|
|
|
- ItemCode = ResWord(mes.Split(":")[2]),
|
|
|
+ ItemCode = wu,
|
|
|
SpendTime = 0,
|
|
|
CreateTime = DateTime.Today,
|
|
|
ProType = proName,
|
|
@@ -1125,7 +1131,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
InforNew.Add(productNew);
|
|
|
_repository.Add(product);
|
|
|
}));
|
|
|
-
|
|
|
+ WriteCSV_Repair(Operator19, sp, wu);
|
|
|
client.Send("Rep:维修信息上传成功");
|
|
|
WriteLog("维修1#维修信息上传成功");
|
|
|
try
|
|
@@ -1164,6 +1170,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
if (mes.Split(":")[0] == "Fix")
|
|
|
{
|
|
|
string sp = mes.Split(":")[1];
|
|
|
+ string wu = ResWord(mes.Split(":")[2]);
|
|
|
var res = repository.GetFirstDefault<Information>(c => c.ProCode == sp);
|
|
|
if (res != null)
|
|
|
{
|
|
@@ -1172,7 +1179,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
var productNew = new InformationNew
|
|
|
{
|
|
|
OperatorCode = Operator20,
|
|
|
- ItemCode = ResWord(mes.Split(":")[2]),
|
|
|
+ ItemCode = wu,
|
|
|
SpendTime = 0,
|
|
|
CreateTime = DateTime.Today,
|
|
|
ProType = proName,
|
|
@@ -1198,6 +1205,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
InforNew.Add(productNew);
|
|
|
_repository.Add(product);
|
|
|
}));
|
|
|
+ WriteCSV_Repair(Operator20, sp, wu);
|
|
|
client.Send("Rep:维修信息上传成功");
|
|
|
WriteLog("维修2#维修信息上传成功");
|
|
|
try
|
|
@@ -1236,6 +1244,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
if (mes.Split(":")[0] == "Fix")
|
|
|
{
|
|
|
string sp = mes.Split(":")[1];
|
|
|
+ string wu = ResWord(mes.Split(":")[2]);
|
|
|
var res = repository.GetFirstDefault<Information>(c => c.ProCode == sp);
|
|
|
if (res != null)
|
|
|
{
|
|
@@ -1244,7 +1253,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
var productNew = new InformationNew
|
|
|
{
|
|
|
OperatorCode = Operator21,
|
|
|
- ItemCode = ResWord(mes.Split(":")[2]),
|
|
|
+ ItemCode = wu,
|
|
|
SpendTime = 0,
|
|
|
CreateTime = DateTime.Today,
|
|
|
ProType = proName,
|
|
@@ -1270,6 +1279,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
InforNew.Add(productNew);
|
|
|
_repository.Add(product);
|
|
|
}));
|
|
|
+ WriteCSV_Repair(Operator21, sp, wu);
|
|
|
client.Send("Rep:维修信息上传成功");
|
|
|
WriteLog("维修3#维修信息上传成功");
|
|
|
try
|
|
@@ -1364,6 +1374,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
res[i].ProCode = procode;
|
|
|
_repository.Update(res[i]);
|
|
|
}
|
|
|
+ WriteCSV_Bind(procode, soleNum, proName, Order);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1870,6 +1881,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
|
|
|
+ WriteCSV_Pro(Operator1, pno, proName, Order, Material1);
|
|
|
InforNew.Add(productNew);
|
|
|
_repository.Add(product);
|
|
|
OperatorName(operName);
|
|
@@ -1927,6 +1939,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
+ WriteCSV_Pro(Operator2, pno, proName, Order, Material2);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -1983,7 +1996,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator3, pno, proName, Order, Material3);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2040,7 +2053,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator4, pno, proName, Order, Material4);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2097,7 +2110,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator5, pno, proName, Order, Material5);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2154,7 +2167,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator6, pno, proName, Order, Material6);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2211,7 +2224,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator7, pno, proName, Order, Material7);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2268,7 +2281,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator8, pno, proName, Order, Material8);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2325,7 +2338,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator9, pno, proName, Order, Material9);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2382,7 +2395,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator10, pno, proName, Order, Material10);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2439,7 +2452,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator11, pno, proName, Order, Material11);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2496,7 +2509,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator12, pno, proName, Order, Material12);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2553,7 +2566,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator13, pno, proName, Order, Material13);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -2612,7 +2625,7 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
OrderNo = productNew.OrderNo,
|
|
|
TestResult = productNew.TestResult
|
|
|
};
|
|
|
-
|
|
|
+ WriteCSV_Pro(Operator14, pno, proName, Order, Material14);
|
|
|
_repository.Add(product);
|
|
|
InforNew.Add(productNew);
|
|
|
OperatorName(operName);
|
|
@@ -3007,6 +3020,138 @@ namespace LogoForceTestApp.Modules.MainModule.ViewModels
|
|
|
}
|
|
|
#endregion
|
|
|
|
|
|
+ #region WriteCSV
|
|
|
+ //生产信息
|
|
|
+ public void WriteCSV_Pro(string idPeople,string proNo,string proType,string order,string Wu)
|
|
|
+ {
|
|
|
+ string s1, s2, s3, s4,
|
|
|
+ s11, s12, s13, s14, s15, s16,
|
|
|
+ s21, s22, s23, s24, s25, s26;
|
|
|
+ //
|
|
|
+ string path = "D:\\Result\\生产信息\\";
|
|
|
+ if (!Directory.Exists(path))
|
|
|
+ {
|
|
|
+ Directory.CreateDirectory(path);
|
|
|
+ }
|
|
|
+ //
|
|
|
+ s11 = "时间";
|
|
|
+ s12 = "人员ID";
|
|
|
+ s13 = "产品编号";
|
|
|
+ s14 = "产品类型";
|
|
|
+ s15 = "订单编号";
|
|
|
+ s16 = "物料码";
|
|
|
+ //
|
|
|
+ s21 = DateTime.Now.ToString("HH:mm:ss");
|
|
|
+ s22 = idPeople;
|
|
|
+ s23 = proNo;
|
|
|
+ s24 =proType;
|
|
|
+ s25 =order;
|
|
|
+ s26 =Wu;
|
|
|
+ //=========================
|
|
|
+ s1 = path;
|
|
|
+ s2 = DateTime.Now.ToString("yyyyMMdd"); //表格命名以天记录
|
|
|
+ s3 = s11 + "," + s12 + "," + s13;
|
|
|
+ s4 = s21 + "," + s22 + "," + s23;
|
|
|
+ //
|
|
|
+ DataHelp.Save(s1, s2, s3, s4);
|
|
|
+ }
|
|
|
+
|
|
|
+ //绑定信息
|
|
|
+ public void WriteCSV_Bind(string proCode, string proNo, string proType, string order)
|
|
|
+ {
|
|
|
+ string s1, s2, s3, s4,
|
|
|
+ s11, s12, s13, s14, s15,
|
|
|
+ s21, s22, s23, s24, s25;
|
|
|
+ //
|
|
|
+ string path = "D:\\Result\\绑定信息\\";
|
|
|
+ if (!Directory.Exists(path))
|
|
|
+ {
|
|
|
+ Directory.CreateDirectory(path);
|
|
|
+ }
|
|
|
+ //
|
|
|
+ s11 = "时间";
|
|
|
+ s12 = "产品码";
|
|
|
+ s13 = "产品编号";
|
|
|
+ s14 = "产品类型";
|
|
|
+ s15 = "订单编号";
|
|
|
+ //
|
|
|
+ s21 = DateTime.Now.ToString("HH:mm:ss");
|
|
|
+ s22 = proCode;
|
|
|
+ s23 = proNo;
|
|
|
+ s24 = proType;
|
|
|
+ s25 = order;
|
|
|
+ //=========================
|
|
|
+ s1 = path;
|
|
|
+ s2 = DateTime.Now.ToString("yyyyMMdd"); //表格命名以天记录
|
|
|
+ s3 = s11 + "," + s12 + "," + s13;
|
|
|
+ s4 = s21 + "," + s22 + "," + s23;
|
|
|
+ //
|
|
|
+ DataHelp.Save(s1, s2, s3, s4);
|
|
|
+ }
|
|
|
+
|
|
|
+ //检测信息
|
|
|
+ public void WriteCSV_Test(string idPeople, string proCode, string res)
|
|
|
+ {
|
|
|
+ string s1, s2, s3, s4,
|
|
|
+ s11, s12, s13, s14,
|
|
|
+ s21, s22, s23, s24;
|
|
|
+ //
|
|
|
+ string path = "D:\\Result\\检测信息\\";
|
|
|
+ if (!Directory.Exists(path))
|
|
|
+ {
|
|
|
+ Directory.CreateDirectory(path);
|
|
|
+ }
|
|
|
+ //
|
|
|
+ s11 = "时间";
|
|
|
+ s12 = "检测人员ID";
|
|
|
+ s13 = "产品码";
|
|
|
+ s14 = "检测结果";
|
|
|
+ //
|
|
|
+ s21 = DateTime.Now.ToString("HH:mm:ss");
|
|
|
+ s22 = idPeople;
|
|
|
+ s23 = proCode;
|
|
|
+ s24 = res;
|
|
|
+ //=========================
|
|
|
+ s1 = path;
|
|
|
+ s2 = DateTime.Now.ToString("yyyyMMdd"); //表格命名以天记录
|
|
|
+ s3 = s11 + "," + s12 + "," + s13;
|
|
|
+ s4 = s21 + "," + s22 + "," + s23;
|
|
|
+ //
|
|
|
+ DataHelp.Save(s1, s2, s3, s4);
|
|
|
+ }
|
|
|
+
|
|
|
+ //维修信息
|
|
|
+ public void WriteCSV_Repair(string idPeople, string proCode, string wu)
|
|
|
+ {
|
|
|
+ string s1, s2, s3, s4,
|
|
|
+ s11, s12, s13, s14,
|
|
|
+ s21, s22, s23, s24;
|
|
|
+ //
|
|
|
+ string path = "D:\\Result\\维修信息\\";
|
|
|
+ if (!Directory.Exists(path))
|
|
|
+ {
|
|
|
+ Directory.CreateDirectory(path);
|
|
|
+ }
|
|
|
+ //
|
|
|
+ s11 = "时间";
|
|
|
+ s12 = "维修人员id";
|
|
|
+ s13 = "产品码";
|
|
|
+ s14 = "维修物料";
|
|
|
+ //
|
|
|
+ s21 = DateTime.Now.ToString("HH:mm:ss");
|
|
|
+ s22 = idPeople;
|
|
|
+ s23 = proCode;
|
|
|
+ s24 = wu;
|
|
|
+ //=========================
|
|
|
+ s1 = path;
|
|
|
+ s2 = DateTime.Now.ToString("yyyyMMdd"); //表格命名以天记录
|
|
|
+ s3 = s11 + "," + s12 + "," + s13;
|
|
|
+ s4 = s21 + "," + s22 + "," + s23;
|
|
|
+ //
|
|
|
+ DataHelp.Save(s1, s2, s3, s4);
|
|
|
+ }
|
|
|
+ #endregion
|
|
|
+
|
|
|
#region 生成二维码
|
|
|
|
|
|
public void QRcode()
|