Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

MicroServices/Business/Business.Application/ResourceExamineManagement/ProductExamineAppService.cs

@@ -80,7 +80,7 @@ namespace Business.ResourceExamineManagement
                 throw new NotImplementedException("工序数据不存在，请调整！");
             }
             //1.4、获取工位数据
-            List<mo_mes_tech_proc_workshop> curWorkShops = tech_Proc_Workshops.Where(p=> curTechProcess.Select(m=>m.mysql_id).Contains(p.tech_proc_id.GetValueOrDefault())).ToList(); ;
+            List<mo_mes_tech_proc_workshop> curWorkShops = tech_Proc_Workshops.Where(p=> curTechProcess.Select(m=>m.mysql_id).Contains(p.tech_proc_id)).ToList(); ;
 
             //2、获取工艺路径下的第一层级工序：目前只考虑第一层级
             List<mo_mes_tech_process> fistLevels = curTechProcess.Where(p => p.parentprocid == curTech.mysql_id).ToList();
@@ -109,7 +109,7 @@ namespace Business.ResourceExamineManagement
             //获取下一步工序id
             List<long> nextProcIds = processes.Where(p=>p.nextprocid != null).Select(p => p.nextprocid.GetValueOrDefault()).ToList();
             //获取起点工序
-            var startProcs = processes.Where(p => !nextProcIds.Contains(p.proc_id.GetValueOrDefault())).ToList();
+            var startProcs = processes.Where(p => !nextProcIds.Contains(p.proc_id)).ToList();
             //递归处理工序返回值
             List<mo_mes_tech_process> rtnList;
             for (int i = 0; i < startProcs.Count; i++)
@@ -191,8 +191,8 @@ namespace Business.ResourceExamineManagement
             //记录当前工序耗时
             StartTimeDto dto = new StartTimeDto();
             //添加耗时记录
-            dto.tech_id = proc.tech_id.GetValueOrDefault();
-            dto.proc_id = proc.proc_id.GetValueOrDefault();
+            dto.tech_id = proc.tech_id;
+            dto.proc_id = proc.proc_id;
             dto.nextproc_id = proc.nextprocid;
             if (proc.wctype == 1)//人工型:数量/uph(一小时生产数量)*60(小时转换为分钟)/wsinuse(工位数)
             {
@@ -239,8 +239,8 @@ namespace Business.ResourceExamineManagement
             {
                 dto = new StartTimeDto();
                 //添加耗时记录
-                dto.tech_id = chd.tech_id.GetValueOrDefault();
-                dto.proc_id = chd.proc_id.GetValueOrDefault();
+                dto.tech_id = chd.tech_id;
+                dto.proc_id = chd.proc_id;
                 dto.nextproc_id = chd.nextprocid;
 
                 //计算当前工序生产耗时

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -381,19 +381,19 @@ namespace Business.ResourceExamineManagement
             }
 
             //1.2、获取工艺路径关联工序数据
-            List<mo_mes_tech_process> tech_Processes = await _mes_tech_process.GetManyByCondition(p => techs.Select(m => m.mysql_id).ToList().Contains(p.tech_id.GetValueOrDefault()) && p.tenant_id == param.tenantId && p.factory_id == param.factoryId && !p.IsDeleted);
+            List<mo_mes_tech_process> tech_Processes = await _mes_tech_process.GetManyByCondition(p => techs.Select(m => m.mysql_id).ToList().Contains(p.tech_id) && p.tenant_id == param.tenantId && p.factory_id == param.factoryId && !p.IsDeleted);
             if (tech_Processes.Count == 0)
             {
                 throw new NotImplementedException("请先配置工序！");
             }
 
             //1.3、获取当前工艺路径下的工序数据
-            List<long> procIds = tech_Processes.Select(m => m.proc_id.GetValueOrDefault()).ToList();
+            List<long> procIds = tech_Processes.Select(m => m.proc_id).ToList();
             List<mo_mes_process> process = await _mes_process.GetManyByCondition(p => procIds.Contains(p.mysql_id) && p.tenant_id == param.tenantId && p.factory_id == param.factoryId && !p.IsDeleted);
 
             //1.3、获取工艺工序关联工位信息
             List<long> techProcIds = tech_Processes.Select(m => m.mysql_id).ToList();
-            List<mo_mes_tech_proc_workshop> tech_Proc_Workshops = await _mes_tech_proc_workshop.GetManyByCondition(p => techProcIds.Contains(p.tech_proc_id.Value) && p.tenant_id == param.tenantId && p.factory_id == param.factoryId && !p.IsDeleted);
+            List<mo_mes_tech_proc_workshop> tech_Proc_Workshops = await _mes_tech_proc_workshop.GetManyByCondition(p => techProcIds.Contains(p.tech_proc_id) && p.tenant_id == param.tenantId && p.factory_id == param.factoryId && !p.IsDeleted);
             //主工单
             List<mo_mes_morder> mo_Mes_Morders = await _mes_morder.GetManyByCondition(x => boms.Select(p => p.bom_number).Contains(x.bom_number) && (x.morder_state != MorderEnum.Accomplish_state || x.morder_state != MorderEnum.Close_state
           && x.morder_icitem_type != MorderEnum.XgwyMorder) && !x.IsDeleted && x.tenant_id == param.tenantId && x.bang_id == bangid);

MicroServices/Business/Bussiness.MongoModel/Tech/mo_mes_tech_proc_workshop.cs

@@ -25,14 +25,14 @@ namespace Bussiness.MongoModel.Tech
         /// </summary>
         [Required]
         [Comment("工艺工序id")]
-        public long? tech_proc_id { get; set; }
+        public long tech_proc_id { get; set; }
 
         /// <summary>
         /// 工位id
         /// </summary>
         [Required]
         [Comment("工位id")]
-        public long? workshop_id { get; set; }
+        public long workshop_id { get; set; }
 
         /// <summary>
         /// 序列号

MicroServices/Business/Bussiness.MongoModel/Tech/mo_mes_tech_process.cs

@@ -25,14 +25,14 @@ namespace Bussiness.MongoModel.Tech
         /// </summary>
         [Required]
         [Comment("工艺主键")]
-        public long? tech_id { get; set; }
+        public long tech_id { get; set; }
 
         /// <summary>
         /// 工序主键
         /// </summary>
         [Required]
         [Comment("工序主键")]
-        public long? proc_id { get; set; }
+        public long proc_id { get; set; }
 
         /// <summary>
         /// 组合层级