格式化代码

啊鑫

2 天以前 ed05efdc17aab076146b134ebe105b6382f221d7

 MESApplication/Controllers/QC/PcbTestDataController.cs

@@ -1,4 +1,3 @@
using System;
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.Modes;
@@ -9,8 +8,8 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

namespace MESApplication.Controllers.QC
{
namespace MESApplication.Controllers.QC;

    /// <summary>
    /// PCB检测数据控制器
    /// </summary>
@@ -31,7 +30,8 @@
        /// <param name="dto">整板检测数据DTO</param>
        /// <returns>保存结果</returns>
        [HttpPost("SaveWholeboardData")]
        public ResponseResult SaveWholeboardData([FromBody] WholeboardGenerateDto dto)
    public ResponseResult SaveWholeboardData(
        [FromBody] WholeboardGenerateDto dto)
        {
            var entity = new MessageCenter();
            entity.TableName = TableName;
@@ -76,7 +76,8 @@
        /// <param name="dto">单板检测数据DTO</param>
        /// <returns>保存结果</returns>
        [HttpPost("SaveSingleBoardData")]
        public ResponseResult SaveSingleBoardData([FromBody] SingleBoardGenerateDto dto)
    public ResponseResult SaveSingleBoardData(
        [FromBody] SingleBoardGenerateDto dto)
        {
            var entity = new MessageCenter();
            entity.TableName = TableName;
@@ -136,14 +137,17 @@
                DateTime? startDateTime = null;
                DateTime? endDateTime = null;

                if (StringUtil.IsNotNullOrEmpty(startTime) && DateTime.TryParse(startTime, out var start))
            if (StringUtil.IsNotNullOrEmpty(startTime) &&
                DateTime.TryParse(startTime, out var start))
                    startDateTime = start;

                if (StringUtil.IsNotNullOrEmpty(endTime) && DateTime.TryParse(endTime, out var end))
            if (StringUtil.IsNotNullOrEmpty(endTime) &&
                DateTime.TryParse(endTime, out var end))
                    endDateTime = end;

                var (items, totalCount) = _service.GetPcbTestDataPage(
                    dataType, deviceName, pcbSn, startDateTime, endDateTime, pageIndex, pageSize);
                dataType, deviceName, pcbSn, startDateTime, endDateTime,
                pageIndex, pageSize);

                dynamic resultInfos = new ExpandoObject();
                resultInfos.items = items;
@@ -174,14 +178,12 @@
            {
                var id = request["id"]?.ToObject<decimal>();
                if (!id.HasValue)
                {
                    return new ResponseResult
                    {
                        status = 1,
                        message = "ID不能为空",
                        data = null
                    };
                }

                var testData = _service.GetPcbTestDataById(id.Value);
                var componentData = _service.GetComponentDataByTestDataId(id.Value);
@@ -215,14 +217,12 @@
            {
                var pcbSn = request["pcbSn"]?.ToString();
                if (StringUtil.IsNullOrEmpty(pcbSn))
                {
                    return new ResponseResult
                    {
                        status = 1,
                        message = "PCB条码不能为空",
                        data = null
                    };
                }

                var testDataList = _service.GetPcbTestDataByPcbSn(pcbSn);

@@ -254,16 +254,15 @@
            {
                var testDataId = request["testDataId"]?.ToObject<decimal>();
                if (!testDataId.HasValue)
                {
                    return new ResponseResult
                    {
                        status = 1,
                        message = "测试数据ID不能为空",
                        data = null
                    };
                }

                var componentData = _service.GetComponentDataByTestDataId(testDataId.Value);
            var componentData =
                _service.GetComponentDataByTestDataId(testDataId.Value);

                dynamic resultInfos = new ExpandoObject();
                resultInfos.componentData = componentData;
@@ -299,13 +298,16 @@
                DateTime? startDateTime = null;
                DateTime? endDateTime = null;

                if (StringUtil.IsNotNullOrEmpty(startTime) && DateTime.TryParse(startTime, out var start))
            if (StringUtil.IsNotNullOrEmpty(startTime) &&
                DateTime.TryParse(startTime, out var start))
                    startDateTime = start;

                if (StringUtil.IsNotNullOrEmpty(endTime) && DateTime.TryParse(endTime, out var end))
            if (StringUtil.IsNotNullOrEmpty(endTime) &&
                DateTime.TryParse(endTime, out var end))
                    endDateTime = end;

                var statistics = _service.GetTestStatistics(dataType, deviceName, startDateTime, endDateTime);
            var statistics = _service.GetTestStatistics(dataType, deviceName,
                startDateTime, endDateTime);

                dynamic resultInfos = new ExpandoObject();
                resultInfos.statistics = statistics;
@@ -421,13 +423,14 @@
                }

                dynamic resultInfos = new ExpandoObject();
                bool result = false;
                string message = "";
            var result = false;
            var message = "";

                switch (dataType.ToUpper())
                {
                    case "WHOLE":
                        var wholeboardDto = request["data"]?.ToObject<WholeboardGenerateDto>();
                    var wholeboardDto = request["data"]
                        ?.ToObject<WholeboardGenerateDto>();
                        if (wholeboardDto == null)
                        {
                            entity.Result = 0;
@@ -442,12 +445,14 @@
                                data = null
                            };
                        }

                        result = _service.SaveWholeboardData(wholeboardDto);
                        message = result ? "整板检测数据保存成功" : "整板检测数据保存失败";
                        break;

                    case "SINGLE":
                        var singleBoardDto = request["data"]?.ToObject<SingleBoardGenerateDto>();
                    var singleBoardDto = request["data"]
                        ?.ToObject<SingleBoardGenerateDto>();
                        if (singleBoardDto == null)
                        {
                            entity.Result = 0;
@@ -462,6 +467,7 @@
                                data = null
                            };
                        }

                        result = _service.SaveSingleBoardData(singleBoardDto);
                        message = result ? "单板检测数据保存成功" : "单板检测数据保存失败";
                        break;
@@ -502,7 +508,6 @@
                _manager.save(entity);
                
                return ResponseResult.ResponseError(ex);
            }
        }
    }
}