From b599b5325388b5a9d3d60fa2979c442b092c5922 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 08 二月 2025 09:08:44 +0800
Subject: [PATCH] 1.生产领料优化 2.生产通用参数类，新增参数 3.来料检验显示调整，区分为已提交和未提交 4.来料检验，计算不良率 5.生产领料模块优化返回参数信息。
---
service/Wom/WomdaaManager.cs | 4 +++-
Controllers/Wom/WomdaaController.cs | 9 +++++++++
.config/dotnet-tools.json | 13 +++++++++++++
Dto/service/ProductionPickDto.cs | 5 +++++
service/QC/LljService.cs | 6 ++++--
5 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 0000000..159811c
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,13 @@
+{
+ "version": 1,
+ "isRoot": true,
+ "tools": {
+ "dotnet-ef": {
+ "version": "9.0.1",
+ "commands": [
+ "dotnet-ef"
+ ],
+ "rollForward": false
+ }
+ }
+}
\ No newline at end of file
diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index 3bca6be..8b0f2a1 100644
--- a/Controllers/Wom/WomdaaController.cs
+++ b/Controllers/Wom/WomdaaController.cs
@@ -73,6 +73,15 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.ScanCode(query);
+ if(resultInfos.tbBillList.result == "2")
+ {
+ return new ResponseResult
+ {
+ status = Convert.ToInt32(resultInfos.tbBillList.result),
+ message = resultInfos.tbBillList.strMsg,
+ data = resultInfos
+ };
+ }
return new ResponseResult
{
status = 0,
diff --git a/Dto/service/ProductionPickDto.cs b/Dto/service/ProductionPickDto.cs
index 44dc1ea..ccc8072 100644
--- a/Dto/service/ProductionPickDto.cs
+++ b/Dto/service/ProductionPickDto.cs
@@ -14,6 +14,11 @@
public string? barcode { get; set; }
+ //杩斿洖淇℃伅
+ public string? strMsg { get; set; }
+ //杩斿洖鍙傛暟绫诲瀷 -1锛氬け璐� 1锛氭垚鍔�
+ public string? result { get; set; }
+
public List<Womdab>? totals { get; set; }
public List<WwGdDetail>? totals1 { get; set; }
diff --git a/service/QC/LljService.cs b/service/QC/LljService.cs
index 63f536d..b4f51a4 100644
--- a/service/QC/LljService.cs
+++ b/service/QC/LljService.cs
@@ -26,11 +26,12 @@
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- a => (a.FcheckResu ?? "") == ""|| (a.FcheckResu ?? "") == "妫�楠屼腑")
+ a => (a.STATUS ?? "") != "宸叉彁浜�")
+ //a => (a.FcheckResu ?? "") == ""|| (a.FcheckResu ?? "") == "妫�楠屼腑")
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- a => !((a.FcheckResu ?? "") == "" || (a.FcheckResu ?? "") == "妫�楠屼腑"))
+ a => (a.STATUS ?? "") == "宸叉彁浜�")
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
a => a.guid == parsedGuid)
.OrderByDescending(a => a.CreateDate)
@@ -313,6 +314,7 @@
commit += db.Updateable<MesQaItemsDetectDetail5>()
.SetColumns(s => s.FcheckResu == result)
.SetColumns(s => s.FenterQty == count)
+ .SetColumns(s => s.FngRate == (s.CheckQyt == 0 ? (decimal?)null : (decimal?)(Convert.ToDouble(noCount) / Convert.ToDouble(count))))
.Where(s => s.Guid == detail.ParentGuid)
.ExecuteCommand();
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 8ef6de9..b14e0c2 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -77,7 +77,9 @@
daa001 = query.daa001,
barcodeNum = barcodeNum,
splitNum = splitNum,
- barcode = query.barcode
+ barcode = query.barcode,
+ strMsg = _strMsg,
+ result = _intSum
};
return dto;
--
Gitblit v1.9.3