From 74ab9465837f8a6f9eae854059e9783eff24e173 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期一, 14 七月 2025 18:06:24 +0800
Subject: [PATCH] 多组织修改
---
MES.Service/service/QC/SJService.cs | 127 ++++++++++++++++++++++++++++++++----------
1 files changed, 97 insertions(+), 30 deletions(-)
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index db188ef..7292b12 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -1,8 +1,10 @@
-锘縰sing MES.Service.DB;
+锘縰sing System.Data;
+using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using DbType = System.Data.DbType;
namespace MES.Service.service.QC;
@@ -34,9 +36,12 @@
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
- public List<SJPageResult> getPage(SJPageResult queryObj)
+ public (List<SJPageResult> items, int TotalCount) getPage(
+ SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
+
+ var totalCount = 0;
string[]? lineNo = null;
@@ -57,10 +62,15 @@
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
a => a.Result != "鏈畬鎴�")
+ .WhereIF(queryObj.Comments != null,
+ a => a.Comments == queryObj.Comments)
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.SearchValue), a =>
+ a.BillNo.Contains(queryObj.SearchValue)
+ || a.ItemNo.Contains(queryObj.SearchValue))
.OrderBy(a => a.BillNo, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
- return data;
+ return (data, totalCount);
}
@@ -103,8 +113,8 @@
return db
.Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(
- b => new QsItemIpiItem
+ .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(b =>
+ new QsItemIpiItem
{
ProjName = b.ProjName,
ItemMod = b.ItemMod,
@@ -188,21 +198,20 @@
{
var qsItemIpiReq = item.From;
var qsItemIpiItems = item.Items;
- SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- qsItemIpiReq.StatusDate = DateTime.Now;
- var pid = db.Insertable(qsItemIpiReq)
- .ExecuteReturnIdentity();
- qsItemIpiReq.Id = pid;
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ qsItemIpiReq.StatusDate = DateTime.Now;
+ var pid = db.Insertable(qsItemIpiReq)
+ .ExecuteReturnIdentity();
+ qsItemIpiReq.Id = pid;
- item.gid = pid;
+ item.gid = pid;
- qsItemIpiItems.ForEach(s => s.Pid = pid);
+ qsItemIpiItems.ForEach(s => s.Pid = pid);
- return db.Insertable(qsItemIpiItems)
- .ExecuteCommand();
- });
+ return db.Insertable(qsItemIpiItems)
+ .ExecuteCommand();
+ });
item.Items = getQSItems(qsItemIpiReq.Id, null);
//娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
@@ -223,7 +232,7 @@
item.Items = getQSItems(qsItemIpiReq.Id, null);
var sjPageResult = new SJPageResult
{ Id = item.From.Id, Limit = 1, PageIndex = 1 };
- item.Result = getPage(sjPageResult)[0];
+ item.Result = getPage(sjPageResult).items[0];
return item;
}
@@ -231,14 +240,13 @@
public QsItem SaveItem(QsItem item)
{
var qsItemIpiItems = item.Items;
- SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- qsItemIpiItems.ForEach(s => s.Pid = item.gid);
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ qsItemIpiItems.ForEach(s => s.Pid = item.gid);
- return db.Insertable(qsItemIpiItems)
- .ExecuteCommand();
- });
+ return db.Insertable(qsItemIpiItems)
+ .ExecuteCommand();
+ });
item.Items = getQSItems(item.gid, null);
//娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
@@ -322,8 +330,8 @@
if (count == passCount) result = 1;
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
var commit = 0;
commit += db.Updateable<QsItemIpiItem>()
@@ -358,8 +366,8 @@
//鍚堟牸鐨勬楠岀粨鏋滅瓑浜庢�绘楠屾暟瑙嗕负鍚堟牸
if (icount == passCount) result = 1;
- useTransactionWithOracle += SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ useTransactionWithOracle +=
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<QsItemIpiReq>()
.SetColumns(s => s.IsPass == result)
@@ -404,6 +412,19 @@
return db.Updateable<QsItemIpiReq>()
.SetColumns(it =>
it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .Where(it => it.Id == dto.gid)
+ .ExecuteCommand();
+ });
+ }
+
+ //涓昏〃淇敼澶囨敞瀛楁1
+ public int saveCommentGid(QsItem dto)
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsItemIpiReq>()
+ .SetColumns(it =>
+ it.Comments == dto.Comments) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
.Where(it => it.Id == dto.gid)
.ExecuteCommand();
});
@@ -455,4 +476,50 @@
return withOracle;
}
+
+ public bool SJQaSubmit(QsItem item)
+ {
+ var (factory, company) = UserUtil.GetFactory(item.userNo);
+ try
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ 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_Id", item.gid, DbType.Int32, ParameterDirection.Input),
+ new("p_Flag", 1, DbType.Int32, ParameterDirection.Input),
+ new("p_User", item.userNo, DbType.String,
+ ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_WOMDAA_SJ_UPDATE_RES(:p_Id,:p_Flag,:p_User,:o_Result, :o_Msg); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+
+ if ("1".Equals(resultValue)) throw new Exception(messageValue);
+ if ("0".Equals(resultValue)) throw new Exception(messageValue);
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3