OP30工序质量信息添加各工位质量显示

schangxiang@126.com

2024-06-11 2954a2dd4529679ff30c1fd08870895c29d507f2

OP30工序质量信息添加各工位质量显示

 iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoInput.cs

@@ -186,6 +186,19 @@
        /// </summary>
        public virtual DateTime? Detergentchangetime { get; set; }
        
        /// <summary>
        /// 清洗液添加时间 【Editby shaocx,2024-06-11】
        /// </summary>
        [Comment("清洗液添加时间")]
        public DateTime? DetergentAddtime { get; set; }


        /// <summary>
        /// 切削液添加时间 【Editby shaocx,2024-06-11】
        /// </summary>
        [Comment("切削液添加时间")]
        public DateTime? CuttingFluidAddTime { get; set; }

        /// <summary>
        /// 清洗液更换预警阈值
        /// </summary>

 iWara.SCADA.Code/iWare.Wms.Application/Service/EquipmentBaseInfo/Dto/EquipmentBaseInfoOutput.cs

@@ -56,6 +56,19 @@
        /// </summary>
        public DateTime? Detergentchangetime { get; set; }
        
        /// <summary>
        /// 清洗液添加时间 【Editby shaocx,2024-06-11】
        /// </summary>
        [Comment("清洗液添加时间")]
        public DateTime? DetergentAddtime { get; set; }


        /// <summary>
        /// 切削液添加时间 【Editby shaocx,2024-06-11】
        /// </summary>
        [Comment("切削液添加时间")]
        public DateTime? CuttingFluidAddTime { get; set; }

        /// <summary>
        /// 清洗液更换预警阈值
        /// </summary>

 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);
            }

        }


 iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs

@@ -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; }


 iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs

@@ -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,
               })

 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>
            清洗液添加时间 【Editby shaocx,2024-06-11】
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.EquipmentBaseInfoInput.CuttingFluidAddTime">
            <summary>
            切削液添加时间 【Editby 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>
            清洗液添加时间 【Editby shaocx,2024-06-11】
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.EquipmentBaseInfoOutput.CuttingFluidAddTime">
            <summary>
            切削液添加时间 【Editby shaocx,2024-06-11】
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.EquipmentBaseInfoOutput.DetergentChangeAlertThreshold">
            <summary>
            清洗液更换预警阈值

 iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/Equipmentbaseinfo.cs

@@ -73,6 +73,12 @@
        public string EquipmentManufacturer { get; set; }

        /// <summary>
        /// 清洗液添加时间 【Editby shaocx,2024-06-11】
        /// </summary>
        [Comment("清洗液添加时间")]
        public DateTime? DetergentAddtime { get; set; }

        /// <summary>
        /// 清洗液更换时间
        /// </summary>
        [Comment("清洗液更换时间")]
@@ -103,6 +109,12 @@
        public int KnifeToolChangeAlertThreshold { get; set; }

        /// <summary>
        /// 切削液添加时间 【Editby shaocx,2024-06-11】
        /// </summary>
        [Comment("切削液添加时间")]
        public DateTime? CuttingFluidAddTime { get; set; }

        /// <summary>
        /// 切削液更换时间
        /// </summary>
        [Comment("切削液更换时间")]

 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>