Skip to content

顾剑亮 / SmartScan

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 6e600050 由 刘韬
选项

1

1 个父辈 a1ec7f8c
全部展开
内嵌 并排
正在显示 36 个修改的文件 包含 52 行增加 和 11 行删除
BLL/Extension.cs
...@@ -12,6 +12,7 @@ namespace BLL ...@@ -12,6 +12,7 @@ namespace BLL
public class Extension : IDisposable public class Extension : IDisposable
{ {
public event IExtension.PrintDelegate Printing; public event IExtension.PrintDelegate Printing;
public event IExtension.PrintDelegate SaveRetrospect;
private readonly IExtension currentExtension; private readonly IExtension currentExtension;
private readonly Dictionary<string, IExtension> dicExtension; private readonly Dictionary<string, IExtension> dicExtension;
...@@ -53,8 +54,12 @@ namespace BLL ...@@ -53,8 +54,12 @@ namespace BLL
{ "General", General } { "General", General }
}; };
for (int i = 0; i < dicExtension.Count; i++) for (int i = 0; i < dicExtension.Count; i++)
{
dicExtension.ElementAt(i).Value.Printing += new IExtension.PrintDelegate( dicExtension.ElementAt(i).Value.Printing += new IExtension.PrintDelegate(
delegate (Dictionary<string, string> content) { Printing?.Invoke(content); }); delegate (Dictionary<string, string> content) { Printing?.Invoke(content); });
dicExtension.ElementAt(i).Value.SaveRetrospect += new IExtension.PrintDelegate(
delegate (Dictionary<string, string> content) { SaveRetrospect?.Invoke(content); });
}
dicControls = new() dicControls = new()
{ {
......
BLL/Extension/Item_Alcoelectro.cs
...@@ -16,6 +16,7 @@ namespace BLL ...@@ -16,6 +16,7 @@ namespace BLL
public class Alcoelectro : IExtension public class Alcoelectro : IExtension
{ {
public event IExtension.PrintDelegate Printing; public event IExtension.PrintDelegate Printing;
public event IExtension.PrintDelegate SaveRetrospect;
private List<ExtensionControl> extensions; private List<ExtensionControl> extensions;
private ServerContent[] serverContent; private ServerContent[] serverContent;
...@@ -373,6 +374,7 @@ namespace BLL ...@@ -373,6 +374,7 @@ namespace BLL
LogNet.log.Info("打印标签前的ID：" + reelID); LogNet.log.Info("打印标签前的ID：" + reelID);
reelID++; reelID++;
SaveReelID(); SaveReelID();
SaveRetrospect?.Invoke(key);
Printing?.Invoke(key); Printing?.Invoke(key);
} }
......
BLL/Extension/Item_General.cs
...@@ -18,6 +18,7 @@ namespace BLL ...@@ -18,6 +18,7 @@ namespace BLL
public class General : IExtension public class General : IExtension
{ {
public event IExtension.PrintDelegate Printing; public event IExtension.PrintDelegate Printing;
public event IExtension.PrintDelegate SaveRetrospect;
private Config config; private Config config;
private int reelID = 0; private int reelID = 0;
...@@ -76,7 +77,7 @@ namespace BLL ...@@ -76,7 +77,7 @@ namespace BLL
return; return;
Application.DoEvents(); Application.DoEvents();
if (config.AutoPrint && hasMatch) if (config.AutoPrint && hasMatch)
{ {
//if (CanPrint()) //if (CanPrint())
...@@ -89,7 +90,7 @@ namespace BLL ...@@ -89,7 +90,7 @@ namespace BLL
var newid = GetHttpReelID(key); var newid = GetHttpReelID(key);
if (string.IsNullOrEmpty(newid)) if (string.IsNullOrEmpty(newid))
return false; return false;
key["ReelID"] = newid; key["ReelID"] = newid;
} }
for (int i = 0; i < extensions.Count; i++) for (int i = 0; i < extensions.Count; i++)
...@@ -97,6 +98,7 @@ namespace BLL ...@@ -97,6 +98,7 @@ namespace BLL
if (extensions[i].Key.ToLower() == "reelid") if (extensions[i].Key.ToLower() == "reelid")
extensions[i].Control.Text = key["reelid"]; extensions[i].Control.Text = key["reelid"];
} }
SaveRetrospect?.Invoke(key);
return true; return true;
} }
...@@ -196,7 +198,7 @@ namespace BLL ...@@ -196,7 +198,7 @@ namespace BLL
key.Add(extensions[i].Key, extensions[i].Control.Text); key.Add(extensions[i].Key, extensions[i].Control.Text);
} }
var keys =new List<string>(key.Keys); var keys =new List<string>(key.Keys);
Printing?.Invoke(key); Printing?.Invoke(key);
} }
private string GetHttpReelID(Dictionary<string, string> key) private string GetHttpReelID(Dictionary<string, string> key)
......
BLL/Extension/Item_Inventec.cs
...@@ -16,6 +16,7 @@ namespace BLL ...@@ -16,6 +16,7 @@ namespace BLL
public class Inventec : IExtension public class Inventec : IExtension
{ {
public event IExtension.PrintDelegate Printing; public event IExtension.PrintDelegate Printing;
public event IExtension.PrintDelegate SaveRetrospect;
private List<ExtensionControl> extensions; private List<ExtensionControl> extensions;
private readonly Dictionary<string, int> reelID; private readonly Dictionary<string, int> reelID;
...@@ -375,6 +376,7 @@ namespace BLL ...@@ -375,6 +376,7 @@ namespace BLL
reelID[reelIDKey]++; reelID[reelIDKey]++;
SaveReelID(); SaveReelID();
} }
SaveRetrospect?.Invoke(key);
Printing?.Invoke(key); Printing?.Invoke(key);
//Clear(); //Clear();
......
BLL/Extension/Item_KaiFa.cs
...@@ -19,6 +19,7 @@ namespace BLL ...@@ -19,6 +19,7 @@ namespace BLL
{ {
public event IExtension.PrintDelegate Printing; public event IExtension.PrintDelegate Printing;
public event IExtension.PrintDelegate SaveRetrospect;
private Config config; private Config config;
private int reelID = 0; private int reelID = 0;
private List<ExtensionControl> extensions; private List<ExtensionControl> extensions;
...@@ -191,7 +192,7 @@ namespace BLL ...@@ -191,7 +192,7 @@ namespace BLL
if (string.IsNullOrEmpty(key[kk])) if (string.IsNullOrEmpty(key[kk]))
key[kk] = "NA"; key[kk] = "NA";
} }
SaveRetrospect?.Invoke(key);
Printing?.Invoke(key); Printing?.Invoke(key);
} }
......
BLL/Extension/Item_NanRui.cs
...@@ -16,6 +16,7 @@ namespace BLL ...@@ -16,6 +16,7 @@ namespace BLL
public class NanRui : IExtension public class NanRui : IExtension
{ {
public event IExtension.PrintDelegate Printing; public event IExtension.PrintDelegate Printing;
public event IExtension.PrintDelegate SaveRetrospect;
private string[][] jsonData; private string[][] jsonData;
private string mesIP; private string mesIP;
......
BLL/Extension/Item_PanaCIM.cs
...@@ -16,6 +16,7 @@ namespace BLL ...@@ -16,6 +16,7 @@ namespace BLL
public class PanaCIM : IExtension public class PanaCIM : IExtension
{ {
public event IExtension.PrintDelegate Printing; public event IExtension.PrintDelegate Printing;
public event IExtension.PrintDelegate SaveRetrospect;
private List<ExtensionControl> extensions; private List<ExtensionControl> extensions;
private readonly Dictionary<string, int> reelID; private readonly Dictionary<string, int> reelID;
...@@ -330,6 +331,7 @@ namespace BLL ...@@ -330,6 +331,7 @@ namespace BLL
reelID[reelIDKey]++; reelID[reelIDKey]++;
SaveReelID(); SaveReelID();
} }
SaveRetrospect?.Invoke(key);
Printing?.Invoke(key); Printing?.Invoke(key);
//Clear(); //Clear();
......
BLL/MaterialEdit.cs
...@@ -168,7 +168,7 @@ namespace BLL ...@@ -168,7 +168,7 @@ namespace BLL
if (TemplateExtract(i, code, out keyword, out isCodeUsed)) if (TemplateExtract(i, code, out keyword, out isCodeUsed))
{ {
if (string.IsNullOrEmpty(mateName)) if (string.IsNullOrEmpty(mateName))
mateName = mateTemp[firstIndex].Name; mateName = mateTemp[i].Name;
if (!analyisMode) if (!analyisMode)
return true; return true;
} }
...@@ -183,7 +183,7 @@ namespace BLL ...@@ -183,7 +183,7 @@ namespace BLL
if (TemplateExtract(i, code, out keyword, out isCodeUsed)) if (TemplateExtract(i, code, out keyword, out isCodeUsed))
{ {
if (string.IsNullOrEmpty(mateName)) if (string.IsNullOrEmpty(mateName))
mateName = mateTemp[firstIndex].Name; mateName = mateTemp[i].Name;
if (!analyisMode) if (!analyisMode)
return true; return true;
} }
......
Model/Http.cs
...@@ -59,6 +59,7 @@ namespace Model ...@@ -59,6 +59,7 @@ namespace Model
{ {
RestClient client = new(url) { Timeout = timeout }; RestClient client = new(url) { Timeout = timeout };
client.UseSerializer(new CustSerialize()); client.UseSerializer(new CustSerialize());
RestRequest request = new(Method.POST); RestRequest request = new(Method.POST);
request.AddHeader("Content-Type", "application/json"); request.AddHeader("Content-Type", "application/json");
if (headers != null) if (headers != null)
...@@ -69,10 +70,10 @@ namespace Model ...@@ -69,10 +70,10 @@ namespace Model
} }
} }
request.AddJsonBody(jsonobject); request.AddJsonBody(jsonobject);
IRestResponse response = client.Execute(request); IRestResponse response = client.Execute(request);
string s = response.Content; string s = response.Content;
if (wlog) if (wlog)
LogNet.log.Info("Return:" + s); LogNet.log.Info("Return:" + s);
return s; return s;
} }
private static string FormatContent(string s) private static string FormatContent(string s)
......
Model/IExtension.cs
...@@ -7,6 +7,7 @@ namespace Model ...@@ -7,6 +7,7 @@ namespace Model
{ {
public delegate void PrintDelegate(Dictionary<string, string> content); public delegate void PrintDelegate(Dictionary<string, string> content);
public event PrintDelegate Printing; public event PrintDelegate Printing;
public event PrintDelegate SaveRetrospect;
public void Clear(); public void Clear();
......
SmartScan/Form/FrmMain.cs
...@@ -149,20 +149,43 @@ namespace SmartScan ...@@ -149,20 +149,43 @@ namespace SmartScan
} }
} }
private void Extension_Printing(Dictionary<string, string> content) private void Extension_SaveRetrospect(Dictionary<string, string> content)
{ {
try try
{ {
string str = "打印内容："; string str = "追溯内容：";
foreach (string key in content.Keys) foreach (string key in content.Keys)
str += string.Format("({0}:{1})", key, content[key]); str += string.Format("({0}:{1})", key, content[key]);
LogNet.log.Info(str); LogNet.log.Info(str);
Common.SCMM.SendData(content); Common.SCMM.SendData(content);
Bitmap labelBmp = Common.labelEdit.PrintImage(Common.config.DefaultPrintLabel, content, out _); Bitmap labelBmp = Common.labelEdit.PrintImage(Common.config.DefaultPrintLabel, content, out _);
//Common.labelEdit.PrintLast(Common.config.DefaultPrintLabel, Common.config.PrinterName, Common.config.PrintLandscape, content, out string[] barcode);
//LogNet.log.Info(string.Format("打印标签 Label[{0}] Printer[{1}]", Common.config.DefaultPrintLabel, Common.config.PrinterName));
var barcode = content.Values.ToArray();
SaveRetrospect(labelBmp, barcode);
if (Common.config.PrintCompletedClear)
Common.extension.Clear();
}
catch (Exception ex)
{
LogNet.log.Error("Extension_Printing", ex);
}
}
private void Extension_Printing(Dictionary<string, string> content)
{
try
{
string str = "打印内容：";
foreach (string key in content.Keys)
str += string.Format("({0}:{1})", key, content[key]);
LogNet.log.Info(str);
//Common.SCMM.SendData(content);
//Bitmap labelBmp = Common.labelEdit.PrintImage(Common.config.DefaultPrintLabel, content, out _);
Common.labelEdit.PrintLast(Common.config.DefaultPrintLabel, Common.config.PrinterName, Common.config.PrintLandscape, content, out string[] barcode); Common.labelEdit.PrintLast(Common.config.DefaultPrintLabel, Common.config.PrinterName, Common.config.PrintLandscape, content, out string[] barcode);
LogNet.log.Info(string.Format("打印标签 Label[{0}] Printer[{1}]", Common.config.DefaultPrintLabel, Common.config.PrinterName)); LogNet.log.Info(string.Format("打印标签 Label[{0}] Printer[{1}]", Common.config.DefaultPrintLabel, Common.config.PrinterName));
SaveRetrospect(labelBmp, barcode); //SaveRetrospect(labelBmp, barcode);
if (Common.config.PrintCompletedClear) if (Common.config.PrintCompletedClear)
Common.extension.Clear(); Common.extension.Clear();
...@@ -200,6 +223,7 @@ namespace SmartScan ...@@ -200,6 +223,7 @@ namespace SmartScan
PnlExtension.Left = Width - PnlExtension.Width - 12; PnlExtension.Left = Width - PnlExtension.Width - 12;
PicShow.Width = PnlExtension.Left - PicShow.Left - 6; PicShow.Width = PnlExtension.Left - PicShow.Left - 6;
Common.extension.Printing += Extension_Printing; Common.extension.Printing += Extension_Printing;
Common.extension.SaveRetrospect += Extension_SaveRetrospect;
Common.extension.LoadPanel(PnlExtension, Common.macroKey); Common.extension.LoadPanel(PnlExtension, Common.macroKey);
//语言 //语言
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!