|
|
@@ -2966,7 +2966,7 @@ namespace Business.ResourceExamineManagement
|
|
|
/// <returns></returns>
|
|
|
public async Task<string> ProduceDayPlanKittingCheck(string startime,string endtime,string domain, string userAccount)
|
|
|
{
|
|
|
- DateTime stime = DateTime.Now.AddDays(1).Date;
|
|
|
+ /*DateTime stime = DateTime.Now.AddMonths(1).Date;
|
|
|
if (!string.IsNullOrEmpty(startime))
|
|
|
{
|
|
|
DateTime.TryParse(startime, out stime);
|
|
|
@@ -2975,9 +2975,10 @@ namespace Business.ResourceExamineManagement
|
|
|
if (!string.IsNullOrEmpty(endtime))
|
|
|
{
|
|
|
DateTime.TryParse(endtime, out etime);
|
|
|
- }
|
|
|
+ }*/
|
|
|
List<string> tsWork = new List<string> { "test", "tcn", "rw" };
|
|
|
- var ordlist = _workOrdMaster.Select(x => x.Domain == domain && x.OrdDate>= stime && x.OrdDate <= etime && (string.IsNullOrEmpty(x.Typed) == true || tsWork.Contains(x.Typed)) && (x.Status.ToLower() == "p" || x.Status.ToLower() == "r")).ToList();
|
|
|
+ //var ordlist = _workOrdMaster.Select(x => x.Domain == domain && x.OrdDate>= stime && x.OrdDate <= etime && (string.IsNullOrEmpty(x.Typed) == true || tsWork.Contains(x.Typed)) && (x.Status.ToLower() == "p" || x.Status.ToLower() == "r")).ToList();
|
|
|
+ var ordlist = _workOrdMaster.Select(x => x.Domain == domain && (string.IsNullOrEmpty(x.Typed) == true || tsWork.Contains(x.Typed)) && (x.Status.ToLower() == "p" || x.Status.ToLower() == "r")).ToList();
|
|
|
|
|
|
//根据排产日计划来获取
|
|
|
var periodSd = _periodSequenceDet.Select(s => s.Domain == domain && ordlist.Select(x => x.WorkOrd).Contains(s.WorkOrds)).ToList();
|