From a619299816f2f632c7c6ba3a1bb869e2c212797d Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期五, 19 十二月 2025 14:12:33 +0800
Subject: [PATCH] 对添加巡检单物料编码进行去重
---
StandardPda/MES.Service/service/Warehouse/WorkdaaManager .cs | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/WorkdaaManager .cs b/StandardPda/MES.Service/service/Warehouse/WorkdaaManager .cs
index 3c296e3..1ef8074 100644
--- a/StandardPda/MES.Service/service/Warehouse/WorkdaaManager .cs
+++ b/StandardPda/MES.Service/service/Warehouse/WorkdaaManager .cs
@@ -48,6 +48,34 @@
//string lineNo = apiResult.data.lineNo;
int quantity = apiResult.data.qualifiedQuantity; // 鍚堟牸鏁伴噺
+ int mUTEROOMTESTQUANTITY = apiResult.data.MUTEROOMTESTQUANTITY; // 闈欓煶鎴挎娴嬫暟
+
+ int mUTEROOMTESTPASSQUANTITY = apiResult.data.MUTEROOMTESTPASSQUANTITY; // 闈欓煶鎴垮悎鏍兼暟
+
+
+ //2.1鏂拌〃
+
+ //2.2 鏌ヨ宸叉湁鏁伴噺
+ string selectSql = $"select NVL(sum(Quantity),0) from mes_Report_Subtable where Production_line = '{lineNo}'and TRUNC(CREATE_DATE) = TRUNC(SYSDATE)";
+ int existedQty = Convert.ToInt32(SQLHelper.ExecuteScalar(selectSql));
+
+ //2.3 璁＄畻闇�瑕佹彃鍏ョ殑鏁伴噺
+ int insertQty = quantity - existedQty;
+
+ //璁＄畻闈欓煶鎴垮悎鏍肩巼
+ double Passrate = mUTEROOMTESTPASSQUANTITY / mUTEROOMTESTQUANTITY;
+
+ //2.4 鎻掑叆鏂拌褰�
+ if (insertQty >= 0)
+ {
+ string insertSql1 = $@"INSERT INTO mes_Report_Subtable (ID, CREATE_DATE, Production_line, Quantity)
+ VALUES (SEQ_MES_REPORT_Subtable_ID.NEXTVAL, SYSDATE, '{lineNo}', {insertQty})";
+ SQLHelper.ExecuteQuery(insertSql1);
+ }
+
+
+
+
// 3锔忊儯 妫�鏌ユ暟鎹簱褰撳ぉ鏄惁宸叉湁鏁版嵁
var checkSql = $"SELECT COUNT(1) FROM mes_Report " +
$"WHERE TRUNC(CREATE_DATE) = TRUNC(SYSDATE) AND Production_line = '{lineNo}'";
@@ -63,15 +91,15 @@
if (count == 0)
{
// 鎻掑叆鏂版暟鎹�
- var insertSql = $"INSERT INTO mes_Report (ID, CREATE_DATE, Production_line, Quantity) " +
- $"VALUES (SEQ_MES_REPORT_ID.NEXTVAL,SYSDATE, '{lineNo}', {quantity})";
+ var insertSql = $"INSERT INTO mes_Report (ID, CREATE_DATE, Production_line, Quantity,MUTEROOMTESTQUANTITY,MUTEROOMTESTPASSQUANTITY,Passrate) " +
+ $"VALUES (SEQ_MES_REPORT_ID.NEXTVAL,SYSDATE, '{lineNo}','{quantity}','{mUTEROOMTESTQUANTITY}','{mUTEROOMTESTPASSQUANTITY}','{Passrate}')";
SQLHelper.ExecuteQuery(insertSql);
}
else
{
// 鏇存柊褰撳ぉ鐨勬暟鎹� 褰撳ぉ宸茬粡鏈夎繖涓嚎浣� 鈫� 鏇存柊璇ョ嚎浣撶殑鏁版嵁
var updateSql = $"UPDATE mes_Report " +
- $"SET Production_line = '{lineNo}', Quantity = {quantity} , CREATE_DATE = SYSDATE " +
+ $"SET Production_line = '{lineNo}', Quantity = '{quantity}',mUTEROOMTESTQUANTITY='{mUTEROOMTESTQUANTITY}',mUTEROOMTESTPASSQUANTITY='{mUTEROOMTESTPASSQUANTITY}' ,Passrate='{Passrate}', CREATE_DATE = SYSDATE " +
$"WHERE TRUNC(CREATE_DATE) = TRUNC(SYSDATE) and Production_line = '{lineNo}' ";
SQLHelper.ExecuteQuery(updateSql);
}
@@ -103,6 +131,10 @@
{
public string lineNo { get; set; }
public int qualifiedQuantity { get; set; }
+
+ public int MUTEROOMTESTQUANTITY { get; set; }
+
+ public int MUTEROOMTESTPASSQUANTITY { get; set; }
}
--
Gitblit v1.9.3