From e35f35bcec9ce83198515ee2dd89e91034992e3a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 四月 2025 15:44:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
Model/基础资料/其他基础资料/ClsGy_QCCheckProjectSub.cs | 2 ++
DAL/基础资料/其他基础资料/ClsGy_QCCheckProjectMain.cs | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
index 33bff98..1af774b 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectMain.cs"
@@ -104,7 +104,7 @@
",HDownLimitKey,HUpOffSetKey,HDownOffSetKey,HTargetValQ,HUpLimitQ,HDownLimitQ" +
",HUpOffSetQ,HDownOffSetQ,HTargetValB,HUpLimitB,HDownLimitB,HUpOffSetB" +
",HDownOffSetB,HTargetValTxt,HUpLimitTxt,HDownLimitTxt,HUpOffSetTxt,HDownOffSetTxt" +
- ",HControlUpperLimit,HControlLowerLimit" +
+ ",HControlUpperLimit,HControlLowerLimit,HSampleCount,HSampleDayCount" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -118,7 +118,7 @@
"," + oSub.HUpOffSetQ + "," + oSub.HDownOffSetQ + "," + oSub.HTargetValB + "," + oSub.HUpLimitB + "," + oSub.HDownLimitB +
"," + oSub.HUpOffSetB + "," + oSub.HDownOffSetB + ",'" + oSub.HTargetValTxt + "','" + oSub.HUpLimitTxt + "','" + oSub.HDownLimitTxt
+ "','" + oSub.HUpOffSetTxt + "','" + oSub.HDownOffSetTxt + "'" +
- ","+ oSub.HControlUpperLimit + ","+ oSub.HControlLowerLimit +
+ ","+ oSub.HControlUpperLimit + ","+ oSub.HControlLowerLimit + "," + oSub.HSampleCount + "," + oSub.HSampleDayCount +
") ");
}
//=========================淇濆瓨鍚庢帶鍒�
@@ -209,7 +209,7 @@
",HDownLimitKey,HUpOffSetKey,HDownOffSetKey,HTargetValQ,HUpLimitQ,HDownLimitQ" +
",HUpOffSetQ,HDownOffSetQ,HTargetValB,HUpLimitB,HDownLimitB,HUpOffSetB" +
",HDownOffSetB,HTargetValTxt,HUpLimitTxt,HDownLimitTxt,HUpOffSetTxt,HDownOffSetTxt" +
- ",HControlUpperLimit,HControlLowerLimit" +
+ ",HControlUpperLimit,HControlLowerLimit,HSampleCount,HSampleDayCount" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -223,7 +223,7 @@
"," + oSub.HUpOffSetQ + "," + oSub.HDownOffSetQ + "," + oSub.HTargetValB + "," + oSub.HUpLimitB + "," + oSub.HDownLimitB +
"," + oSub.HUpOffSetB + "," + oSub.HDownOffSetB + ",'" + oSub.HTargetValTxt + "','" + oSub.HUpLimitTxt + "','" + oSub.HDownLimitTxt
+ "','" + oSub.HUpOffSetTxt + "','" + oSub.HDownOffSetTxt + "'" +
- ","+ oSub.HControlUpperLimit + "," +oSub.HControlLowerLimit +
+ ","+ oSub.HControlUpperLimit + "," +oSub.HControlLowerLimit + "," + oSub.HSampleCount + "," + oSub.HSampleDayCount +
") ");
}
//=========================淇濆瓨鍚庢帶鍒�
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectSub.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectSub.cs"
index 4ad9c14..1212564 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectSub.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_QCCheckProjectSub.cs"
@@ -43,6 +43,8 @@
public Decimal HDownOffSetQ;
public Decimal HControlUpperLimit;
public Decimal HControlLowerLimit;
+ public Int64 HSampleCount;
+ public Int64 HSampleDayCount;
public Int64 HTargetValB;
public Int64 HUpLimitB;
public Int64 HDownLimitB;
--
Gitblit v1.9.1