111

啊鑫

2025-03-18 13b875793c17b3eb9437a8d2db65bab04f027e39

 StandardPda/MES.Service/service/QC/LljService.cs

@@ -4,25 +4,20 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using Newtonsoft.Json;
using SqlSugar;
using DbType = System.Data.DbType;
using System.Net.Http;
using System.Threading.Tasks;



namespace MES.Service.service.QC;

public class LljService
{
    private static readonly HttpClient client = new();

    public (List<LtsLlj> item, int TotalCount) GetPage(XJPageResult queryObj)
    {
        if (queryObj.createUser.IsNullOrEmpty())
        {
            return ([], 0);
        }
        if (queryObj.createUser.IsNullOrEmpty()) return ([], 0);

        var db = SqlSugarHelper.GetInstance();

@@ -32,9 +27,10 @@

        //var itemIds = GetQaItem(db, queryObj.createUser);

        var pageList = db.Queryable<LtsLlj, IqcBefore, VMesQaItemsDetect01, SysUser, IqcBeforeFrom, SysUser>((a, b,d,e,f,g) =>
        var pageList = db
            .Queryable<LtsLlj, IqcBefore, VMesQaItemsDetect01, SysUser,
                IqcBeforeFrom, SysUser>((a, b, d, e, f, g) =>
                new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
                  
                    JoinType.Inner, a.Id == d.Id,
                     JoinType.Left, a.CreateBy == e.Fcode,
                     JoinType.Left,f.Id==b.PID,
@@ -66,7 +62,6 @@
                FIRST=d.First,
                CreateUserName=e.Fname,
                NewFngDesc=d.NewFngDesc

            }, true)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);

@@ -142,7 +137,7 @@

        mesQaIqcItem.ForEach(item =>
        {
            string LEV = item.FcheckLevel switch
            var LEV = item.FcheckLevel switch
            {
                null => "" // 默认值
                ,
@@ -655,21 +650,7 @@
            throw new Exception(ex.Message);
        }
    }
    /// <summary>
    /// 料号图纸接口返回对象
    /// </summary>
    public class ApiResponse
    {
        [JsonProperty("status")]
        public int Status { get; set; }
        [JsonProperty("message")]
        public string Message { get; set; }
        [JsonProperty("data")]
        public string[] Data { get; set; }
        [JsonProperty("totalCount")]
        public int TotalCount { get; set; }
    }
    private static readonly HttpClient client = new HttpClient();

    /// <summary>
    /// 从U9获取料号图纸列表
    /// </summary>
@@ -681,25 +662,35 @@
    {
        try
        {
            var requestUrl = $"https://erp.dream-maker.com/api/public/getFileUrlByU9No?u9No={Uri.EscapeDataString(U9No)}&type={Type}";
            var requestUrl =
                $"https://erp.dream-maker.com/api/public/getFileUrlByU9No?u9No={Uri.EscapeDataString(U9No)}&type={Type}";
            var response = await client.GetAsync(requestUrl);
            response.EnsureSuccessStatusCode(); // 检查HTTP状态码
            var responseContent = await response.Content.ReadAsStringAsync();
            var result = JsonConvert.DeserializeObject<ApiResponse>(responseContent);
            var result =
                JsonConvert.DeserializeObject<ApiResponse>(responseContent);

            if (result.Status == 0 && result.Data != null)
            {
                return result.Data;
            }
            else
            {
            if (result.Status == 0 && result.Data != null) return result.Data;

                return null;
            }

        }
        catch (Exception ex)
        {
            throw new Exception(ex.Message);
        }
    }

    /// <summary>
    ///     料号图纸接口返回对象
    /// </summary>
    public class ApiResponse
    {
        [JsonProperty("status")] public int Status { get; set; }

        [JsonProperty("message")] public string Message { get; set; }

        [JsonProperty("data")] public string[] Data { get; set; }

        [JsonProperty("totalCount")] public int TotalCount { get; set; }
    }
}