From f6598be8fdb51673c0a48ddeac8bd0e622835b35 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 16 七月 2025 11:58:10 +0800
Subject: [PATCH] 111
---
MES.Service/service/QC/LljService.cs | 113 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 41 deletions(-)
diff --git a/MES.Service/service/QC/LljService.cs b/MES.Service/service/QC/LljService.cs
index f3727d9..e76f6c7 100644
--- a/MES.Service/service/QC/LljService.cs
+++ b/MES.Service/service/QC/LljService.cs
@@ -3,8 +3,6 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.VisualBasic.CompilerServices;
using SqlSugar;
//using DbType = SqlSugar.DbType;
using DbType = System.Data.DbType;
@@ -23,9 +21,15 @@
// 鑾峰彇浠撳簱浠ｇ爜鐨勫瓙鏌ヨ
var depotCodes = db.Queryable<SysUser>()
- .LeftJoin<SysUserRole>((h, f) => h.Fid == f.Userid) // SysUser 鍜� SysUserRole 鍏宠仈
- .LeftJoin<SysRole>((h, f, e) => f.Roleid == e.Roleid) // SysUserRole 鍜� SysRole 鍏宠仈
- .LeftJoin<MesDepots>((h, f, e, dp) => f.DepotId == dp.DepotId) // SysUserRole 鍜� MesDepots 鍏宠仈
+ .LeftJoin<
+ SysUserRole>((h, f) =>
+ h.Fid == f.Userid) // SysUser 鍜� SysUserRole 鍏宠仈
+ .LeftJoin<
+ SysRole>((h, f, e) =>
+ f.Roleid == e.Roleid) // SysUserRole 鍜� SysRole 鍏宠仈
+ .LeftJoin<
+ MesDepots>((h, f, e, dp) =>
+ f.DepotId == dp.DepotId) // SysUserRole 鍜� MesDepots 鍏宠仈
.Where((h, f, e, dp) => h.Fcode == userCode) // 绛涢�夋潯浠讹細SysUser 鐨� Fcode
.Select((h, f, e, dp) => dp.DepotCode) // 閫夋嫨瀛楁锛歁esDepots 鐨� DepotCode
.ToList(); // 杞崲涓哄垪琛�
@@ -40,27 +44,31 @@
!"鏈畬鎴�".Equals(queryObj.result),
a => a.FcheckResu != null && a.STATUS == "宸叉彁浜�")
.WhereIF(id > 0, a => a.Id == id)
- .Where(a => depotCodes.Contains(a.DepotCode)) // 浣跨敤 Contains 鏂规硶妯℃嫙 IN 鏉′欢 鏍规嵁浠撳簱杩囨护
+ .Where(a =>
+ depotCodes.Contains(a
+ .DepotCode)) // 浣跨敤 Contains 鏂规硶妯℃嫙 IN 鏉′欢 鏍规嵁浠撳簱杩囨护
.OrderByDescending(a => a.Id)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
-
+
return (pageList, totalCount);
}
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
- public List<MesQaItemsDetectDetail5> SetItems(string itemId, decimal quantity, string releaseNo)
+ public List<MesQaItemsDetectDetail5> SetItems(string itemId,
+ decimal quantity, string releaseNo)
{
var db = SqlSugarHelper.GetInstance();
- var count = db.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemId == itemId && s.FTYPE == "1").Count();
+ var count = db.Queryable<MesQaIqc>().Where(s => s.EE == 1 &&
+ s.ISENABLED == 1
+ && s.ItemId == itemId && s.FTYPE == "1").Count();
if (count <= 0) return [];
var mesQaIqcItem = db
.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemId == itemId && s.FTYPE == "1").Select(
- b => new MesQaItemsDetectDetail5
+ && s.ItemId == itemId && s.FTYPE == "1").Select(b =>
+ new MesQaItemsDetectDetail5
{
ReleaseNo = releaseNo,
FacLevel = b.FacLevel,
@@ -120,7 +128,8 @@
var sql =
"SELECT " + LEV +
" FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL2 B ON B.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO='" +
- item.SampleSizeNo + "' AND B.LOT_FROM<= " + quantity + " AND " +
+ item.SampleSizeNo + "' AND B.LOT_FROM<= " + quantity +
+ " AND " +
quantity + "<=B.LOT_TO";
var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
@@ -131,7 +140,8 @@
sql = "SELECT FSAMPLE_SIZE_WORD, " + result +
" Result FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL3 C ON C.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO= '" +
- item.SampleSizeNo + "' AND SAMPLE_SIZE_WORD= '" + maxBillNo + "'";
+ item.SampleSizeNo + "' AND SAMPLE_SIZE_WORD= '" + maxBillNo +
+ "'";
var resultClass = db.Ado.SqlQuerySingle<ResultClass>(sql);
item.CheckQyt = resultClass.FSAMPLE_SIZE_WORD;
@@ -182,7 +192,8 @@
.Where(x => x.FcheckResu == "NG" && x.MainId == s.Id).Count();
//妫�楠屾槑缁嗘�绘暟
- var count = db.Queryable<MesQaItemsDetectDetail12>().Where(x1 => x1.MainId == s.Id).Count();
+ var count = db.Queryable<MesQaItemsDetectDetail12>()
+ .Where(x1 => x1.MainId == s.Id).Count();
if (ifck > s.FreQty && s.CheckQyt == count)
s.FcheckResu = "涓嶅悎鏍�";
@@ -205,11 +216,14 @@
return Convert.ToInt32(rkjDto.gid);
}
- public List<MesQaItemsDetectDetail5> GetItems(string? releaseNo, decimal? id)
+ public List<MesQaItemsDetectDetail5> GetItems(string? releaseNo,
+ decimal? id)
{
var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesQaItemsDetectDetail5, MesQaItemsDetectDetail12>((a, b) =>
+ return db
+ .Queryable<MesQaItemsDetectDetail5,
+ MesQaItemsDetectDetail12>((a, b) =>
new JoinQueryInfos(JoinType.Left, a.Id == b.MainId))
.Where((a, b) => a.ReleaseNo == releaseNo)
// .WhereIF(id > 0, (a, b) => a.Id == id)
@@ -247,7 +261,7 @@
FreQty = a.FreQty,
Factory = "1000",
Company = "1000",
- FenterQty = SqlFunc.AggregateCount(b.Id),
+ FenterQty = SqlFunc.AggregateCount(b.Id),
FcheckResu = a.FcheckResu,
FcheckItemDesc = a.FcheckItemDesc
}).ToList();
@@ -318,8 +332,8 @@
// result = "涓嶅悎鏍�";
else if (noCount >= QsItemOqcItem.FreQty)
result = "涓嶅悎鏍�";
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
var commit = 0;
commit += db.Updateable<MesQaItemsDetectDetail5>()
@@ -332,7 +346,8 @@
});
var isNull = db.Queryable<MesQaItemsDetectDetail5>()
- .Where(s => s.ReleaseNo == detail.ReleaseNo && s.FcheckResu == null).Count();
+ .Where(s => s.ReleaseNo == detail.ReleaseNo && s.FcheckResu == null)
+ .Count();
if (isNull > 0) return 1;
//鑾峰彇妫�楠屽崟鐨勬楠岄」鐩殑涓暟
@@ -343,7 +358,8 @@
//鑾峰彇妫�楠屽崟涓嬬殑鍚堟牸鐨勬楠岄」鐩釜鏁�
var icount = db.Queryable<MesQaItemsDetectDetail5>()
- .Where(s => s.ReleaseNo == detail.ReleaseNo && s.FcheckResu == "鍚堟牸").Count();
+ .Where(s => s.ReleaseNo == detail.ReleaseNo && s.FcheckResu == "鍚堟牸")
+ .Count();
var FcheckResu = "涓嶅悎鏍�";
@@ -531,10 +547,12 @@
{
var commit = 0;
//鍒犻櫎涓昏〃
- commit += db.Deleteable<MesQaItemsDetect01>().Where(s => s.ReleaseNo == releaseNo)
+ commit += db.Deleteable<MesQaItemsDetect01>()
+ .Where(s => s.ReleaseNo == releaseNo)
.ExecuteCommand();
//鍒犻櫎瀛愯〃
- commit += db.Deleteable<MesQaItemsDetectDetail5>().Where(s => s.ReleaseNo == releaseNo)
+ commit += db.Deleteable<MesQaItemsDetectDetail5>()
+ .Where(s => s.ReleaseNo == releaseNo)
.ExecuteCommand();
//鍒犻櫎瀛欒〃
commit += db.Deleteable<MesQaItemsDetectDetail12>()
@@ -596,20 +614,27 @@
}
}
- public (List<LtsLlj> item, int TotalCount) GetSearchPage(XJPageResult queryObj)
+ public (List<LtsLlj> item, int TotalCount) GetSearchPage(
+ XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
var id = Convert.ToDecimal(queryObj.id);
- int totalCount = 0;
+ var totalCount = 0;
var userCode = queryObj.createUser;
// 鑾峰彇浠撳簱浠ｇ爜鐨勫瓙鏌ヨ
var depotCodes = db.Queryable<SysUser>()
- .LeftJoin<SysUserRole>((h, f) => h.Fid == f.Userid) // SysUser 鍜� SysUserRole 鍏宠仈
- .LeftJoin<SysRole>((h, f, e) => f.Roleid == e.Roleid) // SysUserRole 鍜� SysRole 鍏宠仈
- .LeftJoin<MesDepots>((h, f, e, dp) => f.DepotId == dp.DepotId) // SysUserRole 鍜� MesDepots 鍏宠仈
+ .LeftJoin<
+ SysUserRole>((h, f) =>
+ h.Fid == f.Userid) // SysUser 鍜� SysUserRole 鍏宠仈
+ .LeftJoin<
+ SysRole>((h, f, e) =>
+ f.Roleid == e.Roleid) // SysUserRole 鍜� SysRole 鍏宠仈
+ .LeftJoin<
+ MesDepots>((h, f, e, dp) =>
+ f.DepotId == dp.DepotId) // SysUserRole 鍜� MesDepots 鍏宠仈
.Where((h, f, e, dp) => h.Fcode == userCode) // 绛涢�夋潯浠讹細SysUser 鐨� Fcode
.Select((h, f, e, dp) => dp.DepotCode) // 閫夋嫨瀛楁锛歁esDepots 鐨� DepotCode
.ToList(); // 杞崲涓哄垪琛�
@@ -618,25 +643,31 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (a) => a.FcheckResu == null)
+ a => a.FcheckResu == null)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (a) => a.FcheckResu != null)
- .WhereIF(id > 0, (a) => a.Id == id)
+ a => a.FcheckResu != null)
+ .WhereIF(id > 0, a => a.Id == id)
// .Where(a=>a.SuppName.Contains(queryObj.SuppNameContains)
// && a.SalesOrderId.Contains(queryObj.SalesOrder)
// && a.ItemNo.Contains(queryObj.ItemNo)
// )
- .WhereIF(!string.IsNullOrEmpty(queryObj.SuppNameContains), a => a.SuppName.Contains(queryObj.SuppNameContains))
- .WhereIF(!string.IsNullOrEmpty(queryObj.ItemNo), a => a.ItemNo.Contains(queryObj.ItemNo))
- .WhereIF(!string.IsNullOrEmpty(queryObj.SalesOrder), a => a.ItemModel.Contains(queryObj.SalesOrder))
- .WhereIF(!string.IsNullOrEmpty(queryObj.SongJ), a => a.FcheckBy.Contains(queryObj.SongJ))
- .WhereIF(!string.IsNullOrEmpty(queryObj.SongNo), a => a.ReleaseNo.Contains(queryObj.SongNo))
- .WhereIF(!string.IsNullOrEmpty(queryObj.ItemName), a => a.ItemName.Contains(queryObj.ItemName))
-
-
- .Where(a => depotCodes.Contains(a.DepotCode)) // 浣跨敤 Contains 鏂规硶妯℃嫙 IN 鏉′欢 鏍规嵁浠撳簱杩囨护
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SuppNameContains),
+ a => a.SuppName.Contains(queryObj.SuppNameContains))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.ItemNo),
+ a => a.ItemNo.Contains(queryObj.ItemNo))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SalesOrder),
+ a => a.ItemModel.Contains(queryObj.SalesOrder))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SongJ),
+ a => a.FcheckBy.Contains(queryObj.SongJ))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SongNo),
+ a => a.ReleaseNo.Contains(queryObj.SongNo))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.ItemName),
+ a => a.ItemName.Contains(queryObj.ItemName))
+ .Where(a =>
+ depotCodes.Contains(a
+ .DepotCode)) // 浣跨敤 Contains 鏂规硶妯℃嫙 IN 鏉′欢 鏍规嵁浠撳簱杩囨护
.OrderBy(a => a.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
--
Gitblit v1.9.3