From 2954a2dd4529679ff30c1fd08870895c29d507f2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 11 6月 2024 11:06:18 +0800
Subject: [PATCH] OP30工序质量信息添加各工位质量显示
---
iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoOutput.cs | 15 ++
iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs | 104 +++++++++++++-------
iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml | 20 ++++
iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs | 12 ++
iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/iWare.Wms.EntityFramework.Core.csproj | 8 +
iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/EquipmentBaseInfoService.cs | 28 +++++
iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoInput.cs | 15 ++
iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs | 40 ++++---
8 files changed, 188 insertions(+), 54 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoInput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoInput.cs
index cf7542f..fe1bf11 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoInput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoInput.cs
@@ -185,7 +185,20 @@
/// 娓呮礂娑叉洿鎹㈡椂闂�
/// </summary>
public virtual DateTime? Detergentchangetime { get; set; }
-
+
+ /// <summary>
+ /// 娓呮礂娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ /// </summary>
+ [Comment("娓呮礂娑叉坊鍔犳椂闂�")]
+ public DateTime? DetergentAddtime { get; set; }
+
+
+ /// <summary>
+ /// 鍒囧墛娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ /// </summary>
+ [Comment("鍒囧墛娑叉坊鍔犳椂闂�")]
+ public DateTime? CuttingFluidAddTime { get; set; }
+
/// <summary>
/// 娓呮礂娑叉洿鎹㈤璀﹂槇鍊�
/// </summary>
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoOutput.cs
index f7d8e24..99f0b30 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoOutput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoOutput.cs
@@ -55,7 +55,20 @@
/// 娓呮礂娑叉洿鎹㈡椂闂�
/// </summary>
public DateTime? Detergentchangetime { get; set; }
-
+
+ /// <summary>
+ /// 娓呮礂娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ /// </summary>
+ [Comment("娓呮礂娑叉坊鍔犳椂闂�")]
+ public DateTime? DetergentAddtime { get; set; }
+
+
+ /// <summary>
+ /// 鍒囧墛娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ /// </summary>
+ [Comment("鍒囧墛娑叉坊鍔犳椂闂�")]
+ public DateTime? CuttingFluidAddTime { get; set; }
+
/// <summary>
/// 娓呮礂娑叉洿鎹㈤璀﹂槇鍊�
/// </summary>
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/EquipmentBaseInfoService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/EquipmentBaseInfoService.cs
index 4eb2e0c..7414969 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/EquipmentBaseInfoService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/EquipmentBaseInfoService.cs
@@ -110,6 +110,8 @@
Remarks = s.Remarks,
CreatedTime = s.CreatedTime,
TactTime = s.TactTime,
+ DetergentAddtime = s.DetergentAddtime,
+ CuttingFluidAddTime = s.CuttingFluidAddTime,
})
.Distinct()
.OrderBy(PageInputOrder.OrderBuilder<EquipmentBaseInfoSearch>(input))
@@ -295,6 +297,32 @@
};
await _equipmentbaseinfologRep.InsertAsync(log);
}
+ if (isExistObj.DetergentAddtime?.ToString("yyyy-MM-dd") != equipmentBaseInfo.DetergentAddtime?.ToString("yyyy-MM-dd"))
+ {
+ //鏂板缁存姢鏃ュ織
+ var log = new Equipmentbaseinfolog()
+ {
+ EquipmentBaseInfoId = equipmentBaseInfo.Id,
+ EquipmentID = equipmentBaseInfo.EquipmentId,
+ OperatorType = EquipmentbaseinfoOperatorTypeEnum.娓呮礂娑叉坊鍔�,
+ OperatorTypeName = (EquipmentbaseinfoOperatorTypeEnum.娓呮礂娑叉坊鍔�).ToString(),
+ OperatorContent = "娓呮礂娑叉坊鍔犳椂闂�:" + equipmentBaseInfo.DetergentAddtime?.ToString("yyyy-MM-dd"),
+ };
+ await _equipmentbaseinfologRep.InsertAsync(log);
+ }
+ if (isExistObj.CuttingFluidAddTime?.ToString("yyyy-MM-dd") != equipmentBaseInfo.CuttingFluidAddTime?.ToString("yyyy-MM-dd"))
+ {
+ //鏂板缁存姢鏃ュ織
+ var log = new Equipmentbaseinfolog()
+ {
+ EquipmentBaseInfoId = equipmentBaseInfo.Id,
+ EquipmentID = equipmentBaseInfo.EquipmentId,
+ OperatorType = EquipmentbaseinfoOperatorTypeEnum.鍒囧墛娑叉坊鍔�,
+ OperatorTypeName = (EquipmentbaseinfoOperatorTypeEnum.鍒囧墛娑叉坊鍔�).ToString(),
+ OperatorContent = "鍒囧墛娑叉坊鍔犳椂闂�:" + equipmentBaseInfo.CuttingFluidAddTime?.ToString("yyyy-MM-dd"),
+ };
+ await _equipmentbaseinfologRep.InsertAsync(log);
+ }
}
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs
index b794ae3..7bd5320 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs
@@ -43,7 +43,7 @@
/// 宸ヤ欢鍙�
/// </summary>
public string WorkPieceID { get; set; }
-
+
/// <summary>
/// 璁惧
/// </summary>
@@ -53,12 +53,12 @@
/// 璁惧鍚嶇О
/// </summary>
public string EquipmentName { get; set; }
-
+
/// <summary>
/// 宸ュ簭
/// </summary>
public string WorkingProcedure { get; set; }
-
+
/// <summary>
/// 璐ㄩ噺鐘舵��
/// </summary>
@@ -122,27 +122,27 @@
{
get
{
- if(string.IsNullOrEmpty(EquipmentID))
+ if (string.IsNullOrEmpty(EquipmentID))
{
return string.Empty;
}
- string qs = "";
- if(EquipmentID.Equals("EOP10"))
+ string qs = "";
+ if (EquipmentID.Equals("EOP10"))
{
if (string.IsNullOrEmpty(WorkingProcedure))
{
- return (string.IsNullOrEmpty(OP10QualityState)|| string.IsNullOrEmpty(OP40QualityState))?(GetQualityStateName(OP10QualityState)+ GetQualityStateName(OP40QualityState)): ((GetQualityStateName(OP10QualityState) +"|"+ GetQualityStateName(OP40QualityState)));
+ return (string.IsNullOrEmpty(OP10QualityState) || string.IsNullOrEmpty(OP40QualityState)) ? (GetQualityStateName(OP10QualityState) + GetQualityStateName(OP40QualityState)) : ((GetQualityStateName(OP10QualityState) + "|" + GetQualityStateName(OP40QualityState)));
}
if (WorkingProcedure.Equals("OP10"))
{
- qs=OP10QualityState;
+ qs = OP10QualityState;
}
else
{
qs = OP40QualityState;
}
}
- else if(EquipmentID.Equals("EOP20"))
+ else if (EquipmentID.Equals("EOP20"))
{
qs = OP20QualityState;
}
@@ -171,7 +171,7 @@
/// 鎿嶄綔鏂瑰紡
/// </summary>
public string QualityStateUpdateMode { get; set; }
-
+
/// <summary>
/// 鎿嶄綔浜�
/// </summary>
@@ -196,7 +196,7 @@
{
if (string.IsNullOrEmpty(WorkingProcedure))
{
- return OP10QualityReceiveTime.ToString()+ ((OP10QualityReceiveTime.HasValue&& OP40QualityReceiveTime.HasValue)?"|":"")+ OP40QualityReceiveTime.ToString();
+ return OP10QualityReceiveTime.ToString() + ((OP10QualityReceiveTime.HasValue && OP40QualityReceiveTime.HasValue) ? "|" : "") + OP40QualityReceiveTime.ToString();
}
if (WorkingProcedure.Equals("OP10"))
{
@@ -231,7 +231,7 @@
}
}
- private DateTime? m_EndTime=null;
+ private DateTime? m_EndTime = null;
/// <summary>
/// 涓嬬嚎鏃堕棿
/// </summary>
@@ -239,7 +239,7 @@
{
get
{
- if (m_EndTime.HasValue&& m_EndTime.Value.Date==DateTime.Parse("0001-01-01"))
+ if (m_EndTime.HasValue && m_EndTime.Value.Date == DateTime.Parse("0001-01-01"))
{
return null;
}
@@ -250,7 +250,7 @@
}
set { m_EndTime = value; }
}
-
+
/// <summary>
/// 杩炴潌鍘氬害;OP10/OP40
/// </summary>
@@ -261,7 +261,7 @@
/// 灏忓ご瀛旂洿寰�;OP20/OP60/OP80
/// </summary>
public string QualityOP20To1 { get; set; }
-
+
/// <summary>
/// 娑ㄦ柇鍔涚煩;OP30
/// </summary>
@@ -309,87 +309,87 @@
/// 琛鍘嬭鍔涚煩;OP30
/// </summary>
public string QualityOP30To6 { get; set; }
-
+
/// <summary>
/// 琛鍘嬭浣嶇Щ;OP30
/// </summary>
public string QualityOP30To7 { get; set; }
-
+
/// <summary>
/// 鍘嬭鍔涚煩;OP35
/// </summary>
public string QualityOP35To1 { get; set; }
-
+
/// <summary>
/// Y杞翠綅绉�;OP35
/// </summary>
public string QualityOP35To2 { get; set; }
-
+
/// <summary>
/// 澶уご瀛旂洿寰�;OP60/OP80
/// </summary>
public string QualityOP60To1 { get; set; }
-
+
/// <summary>
/// 鏍￠獙鐮佺粨鏋�;OP60
/// </summary>
public string QualityOP60To2 { get; set; }
-
+
/// <summary>
/// 娓呮礂娓╁害;OP70
/// </summary>
public string QualityOP70To1 { get; set; }
-
+
/// <summary>
/// 娓呮礂鍘嬪姏;OP70
/// </summary>
public string QualityOP70To2 { get; set; }
-
+
/// <summary>
/// 鍑哄彛澶勫伐浠舵俯搴�;OP70
/// </summary>
public string QualityOP70To3 { get; set; }
-
+
/// <summary>
/// 澶уご閲嶉噺;OP80
/// </summary>
public string QualityOP80To1 { get; set; }
-
+
/// <summary>
/// 灏忓ご閲嶉噺;OP80
/// </summary>
public string QualityOP80To2 { get; set; }
-
+
/// <summary>
/// 鎬婚噸;OP80
/// </summary>
public string QualityOP80To3 { get; set; }
-
+
/// <summary>
/// 寮洸;OP80
/// </summary>
public string QualityOP80To4 { get; set; }
-
+
/// <summary>
/// 鎵害;OP80
/// </summary>
public string QualityOP80To5 { get; set; }
-
+
/// <summary>
/// 澶уご鍨傜洿搴�;OP80
/// </summary>
public string QualityOP80To6 { get; set; }
-
+
/// <summary>
/// 澶уご瀛斿垎缁勭骇鍒�;OP80
/// </summary>
public string QualityOP80To7 { get; set; }
-
+
/// <summary>
/// 灏忓ご瀛斿垎缁勭骇鍒�;OP80
/// </summary>
public string QualityOP80To8 { get; set; }
-
+
/// <summary>
/// 閲嶉噺缁勫埆;OP80
/// </summary>
@@ -433,6 +433,40 @@
public string OP30QualityStateCH6 { get; set; }
+ public string OP30QualityStateCH3Name
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(OP30QualityStateCH3)) return string.Empty;
+ return GetQualityStateName(OP30QualityStateCH3.ToString());
+ }
+ }
+ public string OP30QualityStateCH4Name
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(OP30QualityStateCH4)) return string.Empty;
+ return GetQualityStateName(OP30QualityStateCH4.ToString());
+ }
+ }
+ public string OP30QualityStateCH5Name
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(OP30QualityStateCH5)) return string.Empty;
+ return GetQualityStateName(OP30QualityStateCH5.ToString());
+ }
+ }
+ public string OP30QualityStateCH6Name
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(OP30QualityStateCH6)) return string.Empty;
+ return GetQualityStateName(OP30QualityStateCH6.ToString());
+ }
+ }
+
+
public string OP30QualityState { get; set; }
public string OP35QualityState { get; set; }
@@ -446,7 +480,7 @@
/// 澶囨敞
/// </summary>
public string Remarks { get; set; }
-
+
/// <summary>
/// Id涓婚敭
/// </summary>
@@ -455,7 +489,7 @@
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- public DateTimeOffset ?CreatedTime { get; set; }
+ public DateTimeOffset? CreatedTime { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
@@ -500,7 +534,7 @@
/// 璐ㄩ噺鐘舵�佸悕绉�
/// </summary>
[Description("璐ㄩ噺鐘舵��")]
- public string QualityStateName{ get; set; }
+ public string QualityStateName { get; set; }
/// <summary>
/// 鎿嶄綔鏂瑰紡
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs
index 6b95364..00a3cf9 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs
@@ -26,7 +26,7 @@
[Route("api/[Controller]")]
public class QualityDataInfoService : IQualityDataInfoService, IDynamicApiController, ITransient
{
- private readonly IRepository<QualityDataInfo,MasterDbContextLocator> _qualityDataInfoRep;
+ private readonly IRepository<QualityDataInfo, MasterDbContextLocator> _qualityDataInfoRep;
private readonly IRepository<EquipmentBaseInfo, MasterDbContextLocator> _equipmentBaseInfoRep;
private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
@@ -40,7 +40,7 @@
/// <param name="sysDictTypeRep"></param>
/// <param name="sysDictDataRep"></param>
public QualityDataInfoService(
- IRepository<QualityDataInfo,MasterDbContextLocator> qualityDataInfoRep,
+ IRepository<QualityDataInfo, MasterDbContextLocator> qualityDataInfoRep,
IRepository<EquipmentBaseInfo, MasterDbContextLocator> equipmentBaseInfoRep,
IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep,
IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep,
@@ -62,9 +62,9 @@
public async Task<AddQualityDataInfoInputV2> GetQualityInfoSPCForID([FromQuery] QualityDataInfoSearch2 input)
{
var interfaceLog = _accessInterfaceLogRep.DetachedEntities.Where(o => o.Id == input.QualityDataInfoID).FirstOrDefault();
- if(interfaceLog==null|| interfaceLog.Id<1)
+ if (interfaceLog == null || interfaceLog.Id < 1)
{//娌℃湁鏌ヨ鍒�
- throw Oops.Oh($"褰撳墠宸ヤ欢{input.WorkPieceID??""}娌℃湁SPC鍙嶉淇℃伅锛�");
+ throw Oops.Oh($"褰撳墠宸ヤ欢{input.WorkPieceID ?? ""}娌℃湁SPC鍙嶉淇℃伅锛�");
}
var output = JsonConvert.DeserializeObject<AddQualityDataInfoInputV2>(interfaceLog.ParaJSON);
return output;
@@ -76,9 +76,9 @@
/// <returns></returns>
[HttpGet("GetQualityInfoForID")]
public async Task<QualityDataInfoOutput> GetQualityInfoForID([FromQuery] QualityDataInfoSearch2 input)
- {
+ {
QualityDataInfoOutput qualityDataInfo = new QualityDataInfoOutput();
- if(input==null|| string.IsNullOrEmpty(input.OperationType))
+ if (input == null || string.IsNullOrEmpty(input.OperationType))
{
throw Oops.Oh("浼犲弬寮傚父锛�");
}
@@ -143,7 +143,7 @@
.ProjectToType<QualityDataInfoOutput>()
.FirstOrDefaultAsync();
}
-
+
return qualityDataInfo;
}
@@ -155,7 +155,7 @@
[HttpGet("page")]
public async Task<PageResult<QualityDataInfoOutput>> Page([FromQuery] QualityDataInfoSearch input)
{
- if(!input.StartTime.HasValue|| !input.EndTime.HasValue||input.StartTime>input.EndTime)
+ if (!input.StartTime.HasValue || !input.EndTime.HasValue || input.StartTime > input.EndTime)
{
throw Oops.Oh("浼犲弬寮傚父:鏃ユ湡鑼冨洿蹇呴』浼犲�硷紒");
}
@@ -170,11 +170,11 @@
//}
var qualityDataInfos = await _qualityDataInfoRep.DetachedEntities
.Join(_equipmentBaseInfoRep.DetachedEntities, a => a.EquipmentID, b => b.EquipmentId, (a, b) => new { a, b })
- //.Where(o => o.a.CreatedTime.Value.Date >= input.StartTime.Value)
- //.Where(o => o.a.UpdatedTime.Value.Date <= input.EndTime.Value)
+ //.Where(o => o.a.CreatedTime.Value.Date >= input.StartTime.Value)
+ //.Where(o => o.a.UpdatedTime.Value.Date <= input.EndTime.Value)
.Where(!string.IsNullOrEmpty(input.WorkPieceID), w => w.a.WorkPieceID.Contains(input.WorkPieceID))
- .Where(input.EquipmentID.Equals("EOP10") && string.IsNullOrEmpty(input.WorkingProcedure), o => (o.a.OP10QualityReceiveTime.Value.Date >= input.StartTime.Value
- && o.a.OP10QualityReceiveTime.Value.Date <= input.EndTime.Value&&o.a.OP10QualityState==(input.QualityState.HasValue?input.QualityState.ToString():o.a.OP10QualityState)) || (o.a.OP40QualityReceiveTime.Value.Date >= input.StartTime.Value && o.a.OP40QualityReceiveTime.Value.Date <= input.EndTime.Value && o.a.OP40QualityState == (input.QualityState.HasValue ? input.QualityState.ToString() : o.a.OP40QualityState)))
+ .Where(input.EquipmentID.Equals("EOP10") && string.IsNullOrEmpty(input.WorkingProcedure), o => (o.a.OP10QualityReceiveTime.Value.Date >= input.StartTime.Value
+ && o.a.OP10QualityReceiveTime.Value.Date <= input.EndTime.Value && o.a.OP10QualityState == (input.QualityState.HasValue ? input.QualityState.ToString() : o.a.OP10QualityState)) || (o.a.OP40QualityReceiveTime.Value.Date >= input.StartTime.Value && o.a.OP40QualityReceiveTime.Value.Date <= input.EndTime.Value && o.a.OP40QualityState == (input.QualityState.HasValue ? input.QualityState.ToString() : o.a.OP40QualityState)))
.Where(input.EquipmentID.Equals("EOP10") && !string.IsNullOrEmpty(input.WorkingProcedure) && input.WorkingProcedure.Equals("OP10"), o => (o.a.OP10QualityReceiveTime.Value.Date >= input.StartTime.Value && o.a.OP10QualityReceiveTime.Value.Date <= input.EndTime.Value && o.a.OP10QualityState == (input.QualityState.HasValue ? input.QualityState.ToString() : o.a.OP10QualityState)))
.Where(input.EquipmentID.Equals("EOP10") && !string.IsNullOrEmpty(input.WorkingProcedure) && input.WorkingProcedure.Equals("OP40"), o => (o.a.OP40QualityReceiveTime.Value.Date >= input.StartTime.Value && o.a.OP40QualityReceiveTime.Value.Date <= input.EndTime.Value && o.a.OP40QualityState == (input.QualityState.HasValue ? input.QualityState.ToString() : o.a.OP40QualityState)))
.Where(input.EquipmentID.Equals("EOP20"), o => o.a.OP20QualityReceiveTime.Value.Date >= input.StartTime.Value && o.a.OP20QualityReceiveTime.Value.Date <= input.EndTime.Value && o.a.OP20QualityState == (input.QualityState.HasValue ? input.QualityState.ToString() : o.a.OP20QualityState))
@@ -231,7 +231,7 @@
OP20QualityReceiveTime = m.a.OP20QualityReceiveTime,
OP30QualityReceiveTime = m.a.OP30QualityReceiveTime,
OP35QualityReceiveTime = m.a.OP35QualityReceiveTime,
- OP40QualityReceiveTime= m.a.OP40QualityReceiveTime,
+ OP40QualityReceiveTime = m.a.OP40QualityReceiveTime,
OP60QualityReceiveTime = m.a.OP60QualityReceiveTime,
OP80QualityReceiveTime = m.a.OP80QualityReceiveTime,
OP10QualityState = m.a.OP10QualityState,
@@ -241,6 +241,12 @@
OP35QualityState = m.a.OP35QualityState,
OP60QualityState = m.a.OP60QualityState,
OP80QualityState = m.a.OP80QualityState,
+
+ OP30QualityStateCH3 = m.a.OP30QualityStateCH3,
+ OP30QualityStateCH4 = m.a.OP30QualityStateCH4,
+ OP30QualityStateCH5 = m.a.OP30QualityStateCH5,
+ OP30QualityStateCH6 = m.a.OP30QualityStateCH6,
+
Remarks = m.a.Remarks,
UpdateTime = m.a.UpdatedTime,
})
@@ -250,8 +256,8 @@
return qualityDataInfos;
}
-
-
+
+
/// <summary>
/// 鏍规嵁璐ㄩ噺鏁版嵁瀵煎嚭Excel
/// </summary>
@@ -283,7 +289,7 @@
.Where(input.EquipmentID.Equals("EOP35"), o => o.a.OP35QualityReceiveTime.Value.Date >= input.StartTime.Value && o.a.OP35QualityReceiveTime.Value.Date <= input.EndTime.Value && o.a.OP35QualityState == (input.QualityState.HasValue ? input.QualityState.ToString() : o.a.OP35QualityState))
.Where(input.EquipmentID.Equals("EOP60"), o => o.a.OP60QualityReceiveTime.Value.Date >= input.StartTime.Value && o.a.OP60QualityReceiveTime.Value.Date <= input.EndTime.Value && o.a.OP60QualityState == (input.QualityState.HasValue ? input.QualityState.ToString() : o.a.OP60QualityState))
.Where(input.EquipmentID.Equals("EOP80"), o => o.a.OP80QualityReceiveTime.Value.Date >= input.StartTime.Value && o.a.OP80QualityReceiveTime.Value.Date <= input.EndTime.Value && o.a.OP80QualityState == (input.QualityState.HasValue ? input.QualityState.ToString() : o.a.OP80QualityState))
- .Where(o=>!string.IsNullOrEmpty(o.a.WorkPieceID))
+ .Where(o => !string.IsNullOrEmpty(o.a.WorkPieceID))
.Select(m => new QualityDataInfoOutput
{
Id = m.a.Id,
@@ -407,6 +413,6 @@
var fileName = HttpUtility.UrlEncode($"{sheetName}[{DateTimeOffset.Now:yyyy-MM-dd}].xlsx", Encoding.GetEncoding("UTF-8"));
return new FileStreamResult(ms, "application/octet-stream") { FileDownloadName = fileName };
}
-
+
}
}
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 4ffe612..d0b3287 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
+++ b/iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
@@ -1375,6 +1375,16 @@
娓呮礂娑叉洿鎹㈡椂闂�
</summary>
</member>
+ <member name="P:iWare.Wms.Application.EquipmentBaseInfoInput.DetergentAddtime">
+ <summary>
+ 娓呮礂娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ </summary>
+ </member>
+ <member name="P:iWare.Wms.Application.EquipmentBaseInfoInput.CuttingFluidAddTime">
+ <summary>
+ 鍒囧墛娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ </summary>
+ </member>
<member name="P:iWare.Wms.Application.EquipmentBaseInfoInput.DetergentChangeAlertThreshold">
<summary>
娓呮礂娑叉洿鎹㈤璀﹂槇鍊�
@@ -1585,6 +1595,16 @@
娓呮礂娑叉洿鎹㈡椂闂�
</summary>
</member>
+ <member name="P:iWare.Wms.Application.EquipmentBaseInfoOutput.DetergentAddtime">
+ <summary>
+ 娓呮礂娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ </summary>
+ </member>
+ <member name="P:iWare.Wms.Application.EquipmentBaseInfoOutput.CuttingFluidAddTime">
+ <summary>
+ 鍒囧墛娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ </summary>
+ </member>
<member name="P:iWare.Wms.Application.EquipmentBaseInfoOutput.DetergentChangeAlertThreshold">
<summary>
娓呮礂娑叉洿鎹㈤璀﹂槇鍊�
diff --git a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs
index 0b1021b..3ff5032 100644
--- a/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs
@@ -73,6 +73,12 @@
public string EquipmentManufacturer { get; set; }
/// <summary>
+ /// 娓呮礂娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ /// </summary>
+ [Comment("娓呮礂娑叉坊鍔犳椂闂�")]
+ public DateTime? DetergentAddtime { get; set; }
+
+ /// <summary>
/// 娓呮礂娑叉洿鎹㈡椂闂�
/// </summary>
[Comment("娓呮礂娑叉洿鎹㈡椂闂�")]
@@ -103,6 +109,12 @@
public int KnifeToolChangeAlertThreshold { get; set; }
/// <summary>
+ /// 鍒囧墛娑叉坊鍔犳椂闂� 銆怑ditby shaocx,2024-06-11銆�
+ /// </summary>
+ [Comment("鍒囧墛娑叉坊鍔犳椂闂�")]
+ public DateTime? CuttingFluidAddTime { get; set; }
+
+ /// <summary>
/// 鍒囧墛娑叉洿鎹㈡椂闂�
/// </summary>
[Comment("鍒囧墛娑叉洿鎹㈡椂闂�")]
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 6429efa..b2a9f4e 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
@@ -7,11 +7,19 @@
</PropertyGroup>
<ItemGroup>
+ <None Remove="dbsettings - 鏈満.Development.json" />
+ <None Remove="dbsettings - 鐢熶骇.Development.json" />
<None Remove="dbsettings.Development.json" />
</ItemGroup>
<ItemGroup>
+ <Content Include="dbsettings - 鐢熶骇.Development.json">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dbsettings - 鏈満.Development.json">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dbsettings.Development.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
--
Gitblit v1.9.3