From a3a5db87cd11f10efd42eee49e7977c5360e1b55 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 06 八月 2025 15:11:51 +0800
Subject: [PATCH] 首检巡检，入库检验
---
MES.Service/service/QC/XJService.cs | 5 +-
MESApplication/Controllers/QC/SJController.cs | 41 ++++++++++++++++++++
MES.Service/service/QC/SJService.cs | 21 +++++++++-
MES.Service/Modes/QsItemIpiItem.cs | 18 ++++++++-
MES.Service/service/QC/RKJService.cs | 35 ++++++++---------
5 files changed, 96 insertions(+), 24 deletions(-)
diff --git a/MES.Service/Modes/QsItemIpiItem.cs b/MES.Service/Modes/QsItemIpiItem.cs
index 59642a8..330ccc6 100644
--- a/MES.Service/Modes/QsItemIpiItem.cs
+++ b/MES.Service/Modes/QsItemIpiItem.cs
@@ -156,11 +156,25 @@
[StringLength(32, ErrorMessage = "Picturename闀垮害涓嶈兘瓒呭嚭32")]
public string? Picturename { get; set; }
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
+ [Column("REMARKS")]
+ [SugarColumn(ColumnName = "REMARKS")] //鐢ㄤ簬SqlSugar
[StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
public string? Remarks { get; set; }
+ /// <summary>
+ /// 绾块暱鏌ョ湅(榛樿0)
+ /// </summary>
+ [Column("IS_XZ")]
+ [SugarColumn(ColumnName = "IS_XZ")] //鐢ㄤ簬SqlSugar
+ public decimal? IsXz { get; set; }
+
+ /// <summary>
+ /// 妫�楠屾煡鐪�(榛樿0)
+ /// </summary>
+ [Column("IS_JY")]
+ [SugarColumn(ColumnName = "IS_JY")] //鐢ㄤ簬SqlSugar
+ public decimal? IsJy { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? result { get; set; }
[SugarColumn(IsIgnore = true)] public string? imageData { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index bdcaa01..442754b 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -233,9 +233,11 @@
xj.CreateBy = userNo;
xj.CreateDate = DateTime.Now;
- var pid = db.Insertable(xj).ExecuteReturnIdentity();
+ // var pid = db.Insertable(xj).ExecuteReturnIdentity();
- xj.Id = pid;
+ var pid = (int)xj.Id;
+
+ // xj.Id = pid;
rkjDto.gid = pid;
@@ -458,34 +460,29 @@
{
var db = SqlSugarHelper.GetInstance();
var totalCount = 0;
+
- // 鑾峰彇鐢ㄦ埛鍏宠仈鐨勭嚎浣撶紪鍙�
- string[] lineNo = null;
- if (!string.IsNullOrEmpty(queryObj.createUser))
- {
- lineNo = _baseService.getUserLineNo(queryObj.createUser);
- }
-
- var query = db.Queryable<QsItemOqcReq, MesItems, Womdaa>((a, b, da) =>
+ var query = db.Queryable<QsItemOqcReq, MesItems, Womdaa,MesLine>((a, b, da,c) =>
new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo, // 鍏宠仈鐗╂枡淇℃伅
- JoinType.Left, a.BillNo == da.Daa001 // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, a.BillNo == da.Daa001, // 鍏宠仈宸ュ崟淇℃伅
+ JoinType.Left, da.Daa015 == c.LineNo // 鍏宠仈宸ュ崟淇℃伅
))
// 鐢ㄦ埛绾夸綋杩囨护鏉′欢
//.WhereIF(lineNo != null && lineNo.Length > 0 && !"PL017".Equals(queryObj.createUser),
// (a, b, da) => lineNo.Contains(da.Daa015))
// ID绮剧‘鏌ヨ
.WhereIF(!string.IsNullOrEmpty(queryObj.id),
- (a, b, da) => a.Id.ToString() == queryObj.id)
+ (a, b, da,c) => a.Id.ToString() == queryObj.id)
// 瀹屾垚鐘舵�佽繃婊�
- .WhereIF("鏈畬鎴�".Equals(queryObj.result), (a, b, da) => a.FcheckResu == null)
- .WhereIF(!"鏈畬鎴�".Equals(queryObj.result), (a, b, da) => a.FcheckResu != null)
+ .WhereIF("鏈畬鎴�".Equals(queryObj.result), (a, b, da,c) => a.FcheckResu == null)
+ .WhereIF(!"鏈畬鎴�".Equals(queryObj.result), (a, b, da,c) => a.FcheckResu != null)
// 鎼滅储鏉′欢锛堢墿鏂欏悕绉�/缂栧彿锛�
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue),
- (a, b, da) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
- a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
+ (a, b, da,c) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower()) ||
+ a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
// 鏌ヨ瀛楁
- .Select((a, b, da) => new QsItemOqcReq
+ .Select((a, b, da,c) => new QsItemOqcReq
{
Id = a.Id,
BillNo = a.BillNo,
@@ -500,7 +497,9 @@
ReleaseNo = a.ReleaseNo,
Remarks = a.Remarks,
Daa015 = da.Daa015, // 宸ュ崟绾夸綋
- Fsubmit = a.Fsubmit
+ Fsubmit = a.Fsubmit,
+ Quantity = da.Daa008,
+ LineNo = c.LineName
})
// 鎺掑簭
.OrderBy(a => a.CreateDate, OrderByType.Desc);
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index de9da99..58c7532 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -60,7 +60,7 @@
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
a => a.Result != "鏈畬鎴�")
- .OrderBy(a => a.BillNo, OrderByType.Desc);
+ .OrderBy(a => a.CreateTime, OrderByType.Desc);
var totalCount = data.Count();
var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit);
@@ -394,7 +394,7 @@
detail.CreateBy = detail.UpdateBy;
- withOracle += autoResult(detail);
+ // withOracle += autoResult(detail);
return withOracle;
}
@@ -511,4 +511,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
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 000ce6d..52fe9bc 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -111,6 +111,8 @@
{
var db = SqlSugarHelper.GetInstance();
+ int totalCount = 0;
+
var id = Convert.ToDecimal(queryObj.id);
string[]? lineNo = null;
@@ -154,8 +156,7 @@
FcheckResu = s.FcheckResu,
Remarks = s.Remarks
}).OrderBy(s => s.CreateDate, OrderByType.Desc);
- var totalCount = query.Count();
- var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit);
+ var items = query.ToPageList(queryObj.PageIndex, queryObj.Limit,ref totalCount);
return (items, totalCount);
}
diff --git a/MESApplication/Controllers/QC/SJController.cs b/MESApplication/Controllers/QC/SJController.cs
index b07b575..c1b5451 100644
--- a/MESApplication/Controllers/QC/SJController.cs
+++ b/MESApplication/Controllers/QC/SJController.cs
@@ -342,4 +342,45 @@
}
}
+ /// <summary>
+ /// 鏇存柊QsItemIpiItem鐨処sPass鍊�
+ /// </summary>
+ /// <param name="data">鍖呭惈id鍜宨sPass鐨凧SON瀵硅薄</param>
+ /// <returns>鏇存柊缁撴灉</returns>
+ [HttpPost("UpdateQsItemIpiItemIsPass")]
+ public ResponseResult UpdateQsItemIpiItemIsPass([FromBody] JObject data)
+ {
+ try
+ {
+ var id = data["id"]?.ToString();
+ var isPass = data["isPass"]?.ToString();
+
+ if (string.IsNullOrEmpty(id) || string.IsNullOrEmpty(isPass))
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "鍙傛暟涓嶈兘涓虹┖",
+ data = null
+ };
+ }
+
+ dynamic resultInfos = new ExpandoObject();
+ var sjService = new SJService();
+ var result = sjService.UpdateQsItemIpiItemIsPass(Convert.ToDecimal(id), Convert.ToDecimal(isPass));
+ resultInfos.tbBillList = result;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3