| | |
| | | /// </summary> |
| | | /// <param name="query">包含工单ID和工单号的查询条件</param> |
| | | /// <returns>工单详细信息</returns> |
| | | public VOrder GetWomdaaById(OrderMachineDto query) |
| | | public VOrdrerBycl GetWomdaaById(OrderMachineDto query) |
| | | { |
| | | var date = DateTime.Now.ToString("yyyy-MM-dd"); |
| | | |
| | |
| | | .Where(b => b.OrderNo == query.orderNo && b.EditDate == date) |
| | | .Count(); |
| | | |
| | | var vOrder = Db.Queryable<VOrder>() |
| | | var VOrdrerBycl = Db.Queryable<VOrdrerBycl>() |
| | | .Where(s => s.ID == query.OrderId) |
| | | .WhereIF(count > 0, s => s.EditDate == date) |
| | | .OrderByDescending(s => s.workStartDate).First(); |
| | | |
| | | if (vOrder == null) return null; |
| | | if (VOrdrerBycl == null) return null; |
| | | |
| | | vOrder.YJQTY ??= 0; |
| | | VOrdrerBycl.YJQTY ??= 0; |
| | | |
| | | var mesOrderSelect = Db.Queryable<MesOrderSelect>() |
| | | .Where(a => a.OrderId == vOrder.ID |
| | | .Where(a => a.OrderId == VOrdrerBycl.ID |
| | | && a.IsShow == 0).First(); |
| | | |
| | | vOrder.todayRunTime = 0; |
| | | vOrder.TodayFaultNum = 0; |
| | | VOrdrerBycl.todayRunTime = 0; |
| | | VOrdrerBycl.TodayFaultNum = 0; |
| | | |
| | | if (mesOrderSelect != null) |
| | | { |
| | | vOrder.todayRunTime = mesOrderSelect.TjTime; |
| | | vOrder.TodayFaultNum = mesOrderSelect.TjCount; |
| | | VOrdrerBycl.todayRunTime = mesOrderSelect.TjTime; |
| | | VOrdrerBycl.TodayFaultNum = mesOrderSelect.TjCount; |
| | | |
| | | if (mesOrderSelect.TjTime is null or 0) |
| | | { |
| | | vOrder.JDL = 100; |
| | | VOrdrerBycl.JDL = 100; |
| | | } |
| | | else |
| | | { |
| | | var round = Math.Round(mesOrderSelect.TjTime.Value / 1440, 2); |
| | | var round1 = (1 - round) * 100; |
| | | vOrder.JDL = round1; |
| | | VOrdrerBycl.JDL = round1; |
| | | } |
| | | } |
| | | |
| | | vOrder.wjQty = vOrder.Daa008 - vOrder.Daa011; |
| | | VOrdrerBycl.wjQty = VOrdrerBycl.Daa008 - VOrdrerBycl.Daa011; |
| | | |
| | | //DevMachine |
| | | var devMachine = Db.Queryable<DevMacBycl>() |
| | | .Where(s => s.MachineNo == vOrder.MachineNo) |
| | | .Where(s => s.MachineNo == VOrdrerBycl.MachineNo) |
| | | .First(); |
| | | |
| | | |
| | |
| | | |
| | | var sqlQuerySingle = Db.Ado.SqlQuerySingle<string>(sql); |
| | | |
| | | vOrder.finalResult = sqlQuerySingle; |
| | | VOrdrerBycl.finalResult = sqlQuerySingle; |
| | | |
| | | return vOrder; |
| | | return VOrdrerBycl; |
| | | } |
| | | |
| | | /// <summary> |