|
@@ -1,11 +1,7 @@
|
|
|
using SqlSugar;
|
|
|
using System;
|
|
|
using System.Collections.Generic;
|
|
|
-using System.ComponentModel;
|
|
|
-using System.Diagnostics;
|
|
|
-using System.Drawing;
|
|
|
using System.Linq;
|
|
|
-using System.Text;
|
|
|
using wms.sqlsugar.model.sx;
|
|
|
using Wms.Screen.DataService.Interface;
|
|
|
using Wms.Screen.Dto.ZhongTian;
|
|
@@ -13,7 +9,6 @@ using Wms.Screen.Dto.ZhongTian.Request;
|
|
|
using Wms.Screen.Dto.ZhongTian.Response;
|
|
|
using Wms.Screen.SqlSugar.ZhongTian;
|
|
|
using Wms.Screen.SqlSugar.ZhongTian.SX;
|
|
|
-using static Dm.net.buffer.ByteArrayBuffer;
|
|
|
using BillInvnow = wms.sqlsugar.model.sx.BillInvnow;
|
|
|
using WCS_TaskOld = wms.sqlsugar.model.sx.WCS_TaskOld;
|
|
|
|
|
@@ -236,33 +231,28 @@ namespace Wms.Screen.DataService.Impl
|
|
|
var TorschkDate = _db.Queryable<SysConfig>().Where(p => p.Code == "TorsChkDateCount").First();
|
|
|
var time1 = decimal.Parse(TorschkDate.SContent);
|
|
|
var time2 = decimal.Parse(TorschkDate.Default1);
|
|
|
-
|
|
|
+ var startTime = DateTime.Now.Date.AddDays(-1).AddMilliseconds(-1);
|
|
|
//库中满足时效待检测盘
|
|
|
result.TorTobe = _db.Queryable<BillInvnow, BaseWarecell>((billInvnow, warecell) => new object[] {
|
|
|
JoinType.Inner,billInvnow.ContGrpId == warecell.ContGrpId }).With(SqlWith.NoLock)
|
|
|
.Where((billInvnow, warecell) => billInvnow.IsTorsChk == true)
|
|
|
- .Where((billInvnow, warecell) => billInvnow.InvStateCode == "InvEcecState_In" && !billInvnow.InDocsNo.Contains("CHA") && billInvnow.ContUsageQty <= 0 && billInvnow.TorsChkQty < 1).ToList()
|
|
|
- .Where((billInvnow, warecell) => // Math.Abs(decimal.Parse((DateTime.Now - billInvnow.ProductTime).TotalHours.ToString())) <= billInvnow.HoldTime + time1
|
|
|
- Math.Abs(decimal.Parse((DateTime.Now - billInvnow.ProductTime).TotalHours.ToString())) >= billInvnow.HoldTime - time2)
|
|
|
+ .Where((billInvnow, warecell) => billInvnow.InvStateCode == "InvEcecState_In" && !billInvnow.ProductMachCode.Contains("R") && billInvnow.ContUsageQty <= 0 && billInvnow.TorsChkQty < 1).ToList()
|
|
|
+ .Where((billInvnow, warecell) => billInvnow.ProductTime <= startTime)
|
|
|
.Count();
|
|
|
//库中未满足时效待检测盘
|
|
|
result.TorNoTobe = _db.Queryable<BillInvnow, BaseWarecell>((billInvnow, warecell) => new object[] {
|
|
|
JoinType.Inner,billInvnow.ContGrpId == warecell.ContGrpId }).With(SqlWith.NoLock)
|
|
|
.Where((billInvnow, warecell) => billInvnow.IsTorsChk == true)
|
|
|
- .Where((billInvnow, warecell) => billInvnow.InvStateCode == "InvEcecState_In" && !billInvnow.InDocsNo.Contains("CHA") && billInvnow.ContUsageQty <= 0 && billInvnow.TorsChkQty < 1).ToList()
|
|
|
- .Where((billInvnow, warecell) => ( //Math.Abs(decimal.Parse((DateTime.Now - billInvnow.ProductTime).TotalHours.ToString())) > billInvnow.HoldTime + time1
|
|
|
- Math.Abs(decimal.Parse((DateTime.Now - billInvnow.ProductTime).TotalHours.ToString())) < billInvnow.HoldTime - time2))
|
|
|
+ .Where((billInvnow, warecell) => billInvnow.InvStateCode == "InvEcecState_In" && !billInvnow.ProductMachCode.Contains("R") && billInvnow.ContUsageQty <= 0 && billInvnow.TorsChkQty < 1).ToList()
|
|
|
+ .Where((billInvnow, warecell) => billInvnow.ProductTime > startTime)
|
|
|
.Count();
|
|
|
|
|
|
//库中未满足时效待检测盘(今天出库检测)
|
|
|
result.TodayTorNoTobe = _db.Queryable<BillInvnow, BaseWarecell>((billInvnow, warecell) => new object[] {
|
|
|
JoinType.Inner,billInvnow.ContGrpId == warecell.ContGrpId }).With(SqlWith.NoLock)
|
|
|
.Where((billInvnow, warecell) => billInvnow.IsTorsChk == true)
|
|
|
- .Where((billInvnow, warecell) => billInvnow.InvStateCode == "InvEcecState_In" && !billInvnow.InDocsNo.Contains("CHA") && billInvnow.ContUsageQty <= 0 && billInvnow.TorsChkQty < 1).ToList()
|
|
|
- .Where((billInvnow, warecell) => //(Math.Abs(decimal.Parse((DateTime.Now - billInvnow.ProductTime).TotalHours.ToString())) > billInvnow.HoldTime + time1
|
|
|
- Math.Abs(decimal.Parse((DateTime.Now - billInvnow.ProductTime).TotalHours.ToString())) < billInvnow.HoldTime - time2
|
|
|
- )
|
|
|
- .Where((billInvnow, warecell) => billInvnow.ProductTime >= DateTime.Now.Date.AddDays(-2).AddHours(13) && billInvnow.ProductTime <= DateTime.Now.Date.AddDays(-1).AddHours(8))
|
|
|
+ .Where((billInvnow, warecell) => billInvnow.InvStateCode == "InvEcecState_In" && !billInvnow.ProductMachCode.Contains("R") && billInvnow.ContUsageQty <= 0 && billInvnow.TorsChkQty < 1).ToList()
|
|
|
+ .Where((billInvnow, warecell) => billInvnow.ProductTime <= startTime)
|
|
|
.Count();
|
|
|
|
|
|
result.ToroOuting = _db.Queryable<WCS_TaskOld>().With(SqlWith.NoLock).Where(p => p.Status != (int)TaskStatus.Finish && p.Status != (int)TaskStatus.Cancel && p.BusType == "扭转检测")
|
|
@@ -277,11 +267,6 @@ namespace Wms.Screen.DataService.Impl
|
|
|
.Where((inv, cell) => cell.IsStop == 0 && cell.StateNum == 2 && ((inv.ProductMachCode.Contains("R") && inv.OneInTime < DateTime.Now.AddHours(-72))
|
|
|
|| (!inv.ProductMachCode.Contains("R") && inv.ProductTime < DateTime.Now.AddHours(-72))))
|
|
|
.ToList().Count;
|
|
|
- //result.TimeOuthw = _db.Queryable<BillInvnow, BaseWarecell>((billInvnow, warecell) => new object[] {
|
|
|
- // JoinType.Inner,billInvnow.ContGrpId == warecell.ContGrpId }).With(SqlWith.NoLock)
|
|
|
- // .Where((billInvnow, warecell) => (DateTime.Now - billInvnow.ProductTime).TotalHours >= 72 && !billInvnow.InDocsNo.Contains("CHA") && billInvnow.IsMulti == false)
|
|
|
- // .Where((billInvnow, warecell) => billInvnow.InvStateCode == "InvEcecState_In" && !billInvnow.AddWho.Contains("测试"))
|
|
|
- // .Count();
|
|
|
|
|
|
return result;
|
|
|
}
|