From 90e42f99c2b3a4b8226e9a6951c2b7b9a968df10 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期五, 22 八月 2025 14:38:46 +0800
Subject: [PATCH] 入库检新增销售订单号
---
MES.Service/service/QC/SJService.cs | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index de9da99..c139b94 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -43,6 +43,8 @@
string[]? lineNo = null;
+ int totalCount = 0;
+
//if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
// lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
@@ -55,14 +57,13 @@
.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 != "鏈畬鎴�")
- .OrderBy(a => a.BillNo, OrderByType.Desc);
- var totalCount = data.Count();
- var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit);
+ a => a.FSubmit == "1")
+ .OrderBy(a => a.CreateTime, OrderByType.Desc);
+ var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
return (items, totalCount);
}
@@ -394,7 +395,7 @@
detail.CreateBy = detail.UpdateBy;
- withOracle += autoResult(detail);
+ // withOracle += autoResult(detail);
return withOracle;
}
@@ -421,6 +422,20 @@
return db.Updateable<QsItemIpiItem>()
.SetColumns(it =>
it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .Where(it => it.Id == dto.pid)
+ .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();
});
@@ -511,4 +526,21 @@
}
}
+ /// <summary>
+ /// 鏇存柊QsItemIpiItem鐨処sPass鍊�
+ /// </summary>
+ /// <param name="id">QsItemIpiItem鐨処D</param>
+ /// <param name="isPass">IsPass鐨勫��(0琛ㄧず涓嶅悎鏍�,1琛ㄧず鍚堟牸)</param>
+ /// <returns>鏇存柊褰卞搷鐨勮鏁�</returns>
+ public int UpdateQsItemIpiItemIsPass(decimal id, decimal isPass)
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsItemIpiItem>()
+ .SetColumns(s => s.IsPass == isPass)
+ .Where(s => s.Id == id)
+ .ExecuteCommand();
+ });
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3