From 86f899fa91e811415614dff1a699141144bfc802 Mon Sep 17 00:00:00 2001
From: quanzhou <quan.zhou@broconcentric.com>
Date: 星期五, 12 十二月 2025 13:25:37 +0800
Subject: [PATCH] S5上传mes逻辑修改及打印机逻辑修改和数据库存储数据增加
---
src/Bro.M141.Process/M141Config.cs | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 79 insertions(+), 10 deletions(-)
diff --git a/src/Bro.M141.Process/M141Config.cs b/src/Bro.M141.Process/M141Config.cs
index 3da03ca..a115d5e 100644
--- a/src/Bro.M141.Process/M141Config.cs
+++ b/src/Bro.M141.Process/M141Config.cs
@@ -66,6 +66,14 @@
public List<MeasureBind> MeasureBindCollection { get; set; } = new List<MeasureBind>();
+ [Category("鐐规閰嶇疆")]
+ [Description("鐐规閰嶇疆闆嗗悎锛岄厤缃娴嬬殑宸ヤ綅锛屽浘鐗囩储寮曪紝鐩告満鍜屾娴嬭皟鐢ㄩ」鍏崇郴")]
+ [DisplayName("鐐规閰嶇疆闆嗗悎")]
+ [TypeConverter(typeof(CollectionCountConvert))]
+ [Editor(typeof(ComplexCollectionEditor<MeasureBind>), typeof(UITypeEditor))]
+ public List<MeasureBind> MeasureBindCollection_Check { get; set; } = new List<MeasureBind>();
+
+
[Category("妫�娴嬭秴鏃惰缃�")]
[Description("妫�娴嬭秴鏃惰缃紝鑾峰彇妫�娴嬬粨鏋滄椂鐨勫厑璁告渶澶х瓑寰呮椂闂达紝鍗曚綅ms")]
@@ -318,8 +326,72 @@
public List<PlcAndBasketcode> PlcAndBasketcodes { get; set; } = new List<PlcAndBasketcode>();
+ [Category("MES閰嶇疆")]
+ [Description("浜у搧ID闆嗗悎")]
+ [DisplayName("浜у搧ID闆嗗悎")]
+ [TypeConverter(typeof(CollectionCountConvert))]
+ [Editor(typeof(ComplexCollectionEditor<ProductionID>), typeof(UITypeEditor))]
+ public List<ProductionID> Productioncode { get; set; } = new List<ProductionID>();
+
+ [Category("MES閰嶇疆")]
+ [Description("鏉＄爜闆嗗悎")]
+ [DisplayName("鏉＄爜闆嗗悎")]
+ [TypeConverter(typeof(CollectionCountConvert))]
+ [Editor(typeof(ComplexCollectionEditor<MES_code>), typeof(UITypeEditor))]
+ public List<MES_code> MES_codes { get; set; } = new List<MES_code>();
+
+
+ }
+ public class MES_code: IComplexDisplay
+ {
+ [Category("閰嶇疆")]
+ [Description("MES涓嬪彂鐨勬潯鐮�")]
+ [DisplayName("鏉＄爜")]
+ public string Printers_code { get; set; }
+ public string GetDisplayText()
+ {
+ return $"{Printers_code}";
+ }
}
+
+ public class ProductionID : IComplexDisplay
+ {
+ [Category("閰嶇疆")]
+ [Description("搴忓彿")]
+ [DisplayName("搴忓彿")]
+ public int Uptomesid { get; set; } = 0;
+
+ [Category("閰嶇疆")]
+ [Description("鏉＄爜")]
+ [DisplayName("PID")]
+ public string PID { get; set; }
+
+ [Category("閰嶇疆")]
+ [Description("鏉＄爜")]
+ [DisplayName("SEQUENCE")]
+ public string SEQUENCE { get; set; }
+
+ [Category("閰嶇疆")]
+ [Description("鏉＄爜")]
+ [DisplayName("BasketCode")]
+ public string BasketCode { get; set; }
+
+ [Category("閰嶇疆")]
+ [Description("鏉＄爜")]
+ [DisplayName("Zword")]
+ public string Zword { get; set; }
+
+ [Category("閰嶇疆")]
+ [Description("鏉＄爜")]
+ [DisplayName("SN")]
+ public string SN { get; set; }
+
+ public string GetDisplayText()
+ {
+ return $"浜у搧{PID}涓婁紶鎵规搴忓彿{Uptomesid}";
+ }
+ }
public class WorkPositionSet : IComplexDisplay
{
@@ -392,6 +464,7 @@
public string plcname { get; set; } = "";
+
[Category("PLC閰嶇疆")]
[DisplayName("鏄惁鍚敤")]
[Description("鏄惁鍚敤")]
@@ -427,6 +500,12 @@
[DisplayName("鎶ヨ鍚嶇О")]
[Description("鎶ヨ鍚嶇О")]
public string alarmname { get; set; } = "";
+
+ [Category("閰嶇疆")]
+ [DisplayName("鎶ヨ绉嶇被")]
+ [Description("鎶ヨ绉嶇被")]
+ public string alarmtype { get; set; } = "";
+
[Browsable(false)]
[JsonIgnore]
@@ -520,12 +599,6 @@
public string code { get; set; }
}
-
-
-
-
-
-
public class MeasureBind : IComplexDisplay, IHalconToolPath
{
[Category("绱㈠紩閰嶇疆")]
@@ -1104,14 +1177,10 @@
[Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))]
public string ImageFolder { get; set; }
-
-
[Category("妫�娴嬪姛鑳�")]
[Description("鍥剧墖鍦ㄦ壒閲忔祴璇曡繃绋嬩腑鏈�缁堝浘鐗囩粨鏋滀細瀛樺偍杈冩參闇�瑕佽缃欢鏃剁‘淇濆浘鐗囦笉琚祫婧愯嚜鍔ㄩ噴鏀�")]
[DisplayName("鍥剧墖瀛樺浘寤舵椂")]
public int SaveImageTime { get; set; } = 0;
-
-
[Category("妫�娴嬪姛鑳�")]
[Description("true锛氬惎鍔∣K娴嬭瘯 false锛氬惎鍔∟G娴嬭瘯")]
--
Gitblit v1.8.0