From ac2f359d397c0ec5eb87c9cbc415584d1d88439f Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 16 九月 2025 08:56:53 +0800
Subject: [PATCH] 采购退料:列表选择、列表明细更改为存储过程，添加组织隔离，添加库位列表，添加隐藏完结单号功能
---
service/QC/IpqcService.cs | 73 ++----------------------------------
1 files changed, 5 insertions(+), 68 deletions(-)
diff --git a/service/QC/IpqcService.cs b/service/QC/IpqcService.cs
index d9bcc43..73a62e1 100644
--- a/service/QC/IpqcService.cs
+++ b/service/QC/IpqcService.cs
@@ -93,6 +93,10 @@
public (List<VIpqcXj> item, int TotalCount) getPageXj(XJPageResult queryObj)
{
+
+
+
+ var totalCount = 0;
var parsedGuid = Guid.Empty;
if (!queryObj.id.IsNullOrEmpty())
{
@@ -101,74 +105,7 @@
throw new ApplicationException("GUID杞崲閿欒");
}
-
- var totalCount = 0;
-
- //var pageList = Db.Queryable<VIpqcXj>()
- // .WhereIF(!string.IsNullOrWhiteSpace(queryObj.keyword), a =>
- // a.ItemNo.Contains(queryObj.keyword) ||
- // a.ItemName.Contains(queryObj.keyword) ||
- // a.Daa001.Contains(queryObj.keyword) ||
- // a.ReleaseNo.Contains(queryObj.keyword) ||
- // a.DepartmentName.Contains(queryObj.keyword) ||
- // a.xtName.Contains(queryObj.keyword)
- // )
- // .WhereIF(UtilityHelper.CheckGuid(parsedGuid),
- // a => a.Guid == parsedGuid.ToString())
- // .Where(a => (a.FSubmit ?? 0) == 0)
- // .OrderByDescending(a => a.CreateDate)
- // .OrderBy(a => a.checkTimeSlot)
- // .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
-
- var sql = string.Format(@"SELECT [guid],
- [fsubmit],
- [MODIFY1_FLAG],
- [LOT_NO],
- [FNG_HANDLE],
- [FVERSION],
- [LOT_NO1],
- [FCOVERT_QTY],
- [FCHECK_RESU],
- [RELEASE_NO],
- [DAA001],
- [FBATCH_QTY],
- [ITEM_NO],
- [FCHECK_BY],
- [FNG_DESC],
- [CREATE_BY],
- [DAA013],
- [sj_xt],
- [departmentname],
- [name],
- [ITEM_NAME],
- [remarks],
- [DATE_01],
- [ITEM_MODEL],
- [CREATE_DATE],
- [line_id],
- [check_time_slot],
- ROW_NUMBER() OVER (ORDER BY [CREATE_DATE] DESC, [check_time_slot] ASC) AS RowIndex
-FROM [V_IPQC_XJ]
-WHERE
- ISNULL([fsubmit], 0) = 0
- AND (
- -- 澶勭悊22瀛楃鐨勬爣鍑嗘椂闂存 (e.g. '2025-07-29 08:00-10:00')
- (
- LEN([check_time_slot]) = 22
- AND TRY_CONVERT(date, SUBSTRING([check_time_slot], 1, 10)) = CAST(GETDATE() AS date)
- AND CAST(GETDATE() AS time) BETWEEN
- TRY_CAST(SUBSTRING([check_time_slot], 12, 5) + ':00' AS time)
- AND TRY_CAST(SUBSTRING([check_time_slot], 18, 5) + ':00' AS time)
- )
- OR
- -- 澶勭悊13瀛楃鐨勫姞鐝牸寮� (e.g. '2025-07-29 鍔犵彮')
- (
- LEN([check_time_slot]) = 13
- AND [check_time_slot] LIKE '%鍔犵彮'
- AND TRY_CONVERT(date, SUBSTRING([check_time_slot], 1, 10)) = CAST(GETDATE() AS date)
- AND CAST(GETDATE() AS time) >= '17:00:00'
- )
- )");
+ var sql = string.Format(@"EXEC prc_pda_ipqc_GetXjList '{0}'", parsedGuid);
var pageList = Db.Ado.SqlQuery<VIpqcXj>(sql).ToList();
--
Gitblit v1.9.3