Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2026-01-16 6367b170a3db4df6e43a8962b2f17b06a020b913

 DAL/³µ¼ä¹ÜÀí/ClsSc_EmployeeSignInNoteBill.cs

@@ -42,7 +42,7 @@

                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
                DataSet ds = oCn.RunProcReturn("Exec Sc_EmployeeSignInNoteBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "Sc_EmployeeSignInNoteBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败！";
@@ -96,7 +96,7 @@
                }

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
                DataSet ds2 = oCn.RunProcReturn("Exec Sc_EmployeeSignInNoteBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "Sc_EmployeeSignInNoteBill_AfterSaveCtrl");


                if (ds2 == null)
@@ -134,7 +134,7 @@

                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
                DataSet ds = oCn.RunProcReturn("Exec Sc_EmployeeSignInNoteBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "Sc_EmployeeSignInNoteBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败！";
@@ -182,7 +182,7 @@
                }

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
                DataSet ds2 = oCn.RunProcReturn("Exec Sc_EmployeeSignInNoteBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "Sc_EmployeeSignInNoteBill_AfterSaveCtrl");

                if (ds2 == null)
                {