新增枚举类

MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -1,4 +1,5 @@
-using Business.Core.MongoDBHelper;
+using Business.Core.Enum;
+using Business.Core.MongoDBHelper;
 using Business.ResourceExamineManagement.Dto;
 using Bussiness.Model.MES.IC;
 using Bussiness.Model.Production;
@@ -195,8 +196,8 @@ namespace Business.ResourceExamineManagement
             //var seorderentry = await _mysql_crm_seorderentry.FindAsync(x => x.Id == seorderentry_id);
             //根据Bom编码查询出对应工单并且状态不为完成、关闭，非委外工单。
             //TODO:工单类型；
-            var morderList = await _mes_morder.GetManyByCondition(x => x.bom_number == bomNumber && (x.morder_state != "完成" || x.morder_state != "关闭"
-            && x.morder_icitem_type != "相关委外工单") && !x.IsDeleted && x.tenant_id == seorderentry.tenant_id);
+            var morderList = await _mes_morder.GetManyByCondition(x => x.bom_number == bomNumber && (x.morder_state != MorderEnum.Accomplish_state || x.morder_state != MorderEnum.Close_state
+            && x.morder_icitem_type != MorderEnum.XgwyMorder) && !x.IsDeleted && x.tenant_id == seorderentry.tenant_id);
 
             //获取物料详情
             //var ic_item = _ic_item.GetManyByCondition(x => x.number == seorderentry.item_number && x.tenant_id == seorderentry.tenant_id).Result.FirstOrDefault();

MicroServices/Business/Business.Core/Enum/MorderEnum.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Business.Core.Enum
+{
+    public class MorderEnum
+    {
+        /// <summary>
+        /// 相关委外工单
+        /// </summary>
+        public const string WyMorder = "相关委外工单";
+        /// <summary>
+        /// 计划工单
+        /// </summary>
+        public const string JhMorder = "计划工单";
+        /// <summary>
+        /// 销售工单
+        /// </summary>
+        public const string XsMorder = "销售工单";
+        /// <summary>
+        /// 委外工单
+        /// </summary>
+        public const string WwMorder = "委外工单";
+        /// <summary>
+        /// 预测工单
+        /// </summary>
+        public const string YcMorder = "预测工单";
+        /// <summary>
+        /// 发货工单
+        /// </summary>
+        public const string FhMorder = "发货工单";
+        /// <summary>
+        /// 试产工单
+        /// </summary>
+        public const string ScMorder = "试产工单";
+        /// <summary>
+        /// 备库工单
+        /// </summary>
+        public const string BkMorder = "备库工单";
+        /// <summary>
+        /// 常规工单
+        /// </summary>
+        public const string CgMorder = "常规工单";
+        /// <summary>
+        /// 返工工单
+        /// </summary>
+        public const string FgMorder = "返工工单";
+        /// <summary>
+        /// 初始
+        /// </summary>
+        public const string Initial_state = "初始";
+        /// <summary>
+        /// 下达
+        /// </summary>
+        public const string Xd_state = "下达";
+        /// <summary>
+        /// 暂停
+        /// </summary>
+        public const string Suspend_state = "暂停";
+        /// <summary>
+        /// 完成
+        /// </summary>
+        public const string Accomplish_state = "完成";
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        public const string Close_state = "关闭";
+    }
+}