From 8a53164b2ff75612596a7c65eda284b5a03e01f1 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 24 七月 2025 23:31:04 +0800
Subject: [PATCH] Update SJService getPage method to return total count like LljService
---
StandardPda/MES.Service/service/QC/SJService.cs | 39 ++++++++++++++++---
StandardPda/MES.Service/Dto/service/SJPageResult.cs | 24 ++++++++++++
StandardPda/MESApplication/Controllers/QC/SJController.cs | 31 +++++++++++++--
3 files changed, 84 insertions(+), 10 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/service/SJPageResult.cs b/StandardPda/MES.Service/Dto/service/SJPageResult.cs
index 0064430..3d59644 100644
--- a/StandardPda/MES.Service/Dto/service/SJPageResult.cs
+++ b/StandardPda/MES.Service/Dto/service/SJPageResult.cs
@@ -82,4 +82,28 @@
/// </summary>
[SugarColumn(ColumnName = "DAA008")]
public decimal? Daa008 { get; set; }
+
+ /// <summary>
+ /// 鎻愪氦鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "FSUBMIT")]
+ public decimal? FSubmit { get; set; }
+
+ /// <summary>
+ /// 鎻愪氦浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "FSUBMIT_BY")]
+ public string? FSubmitBy { get; set; }
+
+ /// <summary>
+ /// 鎻愪氦鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "FSUBMIT_DATE")]
+ public DateTime? FSubmitDate { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "MOID_NUM")]
+ public string? MoidNum { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/service/QC/SJService.cs b/StandardPda/MES.Service/service/QC/SJService.cs
index f47a65b..639ef64 100644
--- a/StandardPda/MES.Service/service/QC/SJService.cs
+++ b/StandardPda/MES.Service/service/QC/SJService.cs
@@ -34,7 +34,7 @@
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
- public List<SJPageResult> getPage(SJPageResult queryObj)
+ public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -43,24 +43,34 @@
// if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
// lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
+ var totalCount = 0;
+
var data = db.Queryable<SJPageResult>()
.WhereIF(lineNo != null && lineNo.Length > 0,
a => lineNo.Contains(a.line))
.WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
.WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
a => a.BillNo == queryObj.BillNo)
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ // "鏈畬鎴�".Equals(queryObj.Result),
+ // a => a.Result == queryObj.Result && (a.FSubmit == 0 || a.FSubmit == null))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result == queryObj.Result)
+ a => a.FSubmit == 0 || a.FSubmit == null)
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ // !"鏈畬鎴�".Equals(queryObj.Result),
+ // a => a.Result != "鏈畬鎴�" && a.FSubmit == 1)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result != "鏈畬鎴�")
+ a => a.FSubmit == 1)
.OrderBy(a => a.BillNo, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
- return data;
+ return (data, totalCount);
}
@@ -222,7 +232,8 @@
item.Items = getQSItems(qsItemIpiReq.Id, null);
var sjPageResult = new SJPageResult
{ Id = item.From.Id, Limit = 1, PageIndex = 1 };
- item.Result = getPage(sjPageResult)[0];
+ var pageResult = getPage(sjPageResult);
+ item.Result = pageResult.item[0];
return item;
}
@@ -453,4 +464,20 @@
return withOracle;
}
+
+ public bool SJQaSubmit(LLJDto rkjDto)
+ {
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsItemIpiReq>()
+ .SetColumns(s => s.Fsubmit == 1)
+ .SetColumns(s => s.FsubmitBy == rkjDto.userNo)
+ .SetColumns(s => s.FsubmitDate == DateTime.Now)
+ .Where(s => s.Id == rkjDto.gid)
+ .ExecuteCommand();
+ });
+
+ return useTransactionWithOracle > 0;
+ }
}
\ No newline at end of file
diff --git a/StandardPda/MESApplication/Controllers/QC/SJController.cs b/StandardPda/MESApplication/Controllers/QC/SJController.cs
index 107d6b9..d970890 100644
--- a/StandardPda/MESApplication/Controllers/QC/SJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/SJController.cs
@@ -41,14 +41,14 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SJService().getPage(queryObj);
- resultInfos.tbBillList = tbBillList;
+ var (item, totalCount) = new SJService().getPage(queryObj);
+ resultInfos.tbBillList = item;
return new ResponseResult
{
status = 0,
message = "OK",
- data = resultInfos
+ data = resultInfos,
+ TotalCount = totalCount
};
}
catch (Exception ex)
@@ -319,4 +319,27 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ //IqcQaSubmit
+ [HttpPost("SJQaSubmit")]
+ public ResponseResult SJQaSubmit(LLJDto rkjDto)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList =
+ new SJService().SJQaSubmit(rkjDto);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3