|
|
@@ -2987,7 +2987,8 @@ namespace Business.ResourceExamineManagement
|
|
|
var rst = await OrderResourceCheck(morders, domain, userAccount);
|
|
|
if (rst == "ok")
|
|
|
{
|
|
|
- var sysSet = _generalizedCodeMaster.Select(s => s.FldName == "SystemConfig" && s.Val == "WorkOrderLockPeriod" && s.Domain == domain).ToList();
|
|
|
+ //屏蔽日期过滤
|
|
|
+ /*var sysSet = _generalizedCodeMaster.Select(s => s.FldName == "SystemConfig" && s.Val == "WorkOrderLockPeriod" && s.Domain == domain).ToList();
|
|
|
decimal lookDay = 0;
|
|
|
if (sysSet.Any())
|
|
|
{
|
|
|
@@ -2995,12 +2996,13 @@ namespace Business.ResourceExamineManagement
|
|
|
lookDay = sysSet[0].UDeci1;
|
|
|
}
|
|
|
lookDay = lookDay == 0 ? 7 : lookDay;
|
|
|
- DateTime lookTime = DateTime.Now.Date.AddDays((double)lookDay);
|
|
|
+ DateTime lookTime = DateTime.Now.Date.AddDays((double)lookDay);*/
|
|
|
|
|
|
string workords = "";
|
|
|
foreach (var mo in morders)
|
|
|
{
|
|
|
- if (mo.MaterialSituation == MorderEnum.CarehouseComplete && mo.morder_state == MorderEnum.Initial_state && mo.moentry_sys_stime.GetValueOrDefault().Date <= lookTime)
|
|
|
+ //if (mo.MaterialSituation == MorderEnum.CarehouseComplete && mo.morder_state == MorderEnum.Initial_state && mo.moentry_sys_stime.GetValueOrDefault().Date <= lookTime)
|
|
|
+ if (mo.MaterialSituation == MorderEnum.CarehouseComplete && mo.morder_state == MorderEnum.Initial_state)
|
|
|
{
|
|
|
workords += "," + mo.morder_no;
|
|
|
//mo.morder_state = MorderEnum.Xd_state;
|