222

schangxiang@126.com

2024-11-30 6143bf1429551edd4d71f45b120bc99689031e40

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsRbLineTask/WmsRbLineTaskService.cs

@@ -227,30 +227,14 @@
                throw Oops.Oh($"第{index}行[长]{_Length}不能为空！");
            }

            //if(!string.IsNullOrEmpty(_Length))
            //{
            //      addItem.Length = (float)(_Length.Trim());
            // }

            //if (string.IsNullOrEmpty(_Width))
            //{
            //  throw Oops.Oh($"第{index}行[宽]{_Width}不能为空！");
            //}

            //if(!string.IsNullOrEmpty(_Width))
            //{
            //      addItem.Width = (float)(_Width.Trim());
            // }

            if (string.IsNullOrEmpty(_Thk))
            {
                throw Oops.Oh($"第{index}行[厚]{_Thk}不能为空！");
            }

            //if(!string.IsNullOrEmpty(_Thk))
            //{
            //      addItem.Thk = (float)(_Thk.Trim());
            // }
                       

            if (string.IsNullOrEmpty(_PlanNo))
            {
@@ -349,11 +333,11 @@
            }
            if (!string.IsNullOrEmpty(_IssueTime))
            {
                addItem.IssueTime = Convert.ToDateTime(Convert.ToDateTime(_IssueTime.Trim()).ToShortDateString());
                                addItem.IssueTime =   Convert.ToDateTime(_IssueTime.Trim());
            }
            if (!string.IsNullOrEmpty(_FinishedTime))
            {
                addItem.FinishedTime = Convert.ToDateTime(Convert.ToDateTime(_FinishedTime.Trim()).ToShortDateString());
                                addItem.FinishedTime =   Convert.ToDateTime(_FinishedTime.Trim());
            }

            if (string.IsNullOrEmpty(_IsFlagFinish))
@@ -442,22 +426,22 @@
            .Select<WmsRbLineTaskOutput>();
        if (input.IssueTimeRange != null && input.IssueTimeRange.Count > 0)
        {
            DateTime? start = input.IssueTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.IssueTime > start);
            DateTime? start= input.IssueTimeRange[0].Value;
            query = query.WhereIF(start.HasValue, u => u.IssueTime >= start);
            if (input.IssueTimeRange.Count > 1 && input.IssueTimeRange[1].HasValue)
            {
                var end = input.IssueTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.IssueTime < end);
                var end = input.IssueTimeRange[1].Value;
                query = query.Where(u => u.IssueTime <= end);
            }
        }
        if (input.FinishedTimeRange != null && input.FinishedTimeRange.Count > 0)
        {
            DateTime? start = input.FinishedTimeRange[0].Value.AddDays(-1);
            query = query.WhereIF(start.HasValue, u => u.FinishedTime > start);
            DateTime? start= input.FinishedTimeRange[0].Value;
            query = query.WhereIF(start.HasValue, u => u.FinishedTime >= start);
            if (input.FinishedTimeRange.Count > 1 && input.FinishedTimeRange[1].HasValue)
            {
                var end = input.FinishedTimeRange[1].Value.AddDays(1);
                query = query.Where(u => u.FinishedTime < end);
                var end = input.FinishedTimeRange[1].Value;
                query = query.Where(u => u.FinishedTime <= end);
            }
        }
        return query;