From 57caad11d92771dcaa7d76d871daa3e4a538c2be Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期一, 25 八月 2025 12:39:32 +0800
Subject: [PATCH] 来料检逻辑修改
---
StandardInterface/MES.Service/service/QC/LljService.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
StandardInterface/MES.Service/Modes/LtsLlj.cs | 6 ++++++
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/StandardInterface/MES.Service/Modes/LtsLlj.cs b/StandardInterface/MES.Service/Modes/LtsLlj.cs
index 1c07f99..be60a30 100644
--- a/StandardInterface/MES.Service/Modes/LtsLlj.cs
+++ b/StandardInterface/MES.Service/Modes/LtsLlj.cs
@@ -239,6 +239,12 @@
[SugarColumn(IsIgnore = true)]
public string? Fcode { get; set; }
+ /// <summary>
+ /// 妫�楠岄」鐩淮鎶ょ姸鎬侊紙0锛氭湭缁存姢锛岄潪0锛氬凡缁存姢锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "JYXM")]
+ public int? Jyxm { get; set; }
+
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index 34a4694..78dc03b 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -60,6 +60,7 @@
{
Id = a.Id,
ItemNo = a.ItemNo,
+ ItemId = a.ItemId,
ItemName = a.ItemName,
ItemModel = a.ItemModel,
SuppName = a.SuppName,
@@ -77,7 +78,15 @@
Status = a.Status,
IqcDate = a.IqcDate,
// 娣诲姞缁存姢浜哄憳淇℃伅
- Fcode = v.Fcode
+ Fcode = v.Fcode,
+ // 娣诲姞鐮村潖瀹為獙鏁伴噺
+ PHSY = a.PHSY,
+ // 娣诲姞涓嶈壇鍘熷洜
+ BLYY = a.BLYY,
+ // 娣诲姞鎵�灞炶溅闂�
+ SSCJ = a.SSCJ,
+ // 娣诲姞璇勫鐘舵��
+ PSZT = a.PSZT
})
.OrderBy("CASE WHEN EMERGENCY = 1 THEN 0 ELSE 1 END, CASE WHEN STATUS = '宸叉彁浜�' THEN 0 ELSE 1 END, IQC_DATE desc, ID asc")
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -99,8 +108,44 @@
}
}
+ // 璁＄畻鎵�鏈夋暟鎹殑鍘婚噸鎬绘暟锛堜笉鏄綋鍓嶉〉鐨勫幓閲嶆暟锛�
+ var allDataQuery = db.Queryable<LtsLlj, V_LljUser>((a, v) =>
+ new JoinQueryInfos(JoinType.Left, a.ItemNo == v.ItemNo))
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ "鏈畬鎴�".Equals(queryObj.result),
+ (a, v) => a.FcheckResu == null)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ !"鏈畬鎴�".Equals(queryObj.result),
+ (a, v) => a.FcheckResu != null)
+ .WhereIF(id > 0, (a, v) => a.Id == id)
+ // 鏉冮檺鎺у埗锛歅L017銆丠MLYY銆丠MCS 鍙互鐪嬪埌鎵�鏈夊崟鎹紝鍏朵粬鐢ㄦ埛闇�瑕佹牴鎹墿鏂欑淮鎶ゆ儏鍐靛垽鏂�
+ .WhereIF(queryObj.createUser != "PL017" && queryObj.createUser != "HMLYY" && queryObj.createUser != "HMCS" && queryObj.UserIndex == "0",
+ (a, v) =>
+ // 濡傛灉鐗╂枡琚淮鎶わ紝鍙湁缁存姢浜哄憳鍙互鐪嬪埌
+ (v.Fcode != null && v.Fcode == queryObj.createUser) ||
+ // 濡傛灉鐗╂枡鏈缁存姢锛屾墍鏈変汉閮藉彲浠ョ湅鍒�
+ (v.Fcode == null))
+ //鍔犵瓫閫夋潯浠�,鏍规嵁閫夋嫨鐨勬悳绱㈠瓧娈佃繘琛岀簿纭悳绱�
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 1, // 鐗╂枡缂栧彿鎼滅储
+ (a, v) => a.ItemNo != null && a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 2, // 鐗╂枡鍚嶇О鎼滅储
+ (a, v) => a.ItemName != null && a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 3, // 渚涘簲鍟嗘悳绱�
+ (a, v) => a.SuppName != null && a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 4, // 鍒拌揣鍗曞彿鎼滅储
+ (a, v) => a.LotNo != null && a.LotNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 5, // 妫�楠屽崟鍙锋悳绱�
+ (a, v) => a.ReleaseNo != null && a.ReleaseNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && queryObj.selectedIndex == 6, // 鐗╂枡瑙勬牸鎼滅储
+ (a, v) => a.ItemModel != null && a.ItemModel.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ .Select((a, v) => a.ReleaseNo)
+ .Distinct()
+ .Count();
+
var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList();
- return (pageList, totalCount);
+ return (pageList, allDataQuery);
}
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
--
Gitblit v1.9.3