From 82dac540156cb29e58c86f7d7d840e3c7e548c15 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 14 八月 2025 19:55:41 +0800
Subject: [PATCH] 来料检，入库检，首检巡检。
---
StandardInterface/MES.Service/service/QC/SJService.cs | 136 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 126 insertions(+), 10 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/SJService.cs b/StandardInterface/MES.Service/service/QC/SJService.cs
index db188ef..dcc7beb 100644
--- a/StandardInterface/MES.Service/service/QC/SJService.cs
+++ b/StandardInterface/MES.Service/service/QC/SJService.cs
@@ -3,6 +3,7 @@
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using System.Data;
namespace MES.Service.service.QC;
@@ -30,11 +31,11 @@
number = no.ToString().PadLeft(4, '0');
}
- return "SJN" + date.Replace("-", "") + number;
+ return "SJ" + date.Replace("-", "") + number;
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
- public List<SJPageResult> getPage(SJPageResult queryObj)
+ public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -43,7 +44,7 @@
if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
- var data = db.Queryable<SJPageResult>()
+ var query = db.Queryable<SJPageResult>()
.WhereIF(lineNo != null && lineNo.Length > 0,
a => lineNo.Contains(a.line))
.WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
@@ -52,15 +53,60 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result == queryObj.Result)
+ a => a.Fsubmit == 0)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result != "鏈畬鎴�")
- .OrderBy(a => a.BillNo, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ a => a.Fsubmit == 1);
- return data;
+ // 鏂板鐨勫姩鎬佹悳绱㈤�昏緫
+ if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
+ {
+ switch (queryObj.searchField)
+ {
+ case "daa001": // 宸ュ崟
+ query = query.Where(x => x.daa001.Contains(queryObj.SearchValue));
+ break;
+ case "billNo": // 妫�楠屽崟鍙�
+ query = query.Where(x => x.BillNo.Contains(queryObj.SearchValue));
+ break;
+ case "line": // 浜х嚎
+ query = query.Where(x => x.line.Contains(queryObj.SearchValue));
+ break;
+ case "itemNo": // 鐗╂枡缂栫爜
+ query = query.Where(x => x.ItemNo.Contains(queryObj.SearchValue));
+ break;
+ case "daa003": // 鐗╂枡鍚嶇О
+ query = query.Where(x => x.Daa003.Contains(queryObj.SearchValue));
+ break;
+ default:
+ // 濡傛灉娌℃湁鎸囧畾瀛楁鎴栧瓧娈典笉鍖归厤锛屼娇鐢ㄥ師鏈夌殑妯＄硦鏌ヨ閫昏緫浣滀负鍏滃簳鏂规
+ query = query.Where(x =>
+ x.ItemNo.Contains(queryObj.SearchValue) ||
+ x.Daa003.Contains(queryObj.SearchValue) ||
+ x.daa001.Contains(queryObj.SearchValue) ||
+ x.BillNo.Contains(queryObj.SearchValue) ||
+ x.line.Contains(queryObj.SearchValue));
+ break;
+ }
+ }
+ // 涓轰簡鍏煎鏃х増鏈紝濡傛灉娌℃湁浼犻�� searchField锛屼娇鐢ㄥ師鏉ョ殑鏌ヨ閫昏緫
+ else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
+ {
+ // 淇濇寔鍘熸湁鐨勫瀛楁妯＄硦鏌ヨ閫昏緫
+ query = query.Where(x =>
+ x.ItemNo.Contains(queryObj.SearchValue) ||
+ x.Daa003.Contains(queryObj.SearchValue) ||
+ x.daa001.Contains(queryObj.SearchValue) ||
+ x.BillNo.Contains(queryObj.SearchValue) ||
+ x.line.Contains(queryObj.SearchValue));
+ }
+
+ var totalCount = 0;
+ var data = query.OrderBy(a => a.BillNo, OrderByType.Desc)
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+ return (data, totalCount);
}
@@ -92,7 +138,7 @@
// result = "鏈娴�"
// }).ToList();
// }
- public List<QsItemIpiItem> SetQSItems(string itemNo)
+ public List<QsItemIpiItem> SetQSItems(string? itemNo)
{
var db = SqlSugarHelper.GetInstance();
@@ -108,6 +154,7 @@
{
ProjName = b.ProjName,
ItemMod = b.ItemMod,
+
InspectionMethod = b.InspectionMethod,
UsingInstruments = b.UsingInstruments,
LevelNum = SqlFunc.IsNull(
@@ -223,7 +270,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).item[0];
return item;
}
@@ -455,4 +502,73 @@
return withOracle;
}
+ //鍒锋柊妫�楠岄」鐩�
+ public (int result, string message) GenUpdate(decimal? id, string? no, string? user)
+ {
+ var outputResult = new SugarParameter("PO_RESULT", null, System.Data.DbType.Int32, ParameterDirection.Output, 4000);
+ var outputMessage = new SugarParameter("PO_TEXT", null, System.Data.DbType.String, ParameterDirection.Output, 4000);
+
+ var parameters = new List<SugarParameter>
+ {
+ new("P_ID", id, System.Data.DbType.Decimal, ParameterDirection.Input),
+ new("P_NO", no, System.Data.DbType.String, ParameterDirection.Input),
+ new("P_USER", user, System.Data.DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_GEN_UPDATE(:P_ID, :P_NO, :P_USER, :PO_RESULT, :PO_TEXT); END;",
+ parameters.ToArray());
+
+ int result = outputResult.Value == null ? -1 : Convert.ToInt32(outputResult.Value);
+ string message = outputMessage.Value?.ToString() ?? "";
+
+ return (result, message);
+ }
+
+ public bool SjSubmit(SJDto dto)
+ {
+ try
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outputResult = new SugarParameter("c_res", null,
+ System.Data.DbType.Int32, ParameterDirection.Output,
+ 4000);
+
+ var outputMessage = new SugarParameter("c_msg", null,
+ System.Data.DbType.String,
+ ParameterDirection.Output, 4000);
+
+ // 瀹氫箟杈撳叆鍙傛暟锛屽浐瀹欶LAG涓�1锛堝鏍革級
+ var parameters = new List<SugarParameter>
+ {
+ new("P_ID", dto.id, System.Data.DbType.Decimal, ParameterDirection.Input),
+ new("P_FLAG", 1, System.Data.DbType.Int32, ParameterDirection.Input),
+ new("P_USER", dto.userNo, System.Data.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, :c_res, :c_msg); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+
+ if ("1".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