|
|
@@ -2358,7 +2358,7 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
|
mo_Mes_Morders = _mysql_mes_morder.GetListAsync(x => companyid == x.company_id.ToString() && workOrds.Contains(x.morder_no)).Result;
|
|
|
//如果工单有今天和之前的，则提示不处理
|
|
|
- if (mo_Mes_Morders.Where(s => s.moentry_sys_stime >= DateTime.Now.Date).Count() > 0)
|
|
|
+ if (mo_Mes_Morders.Where(s => s.moentry_sys_stime <= DateTime.Now.Date).Count() > 0)
|
|
|
{
|
|
|
return "请选择开工时间在今天之后的工单。";
|
|
|
}
|
|
|
@@ -2764,7 +2764,7 @@ namespace Business.ResourceExamineManagement
|
|
|
ExamineResult dtl = new ExamineResult();
|
|
|
dtl.morder_id = item.Id;
|
|
|
dtl.morder_no = item.morder_no;
|
|
|
-
|
|
|
+ dtl.bangid = bangid;
|
|
|
dtl.order_statr_time = item.start_time;
|
|
|
dtl.bom_number = item.bom_number;
|
|
|
dtl.need_qty = item.need_number.GetValueOrDefault();
|
|
|
@@ -3430,6 +3430,9 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
|
return "当前选择的工单已领料或未排产。";
|
|
|
}
|
|
|
+
|
|
|
+ //增加判断当前工单是否进行过齐套检查，并且是仓库齐套
|
|
|
+
|
|
|
List<NbrMaster> nbrMasterList = new List<NbrMaster>();//需要生成领料单列表
|
|
|
List<NbrDetail> nbrDetailList = new List<NbrDetail>();//需要生成领料单明细列表
|
|
|
|
