From d1494fe0c1c68a8bd5044814ec7368a7db918dde Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期二, 03 六月 2025 14:10:01 +0800
Subject: [PATCH] 来料检搜索框新增物料规格
---
StandardInterface/MES.Service/service/QC/LljService.cs | 172 ++++++++++++++++++++++++++------------------------------
1 files changed, 80 insertions(+), 92 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index f1f2206..e07051c 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -43,7 +43,13 @@
|| a.ItemName.ToLower()
.Contains(queryObj.SearchValue.ToLower())
|| a.ItemNo.ToLower()
- .Contains(queryObj.SearchValue.ToLower()))
+ .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 => a.Id)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -52,96 +58,49 @@
}
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
- 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 count = db.Queryable<MesQaIqc>().Where(s => s.EE == 1 &&
- s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Count();
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+ string[] msg = new string[2];
+ msg[0] = resultValue;
+ msg[1] = messageValue;
+ return msg;
- 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 =>
- {
- 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",
- _ => ""
- };
-
- 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 maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
-
- if (string.IsNullOrEmpty(maxBillNo))
- throw new Exception(item.SampleSizeNo + "涓嬬殑" + quantity +
- "杩欎釜鑼冨洿涓嬫病鏈夊尮閰嶅埌妫�楠岄」鐩�");
-
- var result = ExtractSubstring(item.FacLevel, '(', ')');
-
- if (string.IsNullOrEmpty(result))
- throw new Exception(item.SampleSizeNo + "涓嬬殑" + quantity +
- "鎷掓敹姘村钩涓嶆纭�");
-
- 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;
}
private string ExtractSubstring(string input, char startChar, char endChar)
@@ -255,7 +214,8 @@
Company = "1000",
FenterQty = SqlFunc.AggregateCount(b.Id),
FcheckResu = a.FcheckResu,
- FcheckItemDesc = a.FcheckItemDesc
+ // FcheckItemDesc = a.FcheckItemDesc
+ FcheckItemDesc = a.FspecRequ
}).ToList();
}
@@ -336,8 +296,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 +335,7 @@
.SetColumns(s => s.LastupdateDate == DateTime.Now)
.Where(s => s.ReleaseNo == detail.ReleaseNo)
.ExecuteCommand();
- });
+ });*/
// if (FcheckResu.Equals("涓嶅悎鏍�"))
//鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥
/// saveDetect02(detail.Id, detail.CreateBy);
@@ -528,8 +488,8 @@
return SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<MesQaItemsDetectDetail5>()
- // .SetColumns(it =>
- // it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .SetColumns(it =>
+ it.Funit == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
.Where(it => it.Id == dto.pid)
.ExecuteCommand();
});
@@ -601,6 +561,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