1

2024-05-10 02:59:49 +08:00
parent bec4e7bf91
commit c76f16103c
17 changed files with 155 additions and 16 deletions
--- a/IDIS.YL106.Model/Samples/Data_Oder_Register.json
+++ b/IDIS.YL106.Model/Samples/Data_Oder_Register.json
@@ -1,5 +1,5 @@
 {
-  "handle": "88.123.99/638504356449571895",
+  "handle": "88.123.99/638509045455920164",
  "templateVersion": "Template-1.0.0",
  "value": [
    {
@@ -73,6 +73,24 @@
        "value": "0001/1/1 0:00:00"
      },
      "type": "FinishTime"
+    },
+    {
+      "auth": null,
+      "index": 8,
+      "data": {
+        "format": "String",
+        "value": ""
+      },
+      "type": "ProductHandle"
+    },
+    {
+      "auth": null,
+      "index": 9,
+      "data": {
+        "format": "String",
+        "value": ""
+      },
+      "type": "Materials"
    }
  ]
 }
--- a/IDIS.YL106.Model/Samples/Data_Oder_Template.json
+++ b/IDIS.YL106.Model/Samples/Data_Oder_Template.json
@@ -74,6 +74,24 @@
        "minLength": 0,
        "maxLength": 255
      }
+    },
+    {
+      "name": "产品标识",
+      "idType": "ProductHandle",
+      "metaData": {
+        "type": "String",
+        "minLength": 0,
+        "maxLength": 255
+      }
+    },
+    {
+      "name": "原材料标识",
+      "idType": "Materials",
+      "metaData": {
+        "type": "String",
+        "minLength": 0,
+        "maxLength": 255
+      }
    }
  ]
 }
--- a/IDIS.YL106.Model/Samples/Object_Equipment_Register.json
+++ b/IDIS.YL106.Model/Samples/Object_Equipment_Register.json
@@ -1,5 +1,5 @@
 {
-  "handle": "88.123.99/638504356450474051",
+  "handle": "88.123.99/638509045457186952",
  "templateVersion": "Template-1.0.0",
  "value": [
    {
--- a/IDIS.YL106.Model/Samples/Object_Material_Register.json
+++ b/IDIS.YL106.Model/Samples/Object_Material_Register.json
@@ -1,5 +1,5 @@
 {
-  "handle": "88.123.99/638504356450486389",
+  "handle": "88.123.99/638509045457197724",
  "templateVersion": "Template-1.0.0",
  "value": [
    {
--- a/IDIS.YL106.Model/Samples/Object_Product_Register.json
+++ b/IDIS.YL106.Model/Samples/Object_Product_Register.json
@@ -1,5 +1,5 @@
 {
-  "handle": "88.123.99/638504356450495496",
+  "handle": "88.123.99/638509045457205790",
  "templateVersion": "Template-1.0.0",
  "value": [
    {
--- a/IDIS.YL106.Model/Samples/Procedure_Assembly_Register.json
+++ b/IDIS.YL106.Model/Samples/Procedure_Assembly_Register.json
@@ -1,5 +1,5 @@
 {
-  "handle": "88.123.99/638504356450505177",
+  "handle": "88.123.99/638509045457215305",
  "templateVersion": "Template-1.0.0",
  "value": [
    {
@@ -52,7 +52,7 @@
      "index": 5,
      "data": {
        "format": "DateTime",
-        "value": "2024/5/4 16:07:24"
+        "value": "2024/5/10 2:22:25"
      },
      "type": "CreateTime"
    },
@@ -61,7 +61,7 @@
      "index": 6,
      "data": {
        "format": "DateTime",
-        "value": "2024/5/4 16:07:24"
+        "value": "2024/5/10 2:22:25"
      },
      "type": "CompleteTime"
    },
@@ -70,9 +70,18 @@
      "index": 7,
      "data": {
        "format": "DateTime",
-        "value": "2024/5/4 16:07:24"
+        "value": "2024/5/10 2:22:25"
      },
      "type": "LastUpdateTime"
+    },
+    {
+      "auth": null,
+      "index": 8,
+      "data": {
+        "format": "String",
+        "value": ""
+      },
+      "type": "OderHandle"
    }
  ]
 }
--- a/IDIS.YL106.Model/Samples/Procedure_Assembly_Template.json
+++ b/IDIS.YL106.Model/Samples/Procedure_Assembly_Template.json
@@ -13,7 +13,7 @@
      }
    },
    {
-      "name": "",
+      "name": "物料名称",
      "idType": "MaterialName",
      "metaData": {
        "type": "String",
@@ -74,6 +74,15 @@
        "minLength": 0,
        "maxLength": 255
      }
+    },
+    {
+      "name": "订单标识",
+      "idType": "OderHandle",
+      "metaData": {
+        "type": "String",
+        "minLength": 0,
+        "maxLength": 255
+      }
    }
  ]
 }
--- a/IDIS.YL106.Model/Samples/Procedure_Transport_Register.json
+++ b/IDIS.YL106.Model/Samples/Procedure_Transport_Register.json
@@ -1,5 +1,5 @@
 {
-  "handle": "88.123.99/638504356450514755",
+  "handle": "88.123.99/638509045457226466",
  "templateVersion": "Template-1.0.0",
  "value": [
    {
@@ -70,7 +70,7 @@
      "index": 7,
      "data": {
        "format": "DateTime",
-        "value": "2024/5/4 16:07:24"
+        "value": "2024/5/10 2:22:25"
      },
      "type": "CreateTime"
    },
@@ -79,7 +79,7 @@
      "index": 8,
      "data": {
        "format": "DateTime",
-        "value": "2024/5/4 16:07:24"
+        "value": "2024/5/10 2:22:25"
      },
      "type": "CompleteTime"
    },
@@ -88,9 +88,18 @@
      "index": 9,
      "data": {
        "format": "DateTime",
-        "value": "2024/5/4 16:07:24"
+        "value": "2024/5/10 2:22:25"
      },
      "type": "LastUpdateTime"
+    },
+    {
+      "auth": null,
+      "index": 10,
+      "data": {
+        "format": "String",
+        "value": ""
+      },
+      "type": "OderHandle"
    }
  ]
 }
--- a/IDIS.YL106.Model/Samples/Procedure_Transport_Template.json
+++ b/IDIS.YL106.Model/Samples/Procedure_Transport_Template.json
@@ -92,6 +92,15 @@
        "minLength": 0,
        "maxLength": 255
      }
+    },
+    {
+      "name": "订单标识",
+      "idType": "OderHandle",
+      "metaData": {
+        "type": "String",
+        "minLength": 0,
+        "maxLength": 255
+      }
    }
  ]
 }
--- a/IDIS.YL106.Model/Src/Data_Oder.cs
+++ b/IDIS.YL106.Model/Src/Data_Oder.cs
@@ -4,7 +4,9 @@ using Newtonsoft.Json;

 namespace IDIS.YL106.Model;

-
+/// <summary>
+/// 数据-订单
+/// </summary>
 public record Data_Oder : IDIS_Model
 {
 	public override string[] Tags { get; set; } = new string[] { "order" };
@@ -47,4 +49,16 @@ public record Data_Oder : IDIS_Model
 	/// </summary>
 	[DisplayName("完成时间")]
 	public DateTime FinishTime { get; set; } = DateTime.MinValue;
+	
+	/// <summary>
+	/// 产品标识
+	/// </summary>
+	[DisplayName("产品标识")]
+	public string ProductHandle { get; set; } = string.Empty;
+	
+	/// <summary>
+	/// 原材料标识
+	/// </summary>
+	[DisplayName("原材料标识")]
+	public string Materials { get; set; } = string.Empty;
 }
--- a/IDIS.YL106.Model/Src/Object_Equipment.cs
+++ b/IDIS.YL106.Model/Src/Object_Equipment.cs
@@ -5,7 +5,7 @@ using Newtonsoft.Json;
 namespace IDIS.YL106.Model;

 /// <summary>
-/// 设备模型,用于描述例如机器人、传送带等设备的信息
+/// 实体,用于描述例如机器人、传送带等设备的信息
 /// </summary>
 public record Object_Equipment : IDIS_Model
 {
--- a/IDIS.YL106.Model/Src/Object_Material.cs
+++ b/IDIS.YL106.Model/Src/Object_Material.cs
@@ -4,6 +4,9 @@ using Newtonsoft.Json;

 namespace IDIS.YL106.Model;

+/// <summary>
+/// 实体,用于描述物料的信息
+/// </summary>
 public record Object_Material: IDIS_Model
 {
    /// <summary>
--- a/IDIS.YL106.Model/Src/Object_Product.cs
+++ b/IDIS.YL106.Model/Src/Object_Product.cs
@@ -4,6 +4,9 @@ using Newtonsoft.Json;

 namespace IDIS.YL106.Model;

+/// <summary>
+/// 实体,用于描述产品的信息
+/// </summary>
 public record Object_Product:IDIS_Model
 {
    /// <summary>
@@ -47,5 +50,6 @@ public record Object_Product:IDIS_Model
    [DisplayName("注意事项")]
    [JsonProperty("note")]
    public string Note { get; set; } = "请不要在用力弯曲或者误食笔芯";
+    

 }
--- a/IDIS.YL106.Model/Src/Procedure_Assembly.cs
+++ b/IDIS.YL106.Model/Src/Procedure_Assembly.cs
@@ -1,9 +1,17 @@
+using System.ComponentModel;
+
 namespace IDIS.YL106.Model;

+/// <summary>
+/// 装配工序
+/// </summary>
 public record Procedure_Assembly:Procedure_Base
 {
 	/// <summary>
 	/// 物料名称
 	/// </summary>
+	[DisplayName("物料名称")]
 	public string MaterialName { get; set; } = string.Empty;
+	
+	
 }
--- a/IDIS.YL106.Model/Src/Procedure_Base.cs
+++ b/IDIS.YL106.Model/Src/Procedure_Base.cs
@@ -4,6 +4,9 @@ using Newtonsoft.Json;

 namespace IDIS.YL106.Model;

+/// <summary>
+/// 工序基类
+/// </summary>
 public record Procedure_Base:IDIS_Model
 {
 	/// <summary>
@@ -19,7 +22,7 @@ public record Procedure_Base:IDIS_Model
 	[JsonProperty("assignment_code")]
 	public string AssignmentCode { get; set; } = string.Empty;
 	/// <summary>
-	/// 主要物体
+	/// 主要物体,例如设备、物料等
 	/// </summary>
 	[DisplayName("主要物体")]
 	[JsonProperty("main_object")]
@@ -42,4 +45,11 @@ public record Procedure_Base:IDIS_Model
 	[DisplayName("最后更新时间")]
 	[JsonProperty("last_updateTime")]
 	public DateTime LastUpdateTime { get; set; } = DateTime.Now;
+	
+	/// <summary>
+	/// 订单标识
+	/// </summary>
+	[DisplayName("订单标识")]
+	[JsonProperty("order_handle")]
+	public string OderHandle { get; set; } = string.Empty;
 }
--- a/IDIS.YL106.Model/Src/Procedure_Transport.cs
+++ b/IDIS.YL106.Model/Src/Procedure_Transport.cs
@@ -4,6 +4,9 @@ using Newtonsoft.Json;

 namespace IDIS.YL106.Model;

+/// <summary>
+/// 出库工序
+/// </summary>
 public record Procedure_Transport:Procedure_Base
 {
 	/// <summary>