From f2900f2e7a9fef2e536c34e8d8406ac60c0f06ba Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 17 七月 2025 23:36:32 +0800
Subject: [PATCH] 添加首检的查询条件，添加首检，巡检返回总行数
---
StandardInterface/MES.Service/service/QC/LljService.cs | 402 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 308 insertions(+), 94 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index f1f2206..6a7e76f 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -1,10 +1,12 @@
锘縰sing System.Data;
+using System.Xml;
using Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using Tea.Utils;
using DbType = System.Data.DbType;
@@ -22,127 +24,277 @@
var totalCount = 0;
- //var itemIds = GetQaItem(db, queryObj.createUser);
-
- var pageList = db.Queryable<LtsLlj>()
+ var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser,
+ IqcBeforeFrom, SysUser, SysUser>((a, b,
+ e, f, g, i) =>
+ new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
+ JoinType.Left, a.CreateBy == e.Fcode,
+ JoinType.Left, f.Id == b.Pid,
+ JoinType.Left, f.Sid == Convert.ToDecimal(g.Fid),
+ JoinType.Left, f.CheckUser == i.Fcode
+ ))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- a => a.FcheckResu == null)
+ (a, b,
+ e, f, g, i) => a.FcheckResu == null)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- a => a.FcheckResu != null)
- .WhereIF(id > 0, a => a.Id == id)
+ (a, b,
+ e, f, g, i) => a.FcheckResu != null)
+ .WhereIF(id > 0, (a, b,
+ e, f, g, i) => a.Id == id)
+ .WhereIF(queryObj.createUser != "PL017" && queryObj.UserIndex == "0", (a, b,
+ e, f, g, i) => (g.Fcode == queryObj.createUser || i.Fcode == queryObj.createUser ||
+ (g.Fcode == null && i.Fcode == null)))//鍒ゆ柇姝ゅ崟鐨勬楠屽憳锛屾垨鑰呮楠屼负绌哄氨鏄剧ず姝ゅ崟鎹�
//鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
//.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
- a => a.SuppName.ToLower()
+ (a, b,
+ e, f, g, i) => a.SuppName.ToLower()
.Contains(queryObj.SearchValue.ToLower())
|| a.ItemName.ToLower()
.Contains(queryObj.SearchValue.ToLower())
|| a.ItemNo.ToLower()
- .Contains(queryObj.SearchValue.ToLower()))
- .OrderByDescending(a => a.Id)
- .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+ .Contains(queryObj.SearchValue.ToLower())
+ || a.LotNo.ToLower()
+ .Contains(queryObj.SearchValue.ToLower())
+ || a.ReleaseNo.ToLower()
+ .Contains(queryObj.SearchValue.ToLower())
+ || a.ItemModel.ToLower()
+ .Contains(queryObj.SearchValue.ToLower()))
+ // .OrderByDescending((a, b,
+ .OrderBy("CASE WHEN a.STATUS = '宸叉彁浜�' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+ var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList();
return (pageList, totalCount);
}
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
- public List<MesQaItemsDetectDetail5> SetItems(string itemNo,
- decimal quantity, string releaseNo)
+ /// <summary>
+ /// 璋冪敤瀛樺偍杩囩▼锛岄噸鏂拌幏鍙栨楠岄」鐩�
+ /// </summary>
+ /// <param name="itemNo"></param>
+ /// <param name="quantity"></param>
+ /// <param name="releaseNo"></param>
+ /// <returns></returns>
+ public string[] SetItems(decimal itemNo, decimal quantity, string releaseNo)
+ {
+
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outputResult = new SugarParameter("o_Result", null,
+ DbType.Int32, ParameterDirection.Output,
+ 4000);
+
+ var outputMessage = new SugarParameter("o_Msg", null,
+ DbType.String,
+ ParameterDirection.Output, 4000);
+
+ // 瀹氫箟杈撳叆鍙傛暟
+ var parameters = new List<SugarParameter>
+ {
+ new("P_RELEASE_NO", releaseNo, DbType.String, ParameterDirection.Input),
+ new("P_ITEM_ID", itemNo, DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_QA_ITEM_INSERT_BTN(:P_RELEASE_NO,:P_ITEM_ID, :o_Result, :o_Msg); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+ string[] msg = new string[2];
+ msg[0] = resultValue;
+ msg[1] = messageValue;
+ return msg;
+
+ }
+ //绱ф�ユ斁琛�
+ //public string[] EmergencyRelease(int id)
+ //{
+ // var db = SqlSugarHelper.GetInstance();
+
+
+ // int emergencyStatus = db.Queryable<MesQaItemsDetect01>()
+ // .Where(t => t.Id == id)
+ // .Select(t => t.EMERGENCY)
+ // .First();
+
+ // if (emergencyStatus != 0)
+ // {
+ // return new string[] { "1", "闈炵揣鎬ョ姸鎬侊紝鏃犳硶鎵ц绱ф�ユ斁琛�" };
+ // }
+
+
+ // var outputResult = new SugarParameter("PO_RESULT", null,
+ // DbType.Int32, ParameterDirection.Output, 4000);
+
+ // var outputMessage = new SugarParameter("PO_MSG", null,
+ // DbType.String, ParameterDirection.Output, 4000);
+
+ // var parameters = new List<SugarParameter>
+ //{
+ // new("P_ID", id, DbType.Int32, ParameterDirection.Input),
+ // outputResult,
+ // outputMessage
+ //};
+
+ // db.Ado.ExecuteCommand(
+ // "BEGIN prc_MES_QA_ITEMS_update1(:P_ID, :PO_RESULT, :PO_MSG); END;",
+ // parameters.ToArray());
+
+ // var lotNo1 = db.Queryable<MesQaItemsDetect01>()
+ // .Where(t => t.Id == id)
+ // .Select(t => t.LotNo1)
+ // .First();
+
+ // var resultValue = outputResult.Value?.ToString();
+ // var messageValue = outputMessage.Value?.ToString();
+ // return new string[] { resultValue, messageValue, lotNo1?.ToString() ?? "" };
+ //}
+
+ //public string[] WithdrawEmergencyRelease(int id)
+ //{
+ // var db = SqlSugarHelper.GetInstance();
+
+
+ // int emergencyStatus = db.Queryable<MesQaItemsDetect01>()
+ // .Where(t => t.Id == id)
+ // .Select(t => t.EMERGENCY)
+ // .First();
+
+ // if (emergencyStatus != 0)
+ // {
+ // return new string[] { "1", "闈炵揣鎬ョ姸鎬侊紝鏃犻渶鎾ゅ洖" };
+ // }
+
+ // var outputResult = new SugarParameter("PO_RESULT", null,
+ // DbType.Int32, ParameterDirection.Output, 4000);
+
+ // var outputMessage = new SugarParameter("PO_MSG", null,
+ // DbType.String, ParameterDirection.Output, 4000);
+
+ // var parameters = new List<SugarParameter>
+ //{
+ // new("P_ID", id, DbType.Int32, ParameterDirection.Input),
+ // outputResult,
+ // outputMessage
+ //};
+
+ // db.Ado.ExecuteCommand(
+ // "BEGIN prc_MES_QA_ITEMS_update2(:P_ID, :PO_RESULT, :PO_MSG); END;",
+ // parameters.ToArray());
+
+ // var lotNo1 = db.Queryable<MesQaItemsDetect01>()
+ // .Where(t => t.Id == id)
+ // .Select(t => t.LotNo1)
+ // .First();
+
+
+ // var resultValue = outputResult.Value?.ToString();
+ // var messageValue = outputMessage.Value?.ToString();
+ // return new string[] { resultValue, messageValue, lotNo1?.ToString() ?? "" };
+ //}
+
+
+
+
+
+ public string[] EmergencyRelease(int id)
{
var db = SqlSugarHelper.GetInstance();
- var count = db.Queryable<MesQaIqc>().Where(s => s.EE == 1 &&
- s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Count();
+ int emergencyStatus = db.Queryable<MesQaItemsDetect01>()
+ .Where(t => t.Id == id)
+ .Select(t => t.EMERGENCY)
+ .First();
- if (count <= 0) return [];
-
- var mesQaIqcItem = db
- .Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Select(
- b => new MesQaItemsDetectDetail5
- {
- ReleaseNo = releaseNo,
- FacLevel = b.FacLevel,
- FcheckItem = b.FcheckItem,
- FdownAllow = b.FdownAllow,
- FcheckLevel = b.FREQUENCY,
- Fstand = b.FSTAND,
- FupAllow = b.FupAllow,
- SampleSizeNo = b.SampleSizeNo,
- FenterQty = 0,
- Factory = "1000",
- Company = "1000",
-
-
- // FcheckItemDesc = "0",
- // FcheckResu = "0",
- FcheckTool = b.FcheckTool,
- FspecRequ = b.FspecRequ
- // FtextType = "0",
- // Funit = "0",
- // LastupdateBy = "0",
- // ProcNo = "0",
- // WorkshopCenterCode = "0"
- }).ToList();
-
- mesQaIqcItem.ForEach(item =>
+ if (emergencyStatus != 0)
{
- var LEV = item.FcheckLevel switch
- {
- null => "" // 榛樿鍊�
- ,
- { } s when s.Contains("S1") => "B.FLEVEL_S1",
- { } s when s.Contains("S2") => "B.FLEVEL_S2",
- { } s when s.Contains("S3") => "B.FLEVEL_S3",
- { } s when s.Contains("S4") => "B.FLEVEL_S4",
- { } s when s.Contains("(I)") => "B.FLEVEL_I",
- { } s when s.Contains("(II)") => "B.FLEVEL_II",
- { } s when s.Contains("(III)") => "B.FLEVEL_III",
- _ => ""
- };
+ return new string[] { "1", "闈炵揣鎬ョ姸鎬侊紝鏃犳硶鎵ц绱ф�ユ斁琛�" };
+ }
- if (string.IsNullOrEmpty(LEV))
- throw new Exception(item.SampleSizeNo + "鐨勬楠屾按骞充笉姝ｇ‘");
- 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 " +
- quantity + "<=B.LOT_TO";
+ var outputResult = new SugarParameter("PO_RESULT", null,
+ DbType.Int32, ParameterDirection.Output, 4000);
- var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
+ var outputMessage = new SugarParameter("PO_MSG", null,
+ DbType.String, ParameterDirection.Output, 4000);
- if (string.IsNullOrEmpty(maxBillNo))
- throw new Exception(item.SampleSizeNo + "涓嬬殑" + quantity +
- "杩欎釜鑼冨洿涓嬫病鏈夊尮閰嶅埌妫�楠岄」鐩�");
+ var parameters = new List<SugarParameter>
+ {
+ new("P_ID", id, DbType.Int32, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
- var result = ExtractSubstring(item.FacLevel, '(', ')');
+ db.Ado.ExecuteCommand(
+ "BEGIN prc_MES_QA_ITEMS_update1(:P_ID, :PO_RESULT, :PO_MSG); END;",
+ parameters.ToArray());
- if (string.IsNullOrEmpty(result))
- throw new Exception(item.SampleSizeNo + "涓嬬殑" + quantity +
- "鎷掓敹姘村钩涓嶆纭�");
+ var lotNo1 = db.Queryable<MesQaItemsDetect01>()
+ .Where(t => t.Id == id)
+ .Select(t => t.LotNo1)
+ .First();
- 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 +
- "'";
- var resultClass = db.Ado.SqlQuerySingle<ResultClass>(sql);
-
- item.CheckQyt = resultClass.FSAMPLE_SIZE_WORD;
- item.FreQty = resultClass.Result;
- });
-
- return mesQaIqcItem;
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+ return new string[] { resultValue, messageValue, lotNo1?.ToString() ?? "" };
}
+
+ public string[] WithdrawEmergencyRelease(int id)
+ {
+ var db = SqlSugarHelper.GetInstance();
+
+
+ int emergencyStatus = db.Queryable<MesQaItemsDetect01>()
+ .Where(t => t.Id == id)
+ .Select(t => t.EMERGENCY)
+ .First();
+
+ if (emergencyStatus != 0)
+ {
+ return new string[] { "1", "闈炵揣鎬ョ姸鎬侊紝鏃犻渶鎾ゅ洖" };
+ }
+
+ var outputResult = new SugarParameter("PO_RESULT", null,
+ DbType.Int32, ParameterDirection.Output, 4000);
+
+ var outputMessage = new SugarParameter("PO_MSG", null,
+ DbType.String, ParameterDirection.Output, 4000);
+
+ var parameters = new List<SugarParameter>
+ {
+ new("P_ID", id, DbType.Int32, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ db.Ado.ExecuteCommand(
+ "BEGIN prc_MES_QA_ITEMS_update2(:P_ID, :PO_RESULT, :PO_MSG); END;",
+ parameters.ToArray());
+
+ var lotNo1 = db.Queryable<MesQaItemsDetect01>()
+ .Where(t => t.Id == id)
+ .Select(t => t.LotNo1)
+ .First();
+
+
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+ return new string[] { resultValue, messageValue, lotNo1?.ToString() ?? "" };
+ }
private string ExtractSubstring(string input, char startChar, char endChar)
{
@@ -159,6 +311,31 @@
return input.Substring(startIndex + 1, length);
}
+ public List<QamftpDto> GetAttachments(string releaseNo)
+ {
+ var db = SqlSugarHelper.GetInstance();
+ return db.Queryable<MesQamftp>()
+ .Where(x => x.ReleaseNo == releaseNo)
+ .OrderBy(x => x.Fdate, OrderByType.Desc)
+ .Select(x => new QamftpDto
+ {
+ Id = x.Id,
+ ItemNo = x.ItemNo,
+ Ftype = x.Ftype,
+ Fattach = x.Fattach,
+ Fversion = x.Fversion,
+ Fdate = x.Fdate,
+ CreateBy = x.CreateBy,
+ CreateDate = x.CreateDate,
+ Company = x.Company,
+ Factory = x.Factory,
+ ReleaseNo = x.ReleaseNo,
+ F_type = x.F_type,
+ LastupdateBy = x.LastupdateBy,
+ LastupdateDate = x.LastupdateDate,
+ ItemId = x.ItemId
+ }).ToList();
+ }
public int saveItem(LLJDto rkjDto)
{
var items = rkjDto.items;
@@ -235,7 +412,9 @@
a.FreQty,
a.CheckQyt,
a.FcheckResu,
- a.FcheckItemDesc
+ a.FcheckItemDesc,
+ a.Funit,
+ a.Meom
}).Select((a, b) => new MesQaItemsDetectDetail5
{
Id = a.Id,
@@ -255,7 +434,10 @@
Company = "1000",
FenterQty = SqlFunc.AggregateCount(b.Id),
FcheckResu = a.FcheckResu,
- FcheckItemDesc = a.FcheckItemDesc
+ // FcheckItemDesc = a.FcheckItemDesc
+ FcheckItemDesc = a.FspecRequ,
+ Funit = a.Funit,
+ Meom = a.Meom,
}).ToList();
}
@@ -336,8 +518,8 @@
return commit;
});
-
- var isNull = db.Queryable<MesQaItemsDetectDetail5>()
+ //5.20xwt淇敼灏嗘洿鏂颁富琛ㄦ楠岀粨鏋滃瓧娈垫斁鍦↖qcQaSubmit鏂规硶涓�
+ /*var isNull = db.Queryable<MesQaItemsDetectDetail5>()
.Where(s => s.ReleaseNo == detail.ReleaseNo && s.FcheckResu == null)
.Count();
@@ -375,7 +557,7 @@
.SetColumns(s => s.LastupdateDate == DateTime.Now)
.Where(s => s.ReleaseNo == detail.ReleaseNo)
.ExecuteCommand();
- });
+ });*/
// if (FcheckResu.Equals("涓嶅悎鏍�"))
//鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥
/// saveDetect02(detail.Id, detail.CreateBy);
@@ -517,6 +699,7 @@
return db.Updateable<MesQaItemsDetect01>()
.SetColumns(it =>
it.FngDesc == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .SetColumns(it => it.PHSY == dto.PHSY)//鐮村潖瀹為獙鏁�
.Where(it => it.ReleaseNo == dto.releaseNo)
.ExecuteCommand();
});
@@ -528,8 +711,11 @@
return SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<MesQaItemsDetectDetail5>()
- // .SetColumns(it =>
- // it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .SetColumns(it => new MesQaItemsDetectDetail5
+ {
+ Funit = dto.Remarks,
+ Meom = dto.Meom
+ })
.Where(it => it.Id == dto.pid)
.ExecuteCommand();
});
@@ -601,6 +787,34 @@
if ("1".Equals(resultValue)) throw new Exception(messageValue);
+ var sum = db.Queryable<MesQaItemsDetectDetail5>()
+ .Where(s => s.ReleaseNo == dto.releaseNo).Count();
+
+ if (sum == 0) return true;
+
+ var icount = db.Queryable<MesQaItemsDetectDetail5>()
+ .Where(s => s.ReleaseNo == dto.releaseNo && s.FcheckResu == "鍚堟牸")
+ .Count();
+
+ var FcheckResu = "涓嶅悎鏍�";
+
+ if (sum == icount)
+ FcheckResu = "鍚堟牸";
+
+ var sysUser = db.Queryable<SysUser>()
+ .Where(s => s.Fcode == dto.userNo).First();
+
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<MesQaItemsDetect01>()
+ .SetColumns(s => s.FcheckResu == FcheckResu)
+ .SetColumns(s => s.FcheckDate == DateTime.Now)
+ .SetColumns(s => s.FcheckBy == sysUser.Fname)
+ .SetColumns(s => s.LastupdateBy == dto.userNo)
+ .SetColumns(s => s.LastupdateDate == DateTime.Now)
+ .Where(s => s.ReleaseNo == dto.releaseNo)
+ .ExecuteCommand();
+ });
return true;
}
catch (Exception ex)
--
Gitblit v1.9.3