From 974e3af4e6316b59e761925b1a511a0470f2a365 Mon Sep 17 00:00:00 2001 From: xwt <2740516069@qq.com> Date: 星期二, 20 五月 2025 09:22:24 +0800 Subject: [PATCH] 点击提交检验才可将表单移动到已检验 --- StandardInterface/MES.Service/service/QC/LljService.cs | 44 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 36 insertions(+), 8 deletions(-) diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs index 1a3d6c4..1ef39c8 100644 --- a/StandardInterface/MES.Service/service/QC/LljService.cs +++ b/StandardInterface/MES.Service/service/QC/LljService.cs @@ -63,9 +63,9 @@ /// <param name="quantity"></param> /// <param name="releaseNo"></param> /// <returns></returns> - public string[] SetItems(string itemNo, - decimal quantity, string releaseNo) + public string[] SetItems(decimal itemNo, decimal quantity, string releaseNo) { + // 瀹氫箟杈撳嚭鍙傛暟 var outputResult = new SugarParameter("o_Result", null, DbType.Int32, ParameterDirection.Output, @@ -78,8 +78,8 @@ // 瀹氫箟杈撳叆鍙傛暟 var parameters = new List<SugarParameter> { - new("P_RELEASE_NO", releaseNo, - DbType.String, ParameterDirection.Input), + new("P_RELEASE_NO", releaseNo, DbType.String, ParameterDirection.Input), + new("P_ITEM_ID", itemNo, DbType.String, ParameterDirection.Input), outputResult, outputMessage }; @@ -88,7 +88,7 @@ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼ db.Ado.ExecuteCommand( - "BEGIN PRC_QA_ITEM_INSERT_BTN(:P_RELEASE_NO, :o_Result, :o_Msg); END;", + "BEGIN PRC_QA_ITEM_INSERT_BTN(:P_RELEASE_NO,:P_ITEM_ID, :o_Result, :o_Msg); END;", parameters.ToArray()); // 鑾峰彇杈撳嚭鍙傛暟鐨勫�� @@ -294,8 +294,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(); @@ -333,7 +333,7 @@ .SetColumns(s => s.LastupdateDate == DateTime.Now) .Where(s => s.ReleaseNo == detail.ReleaseNo) .ExecuteCommand(); - }); + });*/ // if (FcheckResu.Equals("涓嶅悎鏍�")) //鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥 /// saveDetect02(detail.Id, detail.CreateBy); @@ -559,6 +559,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