From 0cff826ea489a1faa5cbb320cad52d102530a9e0 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期四, 13 三月 2025 10:53:42 +0800
Subject: [PATCH] 代码提交
---
StandardPda/MES.Service/service/QC/LljService.cs | 104 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 17 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index 22a172b..34826a8 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -4,8 +4,13 @@
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;
@@ -25,31 +30,47 @@
var totalCount = 0;
- var itemIds = GetQaItem(db, queryObj.createUser);
+ //var itemIds = GetQaItem(db, queryObj.createUser);
- var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser>((a, b, c) =>
- new JoinQueryInfos(JoinType.Inner, a.ItemId == b.ItemId,
- JoinType.Inner, b.Sid == c.Fid
+ 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
))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (a, b, c) => a.FcheckResu == null)
+ (a, b, d) => a.FcheckResu == null )
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (a, b, c) => a.FcheckResu != null)
- .WhereIF(
- itemIds is { Length: > 0 },
- (a, b, c) => itemIds.Contains(a.ItemId))
- .WhereIF(id > 0, (a, b, c) => a.Id == id)
- .OrderByDescending((a, b, c) => a.Id)
- .Select((a, b, c) => new LtsLlj
+ (a, b, d) => a.FcheckResu != null)
+ //.WhereIF(
+ // itemIds is { Length: > 0 },
+ // (a, b, c) => itemIds.Contains(a.ItemId))
+ .WhereIF(id > 0, (a, b, d) => a.Id == id )
+ .WhereIF(true, (a, b,d, e,f,g) => (g.Fcode == queryObj.createUser || g.Fcode == null))
+ //鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
+ //.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
+ .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
+ (a) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || 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
{
- UserName = c.Fname
+ UserName = g.Fname,
+ FIRST=d.First,
+ CreateUserName=e.Fname,
+ NewFngDesc=d.NewFngDesc
+
}, true)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
return (pageList, totalCount);
}
@@ -260,7 +281,8 @@
a.FspecRequ,
a.FreQty,
a.CheckQyt,
- a.FcheckResu
+ a.FcheckResu,
+ a.FcheckItemDesc
}).Select((a, b) => new MesQaItemsDetectDetail5
{
Id = a.Id,
@@ -279,7 +301,8 @@
Factory = "1000",
Company = "1000",
FenterQty = SqlFunc.AggregateCount(b.Id),
- FcheckResu = a.FcheckResu
+ FcheckResu = a.FcheckResu,
+ FcheckItemDesc=a.FcheckItemDesc
}).ToList();
}
@@ -539,8 +562,8 @@
return SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<MesQaItemsDetect01>()
- // .SetColumns(it =>
- // it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .SetColumns(it =>
+ it.FngDesc == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
.Where(it => it.ReleaseNo == dto.releaseNo)
.ExecuteCommand();
});
@@ -632,4 +655,51 @@
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>
+ /// 浠嶶9鑾峰彇鏂欏彿鍥剧焊鍒楄〃
+ /// </summary>
+ /// <param name="Type">u9No锛歶9鐗╂枡缂栧彿</param>
+ /// <param name="U9No">type锛�1锛氬浘绾歌鏍间功 2锛氳繘鏂欐楠屾枃浠� </param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ 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 response = await client.GetAsync(requestUrl);
+ response.EnsureSuccessStatusCode(); // 妫�鏌TTP鐘舵�佺爜
+ var responseContent = await response.Content.ReadAsStringAsync();
+ var result = JsonConvert.DeserializeObject<ApiResponse>(responseContent);
+
+ if (result.Status == 0 && result.Data != null)
+ {
+ return result.Data;
+ }
+ else
+ {
+ return null;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3