schangxiang@126.com
2024-09-04 0e97de73f6719ccd57469cea07a9f567864cc57a
日志增加  WorkingProcedureCurrent
已修改5个文件
52 ■■■■■ 文件已修改
iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterface/AccessInterfaceService.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterfaceLog/AccessInterfaceLogService.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterfaceLog/Dto/AddAccessInterfaceLogInput.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWara.SCADA.Code/iWare.Wms.Core/Entity/Access/AccessInterfaceLog.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterface/AccessInterfaceService.cs
@@ -127,9 +127,10 @@
            {
                addLog.IpAddress = ipAddress.MapToIPv4().ToString();
            }
            AddQualityDataInfoInputV2 input = null;
            try
            {
                var input = JsonConvert.DeserializeObject<AddQualityDataInfoInputV2>(json);
                input = JsonConvert.DeserializeObject<AddQualityDataInfoInputV2>(json);
                addLog.Key = input.WorkPieceID;
                if (input == null || string.IsNullOrEmpty(input.WorkPieceID) || input.QualityState == 0)
@@ -299,6 +300,8 @@
            {
                try
                {
                    addLog.WorkPieceID = input.WorkPieceID;
                    addLog.WorkingProcedureCurrent = input.WorkingProcedure;
                    await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
                }
iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterfaceLog/AccessInterfaceLogService.cs
@@ -44,6 +44,10 @@
        public async Task AddInterfaceLogAsync(AddAccessInterfaceLogInput input)
        {
            AccessInterfaceLog log = new();
            log.WorkPieceID = input.WorkPieceID;
            log.WorkingProcedureCurrent = input.WorkingProcedureCurrent;
            log.Id=input.Id;
            log.ParaJSON = input.JsonString;
            log.Action = input.Action;
iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterfaceLog/Dto/AddAccessInterfaceLogInput.cs
@@ -1,4 +1,5 @@
using System;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -11,6 +12,21 @@
    /// </summary>
    public class AddAccessInterfaceLogInput
    {
        /// <summary>
        /// 工件号
        /// </summary>
        [Comment("工件号")]
        public string WorkPieceID { get; set; }
        /// <summary>
        /// 当前工序;进入下一工序前,此工序不变化
        /// </summary>
        [Comment("当前工序")]
        public string WorkingProcedureCurrent { get; set; }
        public long Id { get; set; }
        /// <summary>
        /// 请求参数Json字符串
iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
@@ -27,6 +27,16 @@
            添加外部访问日志参数
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogInput.WorkPieceID">
            <summary>
            工件号
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogInput.WorkingProcedureCurrent">
            <summary>
            当前工序;进入下一工序前,此工序不变化
            </summary>
        </member>
        <member name="P:iWare.Wms.Application.AddAccessInterfaceLogInput.JsonString">
            <summary>
            请求参数Json字符串
iWara.SCADA.Code/iWare.Wms.Core/Entity/Access/AccessInterfaceLog.cs
@@ -10,6 +10,21 @@
{
    public class AccessInterfaceLog : DEntityBase
    {
        /// <summary>
        /// 工件号
        /// </summary>
        [Comment("工件号")]
        public string WorkPieceID { get; set; }
        /// <summary>
        /// 当前工序;进入下一工序前,此工序不变化
        /// </summary>
        [Comment("当前工序")]
        public string WorkingProcedureCurrent { get; set; }
        /// <summary>
        /// 调用行为
        /// </summary>