From 26bccee691f9144e40a32c8a036d779a2d7bf01b Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期一, 25 八月 2025 20:00:08 +0800
Subject: [PATCH] 平板入库检、巡检、首检新增销售订单号字段
---
MES.Service/service/QC/SJService.cs | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 58c7532..6703a62 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -43,10 +43,17 @@
string[]? lineNo = null;
+ int totalCount = 0;
+
//if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
// lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
- var data = db.Queryable<SJPageResult>()
+ var data = db.Queryable<SJPageResult, Womdaa, Womcaa> ((a,
+ da,ca) =>
+ new JoinQueryInfos(
+ JoinType.Left, Convert.ToDecimal(a.Pbaid) == da.Id, // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, da.Daa021 == ca.Caa020//浠诲姟鍗曪紝鐢ㄤ簬鏌ヨ閿�鍞鍗曞彿
+ ))
//.WhereIF(lineNo != null && lineNo.Length > 0,
// a => lineNo.Contains(a.line))
.WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
@@ -55,14 +62,41 @@
.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 != "鏈畬鎴�")
+ a => a.FSubmit == "1")
+ .Select((a, da, ca) => new SJPageResult
+ {
+ Id = a.Id,
+ BillNo = a.BillNo,
+ StatusDate = a.StatusDate,
+ FName = a.FName,
+ Result = a.Result,
+ FSubmit = a.FSubmit,
+ FSubmitBy = a.FSubmitBy,
+ FSubmitDate = a.FSubmitDate,
+ MoidNum = a.MoidNum,
+ StatusUser = a.StatusUser,
+ Pbaid = a.Pbaid,
+ CreateTime = a.CreateTime,
+ Comments = a.Comments,
+ ItemMod = a.ItemMod,
+ ItemNo = a.ItemNo,
+ daa001 = a.daa001,
+ line = a.line,
+ Remarks = a.Remarks,
+ Daa003 = a.Daa003,
+ Daa004 = a.Daa004,
+ Daa008 = a.Daa008,
+ LineName = a.LineName,
+
+ // 鏄犲皠棰濆鐨勫瓧娈碉紙閿�鍞鍗曞彿锛�
+ SaleOrder = ca.Caa015
+ })
.OrderBy(a => a.CreateTime, OrderByType.Desc);
- var totalCount = data.Count();
- var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit);
+ var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
return (items, totalCount);
}
@@ -425,6 +459,20 @@
.ExecuteCommand();
});
}
+
+
+ //NOTES
+ public int saveNotesPid(QsItem dto)
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsItemIpiItem>()
+ .SetColumns(it =>
+ it.Notes == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .Where(it => it.Id == dto.pid)
+ .ExecuteCommand();
+ });
+ }
//瀛欒〃淇敼澶囨敞瀛楁
public int saveRemarksById(QsItem dto)
--
Gitblit v1.9.3