From f6326d8e85b55a290ca88c9f14a0f2a9ecbf6971 Mon Sep 17 00:00:00 2001
From: quanzhou <quan.zhou@broconcentric.com>
Date: 星期六, 07 三月 2026 14:03:31 +0800
Subject: [PATCH] 修改S6_MES上传条码逻辑
---
src/Bro.M141.Process/M141Config.cs | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/src/Bro.M141.Process/M141Config.cs b/src/Bro.M141.Process/M141Config.cs
index bba1b8b..fa91b92 100644
--- a/src/Bro.M141.Process/M141Config.cs
+++ b/src/Bro.M141.Process/M141Config.cs
@@ -326,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
{
@@ -451,8 +515,6 @@
{
return alarmname;
}
-
-
public IImportFromFileInEditor GetImportObject(string data, out string msg)
{
--
Gitblit v1.8.0