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,18 +27,19 @@
        //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,
                     JoinType.Left, f.Sid == g.Fid
                    JoinType.Left, a.CreateBy == e.Fcode,
                    JoinType.Left, f.Id == b.PID,
                    JoinType.Left, f.Sid == g.Fid
                ))
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (a, b, d) => a.FcheckResu == null )
                (a, b, d) => a.FcheckResu == null)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
@@ -60,17 +56,16 @@
            || a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) 
            || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
            .OrderByDescending((a, b, d) => a.Id)
            .Select((a, b, d,e,f,g) => new LtsLlj
            .Select((a, b, d, e, f, g) => new LtsLlj
            {
                UserName = g.Fname,
                FIRST=d.First,
                CreateUserName=e.Fname,
                NewFngDesc=d.NewFngDesc
                FIRST = d.First,
                CreateUserName = e.Fname,
                NewFngDesc = d.NewFngDesc
            }, true)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
        return (pageList, totalCount);
    }
@@ -142,7 +137,7 @@
        mesQaIqcItem.ForEach(item =>
        {
            string LEV = item.FcheckLevel switch
            var LEV = item.FcheckLevel switch
            {
                null => "" // 默认值
                ,
@@ -302,7 +297,7 @@
                Company = "1000",
                FenterQty = SqlFunc.AggregateCount(b.Id),
                FcheckResu = a.FcheckResu,
                FcheckItemDesc=a.FcheckItemDesc
                FcheckItemDesc = a.FcheckItemDesc
            }).ToList();
    }
@@ -562,8 +557,8 @@
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<MesQaItemsDetect01>()
                 .SetColumns(it =>
                     it.FngDesc == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .SetColumns(it =>
                    it.FngDesc == dto.Remarks) //SetColumns是可以叠加的 写2个就2个字段赋值
                .Where(it => it.ReleaseNo == dto.releaseNo)
                .ExecuteCommand();
        });
@@ -655,51 +650,47 @@
            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获取料号图纸列表
    ///     从U9获取料号图纸列表
    /// </summary>
    /// <param name="Type">u9No:u9物料编号</param>
    /// <param name="U9No">type:1:图纸规格书  2:进料检验文件 </param>
    /// <returns></returns>
    /// <exception cref="Exception"></exception>
    public async Task<string[]> GetFileUrlByU9List(string Type,string U9No)
    public async Task<string[]> GetFileUrlByU9List(string Type, string U9No)
    {
        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
            {
                return null;
            }
            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; }
    }
}