|
|
@@ -233,7 +233,7 @@ namespace Business.ResourceExamineManagement
|
|
|
_morderAppService.mo_Mes_Moentry = moentriesList;//工单子表
|
|
|
_morderAppService.mo_Mes_Mooccupies = mooccupyAllList;//工单占用
|
|
|
List<mo_mes_mooccupy> mooccupylist = new List<mo_mes_mooccupy>();
|
|
|
- if (param.checkflag && morder_type == MorderEnum.XsMorder)
|
|
|
+ if (param.checkflag && morder_type == MorderEnum.XsMorder && !LongPeriod)
|
|
|
{
|
|
|
//工单检查无需检查在制
|
|
|
mooccupylist = _morderAppService.CheckMorder(level1Dto.item_number, level1Dto.lack_qty, plan_date.GetValueOrDefault(), sentrys, ic_item, bangid);
|
|
|
@@ -722,7 +722,7 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
|
var ic_item = icitemlist.Find(s => s.mysql_id == item.item_id);
|
|
|
List<mo_mes_mooccupy> mooccupylist = new List<mo_mes_mooccupy>();
|
|
|
- if (param.checkflag || param.checkPlan)
|
|
|
+ if ((param.checkflag || param.checkPlan) && !LongPeriod)
|
|
|
{
|
|
|
mooccupylist = _morderAppService.CheckMorder(item.item_number, item.lack_qty, plan_date.GetValueOrDefault(), sentrys, ic_item, bangid, mes_morder);
|
|
|
}
|
|
|
@@ -1287,7 +1287,7 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
|
var ic_item = icitemlist.Find(s => s.mysql_id == sct.item_id);
|
|
|
List<mo_mes_mooccupy> mooccupylist = new List<mo_mes_mooccupy>();
|
|
|
- if (param.checkflag || param.checkPlan)
|
|
|
+ if ((param.checkflag || param.checkPlan) && !LongPeriod)
|
|
|
{
|
|
|
mooccupylist = _morderAppService.CheckMorder(sct.item_number, sct.lack_qty, dateTime, sentrys, ic_item, bangid, mes_morder);
|
|
|
}
|
|
|
@@ -1962,6 +1962,10 @@ namespace Business.ResourceExamineManagement
|
|
|
/// </summary>
|
|
|
public decimal CalcInTransit(crm_seorderentry sentrys, BomChildExamineDto item, long bangid, DateTime plan_date)
|
|
|
{
|
|
|
+ if (!LongPeriod)
|
|
|
+ {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
_purchaseOrderAppService.mo_Srm_Po_Lists = srm_Po_Lists; //采购明细
|
|
|
_purchaseOrderAppService.srm_Po_Occupies = srm_Po_Occupies; //采购明细
|
|
|
_purchaseOrderAppService.srm_Pr_Mains = srm_Pr_Mains;//在途PR
|
