Merge remote-tracking branch 'origin/dev' into dev

BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs

@@ -72,6 +72,10 @@ public static class DictConst
     /// </summary>
     public const string ToBeScheduledEncode = "ToBeScheduled";
     /// <summary>
+    /// 任务单状态码-暂停
+    /// </summary>
+    public const string MoStatusPauseCode = "Pause";
+    /// <summary>
     /// 模具维修状态码-待维修
     /// </summary>
     public const string MaintainStatusDWXCode = "DWX";
@@ -79,6 +83,14 @@ public static class DictConst
     /// 模具维修状态码-已完成
     /// </summary>
     public const string MaintainStatusYWCCode = "YWC";
+    /// <summary>
+    /// 模具保养状态-待保养编码
+    /// </summary>
+    public const string MoldMaintainStatusDBYCode = "UnMaintain";
+    /// <summary>
+    /// 模具保养状态TypeId
+    /// </summary>
+    public const string MoldMaintainStatusTypeId = "26171564065301";