From d8ae39b2bafce2556e61b1686358924d498be95a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 08 6月 2024 14:31:21 +0800
Subject: [PATCH] 优化界面
---
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs | 83 ++++++++-----
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs | 1
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessInput.cs | 8 +
iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs | 210 +++++++++++++++++++---------------
iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml | 25 ++++
iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/iWare.Wms.EntityFramework.Core.csproj | 4
iWara.SCADA.Code/iWare.Wms.Application/Service/YieldAnalysis/YieldAnalysisService.cs | 1
7 files changed, 202 insertions(+), 130 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs
index 22d7ebb..a3c2b34 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceOutbound/WorkPieceOutboundService.cs
@@ -18,6 +18,7 @@
//[Route("api")]
[ApiDescriptionSettings("鑷繁鐨勪笟鍔�", Name = "WorkPieceOutbound", Order = 100)]
[Route("api/[Controller]")]
+ [DisableOpLog]
public class WorkPieceOutboundService : IWorkPieceOutboundService, IDynamicApiController, ITransient
{
private readonly IRepository<WorkPieceOutbound,MasterDbContextLocator> _workPieceOutboundRep;
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessInput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessInput.cs
index 08c690b..8032785 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessInput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessInput.cs
@@ -25,7 +25,13 @@
/// 宸ヤ欢鍙�
/// </summary>
public virtual string WorkPieceID { get; set; }
-
+
+
+ /// <summary>
+ /// 鎴愬搧鐮�
+ /// </summary>
+ public virtual string OP80NewCode { get; set; }
+
/// <summary>
/// 褰撳墠璁惧
/// </summary>
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs
index 6dd3bee..b4a0dec 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/WorkPieceProcessOutput.cs
@@ -32,6 +32,11 @@
public string WorkPieceID { get; set; }
/// <summary>
+ /// 鎴愬搧鐮�
+ /// </summary>
+ public virtual string OP80NewCode { get; set; }
+
+ /// <summary>
/// 褰撳墠宸ュ簭
/// </summary>
public string WorkingProcedureCurrent { get; set; }
@@ -174,119 +179,123 @@
/// </summary>
[Description("宸ヤ欢鍔犲伐杩芥函淇℃伅(宸ヤ欢+宸ュ簭)")]
public class WorkPieceProcessExcelOutput
+ {
+ /// <summary>
+ /// 宸ヤ欢鍙�
+ /// </summary>
+ [Description("宸ヤ欢鍙�")]
+ public string WorkPieceID { get; set; }
+
+ /// <summary>
+ /// 褰撳墠宸ュ簭
+ /// </summary>
+ [Description("褰撳墠宸ュ簭")]
+ public string WorkingProcedureCurrent { get; set; }
+
+ /// <summary>
+ /// 璁惧鍚嶇О
+ /// </summary>
+ [Description("璁惧鍚嶇О")]
+ public string EquipmentName { get; set; }
+
+ /// <summary>
+ /// 宸ュ簭涓婄嚎鏃堕棿
+ /// </summary>
+ [Description("涓婄嚎鏃堕棿")]
+ public string StartTime { get; set; }
+
+ private string m_EndTime = "";
+ /// <summary>
+ /// 宸ュ簭涓嬬嚎鏃堕棿
+ /// </summary>
+ [Description("涓嬬嚎鏃堕棿")]
+ public string EndTime
{
- /// <summary>
- /// 宸ヤ欢鍙�
- /// </summary>
- [Description("宸ヤ欢鍙�")]
- public string WorkPieceID { get; set; }
-
- /// <summary>
- /// 褰撳墠宸ュ簭
- /// </summary>
- [Description("褰撳墠宸ュ簭")]
- public string WorkingProcedureCurrent { get; set; }
-
- /// <summary>
- /// 璁惧鍚嶇О
- /// </summary>
- [Description("璁惧鍚嶇О")]
- public string EquipmentName { get; set; }
-
- /// <summary>
- /// 宸ュ簭涓婄嚎鏃堕棿
- /// </summary>
- [Description("涓婄嚎鏃堕棿")]
- public string StartTime { get; set; }
-
- private string m_EndTime = "";
- /// <summary>
- /// 宸ュ簭涓嬬嚎鏃堕棿
- /// </summary>
- [Description("涓嬬嚎鏃堕棿")]
- public string EndTime
+ get
{
- get
+ if (string.IsNullOrEmpty(m_EndTime))
{
- if (string.IsNullOrEmpty(m_EndTime))
- {
- return "";
- }
-
- if (m_EndTime.Contains("0001-01-01"))
- {
- return "";
- }
- else
- {
- return m_EndTime;
- }
+ return "";
}
- set { m_EndTime = value; }
- }
- /// <summary>
- /// 鍔犲伐鏃堕暱
- /// </summary>
- [Description("鍔犲伐鏃堕暱")]
- public string TimeSceonds
- {
- get
+ if (m_EndTime.Contains("0001-01-01"))
{
- if (string.IsNullOrEmpty(EndTime) || string.IsNullOrEmpty(StartTime))
- {
- return "";
- }
-
- TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);
-
- return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
+ return "";
+ }
+ else
+ {
+ return m_EndTime;
}
}
+ set { m_EndTime = value; }
+ }
- /// <summary>
- /// 璐ㄩ噺鐘舵��
- /// </summary>
- public int QualityState { get; set; }
- /// <summary>
- /// 璐ㄩ噺鐘舵�佸悕绉�
- /// </summary>
- [Description("璐ㄩ噺鐘舵��")]
- public string QualityStateName
+ /// <summary>
+ /// 鍔犲伐鏃堕暱
+ /// </summary>
+ [Description("鍔犲伐鏃堕暱")]
+ public string TimeSceonds
+ {
+ get
{
- get
+ if (string.IsNullOrEmpty(EndTime) || string.IsNullOrEmpty(StartTime))
{
- if (1 == QualityState)
- {
- return "鍚堟牸";
+ return "";
+ }
- }
- else if (2 == QualityState)
- {
+ TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime);
- return "涓嶅悎鏍�";
- }
- else if (3 == QualityState)
- {
+ return Convert.ToInt32(ts.TotalMinutes).ToString() + "min";
+ }
+ }
- return "鐤戜技";
- }
- else
- {
- return "";
- }
+ /// <summary>
+ /// 璐ㄩ噺鐘舵��
+ /// </summary>
+ public int QualityState { get; set; }
+ /// <summary>
+ /// 璐ㄩ噺鐘舵�佸悕绉�
+ /// </summary>
+ [Description("璐ㄩ噺鐘舵��")]
+ public string QualityStateName
+ {
+ get
+ {
+ if (1 == QualityState)
+ {
+ return "鍚堟牸";
+
+ }
+ else if (2 == QualityState)
+ {
+
+ return "涓嶅悎鏍�";
+ }
+ else if (3 == QualityState)
+ {
+
+ return "鐤戜技";
+ }
+ else
+ {
+ return "";
}
}
+ }
+ /// <summary>
+ /// 鎴愬搧鐮�
+ /// </summary>
+ [Description("鎴愬搧鐮�")]
+ public string OP80NewCode { get; set; }
-
- /// <summary>
- /// Id涓婚敭
- /// </summary>
- public long Id { get; set; }
+ /// <summary>
+ /// Id涓婚敭
+ /// </summary>
+ public long Id { get; set; }
/// <summary>
/// 鍒涘缓浜�
/// </summary>
- [Description("淇℃伅鏉ユ簮")]
+ [Description("鏁版嵁鏉ユ簮")]
public string CreateUserName { get; set; }
}
@@ -327,6 +336,12 @@
/// 宸ヤ欢鍙�
/// </summary>
public string WorkPieceID { get; set; }
+
+
+ /// <summary>
+ /// 鎴愬搧鐮�
+ /// </summary>
+ public virtual string OP80NewCode { get; set; }
/// <summary>
/// 褰撳墠宸ュ簭
@@ -692,7 +707,7 @@
/// <summary>
/// 璐ㄩ噺鐘舵��
/// </summary>
- public int? QualityState { get; set; }
+ private int? QualityState { get; set; }
/// <summary>
/// 璐ㄩ噺鐘舵�佸悕瀛�
@@ -724,6 +739,13 @@
}
}
+
+ /// <summary>
+ /// 鎴愬搧鐮�
+ /// </summary>
+ [Description("鎴愬搧鐮�")]
+ public string OP80NewCode { get; set; }
+
/// <summary>
/// Id涓婚敭
/// </summary>
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
index e4456f8..035d7d3 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -25,9 +25,10 @@
/// </summary>
[ApiDescriptionSettings("鏁版嵁鏌ヨ鏈嶅姟", Name = "WorkPieceProcess", Order = 100)]
[Route("api/[Controller]")]
+ [DisableOpLog]
public class WorkPieceProcessService : IWorkPieceProcessService, IDynamicApiController, ITransient
{
- private readonly IRepository<WorkPieceProcess,MasterDbContextLocator> _workPieceProcessRep;
+ private readonly IRepository<WorkPieceProcess, MasterDbContextLocator> _workPieceProcessRep;
private readonly IRepository<WorkPieceInfo, MasterDbContextLocator> _workPieceInfoRep;
private readonly IRepository<EquipmentBaseInfo, MasterDbContextLocator> _equipmentBaseInfoRep;
private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
@@ -43,7 +44,7 @@
/// <param name="sysDictTypeRep"></param>
/// <param name="sysDictDataRep"></param>
public WorkPieceProcessService(
- IRepository<WorkPieceProcess,MasterDbContextLocator> workPieceProcessRep,
+ IRepository<WorkPieceProcess, MasterDbContextLocator> workPieceProcessRep,
IRepository<WorkPieceInfo, MasterDbContextLocator> workPieceInfoRep,
IRepository<EquipmentBaseInfo, MasterDbContextLocator> equipmentBaseInfoRep,
IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep,
@@ -74,34 +75,38 @@
// EmployeeName = emp.Name,
// DepartmentName = dept != null ? dept.Name : null
// };
- var workPieceProcesss = await(from process in _workPieceProcessRep.DetachedEntities
- join baseinfo in _equipmentBaseInfoRep.DetachedEntities
- on process.EquipmentID equals baseinfo.EquipmentId into joinedEmpty
- from baseinfo2 in joinedEmpty.DefaultIfEmpty()
- where process.IsDeleted == false && process.WorkPieceID.Contains(string.IsNullOrEmpty(input.WorkPieceID)?"": input.WorkPieceID)
- && process.QualityState == (input.QualityState.HasValue? input.QualityState.Value: process.QualityState)
- && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
- && process.WorkingProcedureCurrent == (string.IsNullOrEmpty(input.WorkingProcedureCurrent) ? process.WorkingProcedureCurrent : input.WorkingProcedureCurrent)
- && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
- && process.OperationType==(string.IsNullOrEmpty(input.OperationType) ? process.OperationType : input.OperationType)
- && !string.IsNullOrEmpty(process.WorkPieceID)
- &&process.StartTime>= (input.StartTimeBeginTime.HasValue?input.StartTimeBeginTime:DateTime.MinValue)
- && process.StartTime <= (input.StartTimeEndTime.HasValue ? input.StartTimeEndTime : DateTime.MaxValue)
- select new WorkPieceProcessOutput
- {
+ var workPieceProcesss = await (from process in _workPieceProcessRep.DetachedEntities
+ join baseinfo in _equipmentBaseInfoRep.DetachedEntities on process.EquipmentID equals baseinfo.EquipmentId into joinedEmpty
+ from baseinfo2 in joinedEmpty.DefaultIfEmpty()
+ join workPiece in _workPieceInfoRep.DetachedEntities on process.WorkPieceID equals workPiece.WorkPieceID into joined2Empty
+ from workPiece2 in joined2Empty.DefaultIfEmpty()
+ where process.IsDeleted == false && process.WorkPieceID.Contains(string.IsNullOrEmpty(input.WorkPieceID) ? "" : input.WorkPieceID)
+ && process.QualityState == (input.QualityState.HasValue ? input.QualityState.Value : process.QualityState)
+ && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
+ && process.WorkingProcedureCurrent == (string.IsNullOrEmpty(input.WorkingProcedureCurrent) ? process.WorkingProcedureCurrent : input.WorkingProcedureCurrent)
+ && workPiece2.OP80NewCode == (string.IsNullOrEmpty(input.OP80NewCode) ? workPiece2.OP80NewCode : input.OP80NewCode)
+ && process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
+ && process.OperationType == (string.IsNullOrEmpty(input.OperationType) ? process.OperationType : input.OperationType)
+ && !string.IsNullOrEmpty(process.WorkPieceID)
+ && process.StartTime >= (input.StartTimeBeginTime.HasValue ? input.StartTimeBeginTime : DateTime.MinValue)
+ && process.StartTime <= (input.StartTimeEndTime.HasValue ? input.StartTimeEndTime : DateTime.MaxValue)
+ select new WorkPieceProcessOutput
+ {
- Id = process.Id,
- WorkPieceID = process.WorkPieceID,
- EquipmentID = process.EquipmentID,
- EquipmentName = (baseinfo2 == null ? "" : baseinfo2.EquipmentName),
- WorkingProcedureCurrent = process.WorkingProcedureCurrent,
- StartTime = process.StartTime,
- EndTime = process.EndTime,
- QualityState = process.QualityState,
- QualityDataInfoID = process.QualityDataInfoID,
- OperationType=process.OperationType,
- CreateUserName=process.CreatedUserName
- }).OrderBy(o=>o.StartTime)
+ Id = process.Id,
+ WorkPieceID = process.WorkPieceID,
+ EquipmentID = process.EquipmentID,
+ EquipmentName = (baseinfo2 == null ? "" : baseinfo2.EquipmentName),
+ OP80NewCode = workPiece2.OP80NewCode,
+
+ WorkingProcedureCurrent = process.WorkingProcedureCurrent,
+ StartTime = process.StartTime,
+ EndTime = process.EndTime,
+ QualityState = process.QualityState,
+ QualityDataInfoID = process.QualityDataInfoID,
+ OperationType = process.OperationType,
+ CreateUserName = process.CreatedUserName
+ }).OrderBy(o => o.StartTime)
.ProjectToType<WorkPieceProcessOutput>()
.ToADPagedListAsync(input.PageNo, input.PageSize);
@@ -174,17 +179,21 @@
join baseinfo in _equipmentBaseInfoRep.DetachedEntities
on process.EquipmentID equals baseinfo.EquipmentId into joinedEmpty
from baseinfo2 in joinedEmpty.DefaultIfEmpty()
+ join workPiece in _workPieceInfoRep.DetachedEntities on process.WorkPieceID equals workPiece.WorkPieceID into joined2Empty
+ from workPiece2 in joined2Empty.DefaultIfEmpty()
where process.IsDeleted == false && process.WorkPieceID.Contains(string.IsNullOrEmpty(input.WorkPieceID) ? "" : input.WorkPieceID)
&& process.QualityState == (input.QualityState.HasValue ? input.QualityState.Value : process.QualityState)
&& process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
&& process.WorkingProcedureCurrent == (string.IsNullOrEmpty(input.WorkingProcedureCurrent) ? process.WorkingProcedureCurrent : input.WorkingProcedureCurrent)
&& process.EquipmentID == (string.IsNullOrEmpty(input.EquipmentID) ? process.EquipmentID : input.EquipmentID)
+ && workPiece2.OP80NewCode == (string.IsNullOrEmpty(input.OP80NewCode) ? workPiece2.OP80NewCode : input.OP80NewCode)
&& process.OperationType == (string.IsNullOrEmpty(input.OperationType) ? process.OperationType : input.OperationType)
&& !string.IsNullOrEmpty(process.WorkPieceID)
&& process.StartTime >= (input.StartTimeBeginTime.HasValue ? input.StartTimeBeginTime : DateTime.MinValue)
&& process.StartTime <= (input.StartTimeEndTime.HasValue ? input.StartTimeEndTime : DateTime.MaxValue)
select new WorkPieceProcessExcelOutput
{
+ OP80NewCode = workPiece2.OP80NewCode,
Id = process.Id,
WorkPieceID = process.WorkPieceID,
@@ -193,8 +202,8 @@
WorkingProcedureCurrent = process.WorkingProcedureCurrent,
StartTime = process.StartTime.ToString(),
EndTime = process.EndTime.ToString(),
- QualityState = process.QualityState,
- CreateUserName=process.CreatedUserName
+ //QualityState = process.QualityState,
+ CreateUserName = process.CreatedUserName
}).OrderBy(o => o.StartTime).Distinct()
.ProjectToType<WorkPieceProcessExcelOutput>()
.ToListAsync();
@@ -227,7 +236,7 @@
foreach (WorkPieceProcessExcelOutput item in workPieceMachiningInfos)
{
- item.StartTime = string.IsNullOrEmpty(item.StartTime) ? "" :Convert.ToDateTime(item.StartTime).ToString("yyyy-MM-dd hh:mm:ss");
+ item.StartTime = string.IsNullOrEmpty(item.StartTime) ? "" : Convert.ToDateTime(item.StartTime).ToString("yyyy-MM-dd hh:mm:ss");
item.EndTime = string.IsNullOrEmpty(item.EndTime) ? "" : Convert.ToDateTime(item.EndTime).ToString("yyyy-MM-dd hh:mm:ss");
}
@@ -255,13 +264,14 @@
.Join(_sysDictTypeRep.DetachedEntities, g => g.f.TypeId, h => h.Id, (f, g) => new { f, g })
.Where(x => (x.g.Code.Equals("workpiece_state") && (string.IsNullOrEmpty(input.WorkPieceState.ToString()) ? true : x.f.f.Code.Equals(input.WorkPieceState.ToString()))))
.Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.f.e.a.WorkPieceID.Contains(input.WorkPieceID))
+ .Where(!string.IsNullOrEmpty(input.OP80NewCode), u => u.f.e.a.OP80NewCode.Contains(input.OP80NewCode))
.Where(!string.IsNullOrEmpty(input.WorkPieceState.ToString()), u => u.f.e.a.WorkPieceState == input.WorkPieceState)
.Where(!string.IsNullOrEmpty(input.EquipmentID), u => u.f.e.a.EquipmentID.Equals(input.EquipmentID))
.Where(!string.IsNullOrEmpty(input.WorkingProcedureCurrent), u => u.f.e.a.WorkingProcedureCurrent.Equals(input.WorkingProcedureCurrent))
.Where(!string.IsNullOrEmpty(input.StartTimeBeginTime.ToString()), u => u.f.e.a.WorkPieceinitOnlineTime >= input.StartTimeBeginTime)
.Where(!string.IsNullOrEmpty(input.StartTimeEndTime.ToString()), u => u.f.e.a.WorkPieceinitOnlineTime <= input.StartTimeEndTime)
.Where(o => !string.IsNullOrEmpty(o.f.e.a.WorkPieceID))
- .Where(o=>o.f.e.a.QualityState== (input.QualityState.HasValue ? input.QualityState.Value : o.f.e.a.QualityState))
+ .Where(o => o.f.e.a.QualityState == (input.QualityState.HasValue ? input.QualityState.Value : o.f.e.a.QualityState))
.Select(s => new WorkPieceInfoMachiningPageOutput
{
Id = s.f.e.a.Id,
@@ -276,7 +286,8 @@
QualityState = s.f.e.a.QualityState,
EquipmentID = s.f.e.a.EquipmentID,
EquipmentName = s.f.e.b.EquipmentName,
- OperationType = "姝ｅ父"
+ OperationType = "姝ｅ父",
+ OP80NewCode = s.f.e.a.OP80NewCode,
})
.OrderBy(PageInputOrder.OrderBuilder<WorkPieceProcessSearch>(input))
.ProjectToType<WorkPieceInfoMachiningPageOutput>()
@@ -299,6 +310,7 @@
.Join(_sysDictTypeRep.DetachedEntities, g => g.f.TypeId, h => h.Id, (f, g) => new { f, g })
.Where(x => (x.g.Code.Equals("workpiece_state") && (string.IsNullOrEmpty(input.WorkPieceState.ToString()) ? true : x.f.f.Code.Equals(input.WorkPieceState.ToString()))))
.Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.f.e.a.WorkPieceID.Contains(input.WorkPieceID))
+ .Where(!string.IsNullOrEmpty(input.OP80NewCode), u => u.f.e.a.OP80NewCode.Contains(input.OP80NewCode))
.Where(!string.IsNullOrEmpty(input.WorkPieceState.ToString()), u => u.f.e.a.WorkPieceState == input.WorkPieceState)
.Where(!string.IsNullOrEmpty(input.EquipmentID), u => u.f.e.a.EquipmentID.Equals(input.EquipmentID))
.Where(!string.IsNullOrEmpty(input.WorkingProcedureCurrent), u => u.f.e.a.WorkingProcedureCurrent.Equals(input.WorkingProcedureCurrent))
@@ -315,7 +327,8 @@
WorkPieceLastOfflineTime = s.f.e.a.WorkPieceLastOfflineTime.ToString(),
WorkPieceStateName = s.f.f.Value,
EquipmentName = s.f.e.b.EquipmentName,
- QualityState = s.f.e.a.QualityState,
+ //QualityState = s.f.e.a.QualityState,
+ OP80NewCode = s.f.e.a.OP80NewCode,
})
.Distinct()
.OrderBy(PageInputOrder.OrderBuilder<WorkPieceProcessSearch>(input))
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/YieldAnalysis/YieldAnalysisService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/YieldAnalysis/YieldAnalysisService.cs
index 14030d9..49d2db1 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/YieldAnalysis/YieldAnalysisService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/YieldAnalysis/YieldAnalysisService.cs
@@ -18,6 +18,7 @@
/// </summary>
[ApiDescriptionSettings("鏁版嵁鏌ヨ鏈嶅姟", Name = "YieldAnalysis", Order = 100)]
[Route("api/[Controller]")]
+ [DisableOpLog]
public class YieldAnalysisService : IYieldAnalysisService, IDynamicApiController, ITransient
{
private readonly IRepository<YieldAnalysis,MasterDbContextLocator> _yieldAnalysisRep;
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
index fe64e71..edcb6e7 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
+++ b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
@@ -14966,6 +14966,11 @@
宸ヤ欢鍙�
</summary>
</member>
+ <member name="P:iWare.Wms.Application.WorkPieceProcessSearch.OP80NewCode">
+ <summary>
+ 鎴愬搧鐮�
+ </summary>
+ </member>
<member name="P:iWare.Wms.Application.WorkPieceProcessSearch.EquipmentID">
<summary>
褰撳墠璁惧
@@ -15091,6 +15096,11 @@
宸ヤ欢鍙�
</summary>
</member>
+ <member name="P:iWare.Wms.Application.WorkPieceProcessOutput.OP80NewCode">
+ <summary>
+ 鎴愬搧鐮�
+ </summary>
+ </member>
<member name="P:iWare.Wms.Application.WorkPieceProcessOutput.WorkingProcedureCurrent">
<summary>
褰撳墠宸ュ簭
@@ -15201,6 +15211,11 @@
璐ㄩ噺鐘舵�佸悕绉�
</summary>
</member>
+ <member name="P:iWare.Wms.Application.WorkPieceProcessExcelOutput.OP80NewCode">
+ <summary>
+ 鎴愬搧鐮�
+ </summary>
+ </member>
<member name="P:iWare.Wms.Application.WorkPieceProcessExcelOutput.Id">
<summary>
Id涓婚敭
@@ -15229,6 +15244,11 @@
<member name="P:iWare.Wms.Application.WorkPieceInfoMachiningPageOutput.WorkPieceID">
<summary>
宸ヤ欢鍙�
+ </summary>
+ </member>
+ <member name="P:iWare.Wms.Application.WorkPieceInfoMachiningPageOutput.OP80NewCode">
+ <summary>
+ 鎴愬搧鐮�
</summary>
</member>
<member name="P:iWare.Wms.Application.WorkPieceInfoMachiningPageOutput.WorkingProcedureCurrent">
@@ -15466,6 +15486,11 @@
璐ㄩ噺鐘舵�佸悕瀛�
</summary>
</member>
+ <member name="P:iWare.Wms.Application.WorkPieceInfoMachiningExcelPageOutput.OP80NewCode">
+ <summary>
+ 鎴愬搧鐮�
+ </summary>
+ </member>
<member name="P:iWare.Wms.Application.WorkPieceInfoMachiningExcelPageOutput.Id">
<summary>
Id涓婚敭
diff --git a/iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/iWare.Wms.EntityFramework.Core.csproj b/iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/iWare.Wms.EntityFramework.Core.csproj
index ceb5a42..6429efa 100644
--- a/iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/iWare.Wms.EntityFramework.Core.csproj
+++ b/iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/iWare.Wms.EntityFramework.Core.csproj
@@ -6,6 +6,10 @@
<Nullable>disable</Nullable>
</PropertyGroup>
+ <ItemGroup>
+ <None Remove="dbsettings.Development.json" />
+ </ItemGroup>
+
<ItemGroup>
<Content Include="dbsettings.Development.json">
--
Gitblit v1.9.3