From 92e4d27f7083331fdffec1edb83211ad73ce51d6 Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期六, 06 十二月 2025 11:46:17 +0800
Subject: [PATCH] 新加首检搜索框查
---
StandardPda/MES.Service/service/QC/SJService.cs | 104 ++++++++++++++++++--
StandardPda/MES.Service/Dto/service/SJPageResult.cs | 4
StandardPda/MESApplication/Controllers/QC/SJController.cs | 2
StandardPda/MES.Service/Dto/service/SJPageResult2.cs | 133 ++++++++++++++++++++++++++
4 files changed, 231 insertions(+), 12 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/service/SJPageResult.cs b/StandardPda/MES.Service/Dto/service/SJPageResult.cs
index 410b97f..c5a2053 100644
--- a/StandardPda/MES.Service/Dto/service/SJPageResult.cs
+++ b/StandardPda/MES.Service/Dto/service/SJPageResult.cs
@@ -126,4 +126,8 @@
public string? DAA019 { get; set; }
public string? searchValue { get; set; }
+
+ // 娣诲姞 selectedIndex 灞炴�т互鏀寔鍓嶇浼犲叆鐨勬悳绱㈤�夐」绱㈠紩 鏂版坊鍔�
+
+ //public int? selectedIndex { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Dto/service/SJPageResult2.cs b/StandardPda/MES.Service/Dto/service/SJPageResult2.cs
new file mode 100644
index 0000000..be2eac4
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/service/SJPageResult2.cs
@@ -0,0 +1,133 @@
+using MES.Service.Dto.@base;
+using SqlSugar;
+
+namespace MES.Service.Dto.service;
+
+[SugarTable("V_MES_SJ")] //鐢ㄤ簬SqlSugar
+public class SJPageResult2 : Page
+{
+ public decimal? Id { get; set; }
+
+ [SugarColumn(ColumnName = "BILL_NO")] //鐢ㄤ簬SqlSugar
+ public string? BillNo { get; set; }
+
+
+ [SugarColumn(ColumnName = "STATUS_DATE")] //鐢ㄤ簬SqlSugar
+ public DateTime? StatusDate { get; set; }
+
+ public string? FName { get; set; }
+ public string? Result { get; set; }
+
+ [SugarColumn(ColumnName = "STATUS_USER")] //鐢ㄤ簬SqlSugar
+ public string? StatusUser { get; set; }
+
+
+ //WORKSHOP_CODE
+ // [SugarColumn(ColumnName = "WORKSHOP_CODE")] //鐢ㄤ簬SqlSugar
+ // public string? workshopCode { get; set; }
+
+ //PBAID
+ [SugarColumn(ColumnName = "PBAID")] //鐢ㄤ簬SqlSugar
+ public string? Pbaid { get; set; }
+
+ //COMPLETE_TIME
+ // [SugarColumn(ColumnName = "COMPLETE_TIME")] //鐢ㄤ簬SqlSugar
+ // public DateTime? CompleteTime { get; set; }
+
+ [SugarColumn(ColumnName = "CREATE_TIME")] //鐢ㄤ簬SqlSugar
+ public DateTime? CreateTime { get; set; }
+
+ [SugarColumn(ColumnName = "COMMENTS")] //鐢ㄤ簬SqlSugar
+ public string? Comments { get; set; }
+
+ // [SugarColumn(ColumnName = "WORKSHOP_NAME")] //鐢ㄤ簬SqlSugar
+ // public string? WorkshopName { get; set; }
+
+ //ITEM_MOD
+ [SugarColumn(ColumnName = "ITEM_MOD")] //鐢ㄤ簬SqlSugar
+ public string? ItemMod { get; set; }
+
+ //ITEM_NAME
+ // [SugarColumn(ColumnName = "ITEM_NAME")] //鐢ㄤ簬SqlSugar
+ // public string? ItemName { get; set; }
+
+ [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
+ public string? ItemNo { get; set; }
+
+ [SugarColumn(ColumnName = "DAA001")] //鐢ㄤ簬SqlSugar
+ public string? daa001 { get; set; }
+
+ //LINE
+ [SugarColumn(ColumnName = "LINE")] //鐢ㄤ簬SqlSugar
+ public string? line { get; set; }
+
+
+ [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
+ public string? Remarks { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DAA003")]
+ public string? Daa003 { get; set; }
+
+ /// <summary>
+ /// 浜у搧瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "DAA004")]
+ public string? Daa004 { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鏁伴噺
+ /// </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; }
+
+ /// <summary>
+ /// 椤圭洰
+ /// </summary>
+ [SugarColumn(ColumnName = "PROJECT_CODE")]
+ public string? PROJECT_CODE { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "DAA018")]
+ public string? daa018 { get; set; }
+
+ /// <summary>
+ /// 榻愬鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "qtzt")]
+ public string? DAA019 { get; set; }
+
+ public string? searchValue { get; set; }
+
+ // 娣诲姞 selectedIndex 灞炴�т互鏀寔鍓嶇浼犲叆鐨勬悳绱㈤�夐」绱㈠紩 鏂版坊鍔�
+
+ public int? selectedIndex { 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 aa04f96..97357d1 100644
--- a/StandardPda/MES.Service/service/QC/SJService.cs
+++ b/StandardPda/MES.Service/service/QC/SJService.cs
@@ -74,7 +74,74 @@
// return (data, totalCount);
//}
- public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
+ //public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
+ //{
+ // var db = SqlSugarHelper.GetInstance();
+
+ // string[]? lineNo = null;
+
+ // // if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
+ // // lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
+
+ // var totalCount = 0;
+ // string searchValue = queryObj.searchValue?.Trim();
+
+ // // ========= 鏋勫缓鍩虹 query =========
+ // 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)
+ // .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
+ // a => a.BillNo == queryObj.BillNo)
+ // // 鏈畬鎴�
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ // "鏈畬鎴�".Equals(queryObj.Result),
+ // a => a.FSubmit == 0 || a.FSubmit == null)
+ // // 宸插畬鎴�
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ // !"鏈畬鎴�".Equals(queryObj.Result),
+ // a => a.FSubmit == 1);
+
+ // // ========= SearchValue 鍒ゆ柇 =========
+
+ // // SearchValue 涓虹┖锛氳繑鍥炲叏閮�
+ // if (string.IsNullOrWhiteSpace(searchValue))
+ // {
+ // var allData = query
+ // .OrderBy(a => a.BillNo, OrderByType.Desc)
+ // .ToPageList(
+ // Math.Max(queryObj.PageIndex, 1),
+ // Math.Max(queryObj.Limit, 1),
+ // ref totalCount
+ // );
+
+ // return (allData, totalCount);
+ // }
+
+ // // SearchValue 涓嶄负绌猴細妯＄硦鏌� BILL_NO / ITEM_NO
+ // query = query.Where(a =>
+ // SqlFunc.Like(SqlFunc.Trim(a.BillNo).ToLower(), $"%{searchValue.ToLower()}%") ||
+ // SqlFunc.Like(SqlFunc.Trim(a.ItemNo).ToLower(), $"%{searchValue.ToLower()}%")
+ // );
+
+ // // ========= 鎵ц鍒嗛〉 =========
+ // var data = query
+ // .OrderBy(a => a.BillNo, OrderByType.Desc)
+ // .ToPageList(
+ // Math.Max(queryObj.PageIndex, 1),
+ // Math.Max(queryObj.Limit, 1),
+ // ref totalCount
+ // );
+
+ // return (data, totalCount);
+ //}
+
+
+
+ public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult2 queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -85,6 +152,9 @@
var totalCount = 0;
string searchValue = queryObj.searchValue?.Trim();
+
+ // 鑾峰彇鎼滅储閫夐」绱㈠紩 (0:椤圭洰, 1:绾夸綋, 2:宸ュ崟鍙�, 3:鐗╂枡鍙�, 4:鐗╂枡鍚�)
+ int selectedIndex = queryObj.selectedIndex ?? 0;
// ========= 鏋勫缓鍩虹 query =========
var query = db.Queryable<SJPageResult>()
@@ -121,11 +191,27 @@
return (allData, totalCount);
}
- // SearchValue 涓嶄负绌猴細妯＄硦鏌� BILL_NO / ITEM_NO
- query = query.Where(a =>
- SqlFunc.Like(SqlFunc.Trim(a.BillNo).ToLower(), $"%{searchValue.ToLower()}%") ||
- SqlFunc.Like(SqlFunc.Trim(a.ItemNo).ToLower(), $"%{searchValue.ToLower()}%")
- );
+ // SearchValue 涓嶄负绌猴細鏍规嵁selectedIndex杩涜涓嶅悓瀛楁鐨勬ā绯婃煡璇�
+ switch (queryObj.selectedIndex)
+ {
+ case 2: // 宸ュ崟鍙�
+ query = query.Where(a => SqlFunc.Like(a.daa001.ToLower(), $"%{searchValue.ToLower()}%"));
+ break;
+ case 3: // 鐗╂枡鍙�
+ query = query.Where(a => SqlFunc.Like(a.ItemNo.ToLower(), $"%{searchValue.ToLower()}%"));
+ break;
+ case 4: // 鐗╂枡鍚嶇О
+ query = query.Where(a => SqlFunc.Like(a.Daa003.ToLower(), $"%{searchValue.ToLower()}%"));
+ break;
+ case 0: // 椤圭洰缂栫爜
+ query = query.Where(a => SqlFunc.Like(a.PROJECT_CODE.ToLower(), $"%{searchValue.ToLower()}%"));
+ break;
+ case 1: // 绾夸綋
+ query = query.Where(a => SqlFunc.Like(a.line.ToLower(), $"%{searchValue.ToLower()}%"));
+ break;
+ default:
+ return (new List<SJPageResult>(), 0);
+ }
// ========= 鎵ц鍒嗛〉 =========
var data = query
@@ -138,10 +224,6 @@
return (data, totalCount);
}
-
-
-
-
@@ -306,7 +388,7 @@
});
item.Items = getQSItems(qsItemIpiReq.Id, null);
- var sjPageResult = new SJPageResult
+ var sjPageResult = new SJPageResult2
{ Id = item.From.Id, Limit = 1, PageIndex = 1 };
var pageResult = getPage(sjPageResult);
item.Result = pageResult.item[0];
diff --git a/StandardPda/MESApplication/Controllers/QC/SJController.cs b/StandardPda/MESApplication/Controllers/QC/SJController.cs
index 7ac7a40..d05b6af 100644
--- a/StandardPda/MESApplication/Controllers/QC/SJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/SJController.cs
@@ -43,7 +43,7 @@
[HttpPost("GetPage")]
- public ResponseResult GetPage([FromBody] SJPageResult queryObj)
+ public ResponseResult GetPage([FromBody] SJPageResult2 queryObj)
{
try
{
--
Gitblit v1.9.3