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

yusijie

2025-06-03 01685f3ab68f64b51b83eee40af90f4030866691

 DAL/¼Æ»®¹ÜÀí/ClsGy_MaterialTechParamBillMain.cs

@@ -38,6 +38,22 @@
            try
            {
                oCn.BeginTran();

                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_MaterialTechParamBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_MaterialTechParamBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败！";
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    return false;
                }
                //=========================================================

                //更新主表
                string mainSql = "update Gy_MaterialTechParamBillMain set " +
                    " HBillNo = '" + omodel.HBillNo +
@@ -70,7 +86,7 @@
                {
                    string subSql = "insert into Gy_MaterialTechParamBillSub" +
                           "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                           ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd) " +
                           ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd,HIsRequired) " +
                           " values(" +
                           "" + omodel.HInterID.ToString() +
                           "," + oSub.HEntryID.ToString() +
@@ -80,9 +96,9 @@
                           "','" + oSub.HSourceBillType +
                           "','" + oSub.HTechParamID +
                           "','" + oSub.HTechParamUnitID +
                           "'," + oSub.HStd +
                           "," + oSub.HMax +
                           ",'" + oSub.HMin +
                           "','" + oSub.HStd +
                           "','" + oSub.HMax +
                           "','" + oSub.HMin +
                           "','" + oSub.HDataForm +
                           "','" + oSub.HDataUnit +
                           "','" + oSub.HDataTimes +
@@ -90,9 +106,26 @@
                           "','" + oSub.HSNO +
                           "','" + oSub.HStdNextTimes +
                           "','" + oSub.HTechParamIDStd +
                           "','" + Convert.ToString(oSub.HIsRequired ? 1 : 0) +
                           "')";
                    oCn.RunProc(subSql);
                }

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_MaterialTechParamBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_MaterialTechParamBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败！";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败2！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //============================

                sReturn = "修改单据成功！";
                oCn.Commit();
@@ -116,6 +149,21 @@


                oCn.BeginTran();

                //保存前控制=========================================
                string HBillNote = "";
                 ds = oCn.RunProcReturn("Exec h_p_Gy_MaterialTechParamBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Gy_MaterialTechParamBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败！";
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    return false;
                }
                //=========================================================

                //检查主表内码是否重复，若重复则重新生成并继续检查，直到不再重复
                while (true)
@@ -163,7 +211,7 @@
                {
                    string subSql = "insert into Gy_MaterialTechParamBillSub" +
                           "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                           ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd) " +
                           ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd,HIsRequired) " +
                           " values(" +
                           "" + omodel.HInterID.ToString() +
                           "," + oSub.HEntryID.ToString() +
@@ -173,9 +221,9 @@
                           "','" + oSub.HSourceBillType +
                           "','" + oSub.HTechParamID +
                           "','" + oSub.HTechParamUnitID +
                           "'," + oSub.HStd +
                           "," + oSub.HMax +
                           ",'" + oSub.HMin +
                           "','" + oSub.HStd +
                           "','" + oSub.HMax +
                           "','" + oSub.HMin +
                           "','" + oSub.HDataForm +
                           "','" + oSub.HDataUnit +
                           "','" + oSub.HDataTimes +
@@ -183,9 +231,27 @@
                           "','" + oSub.HSNO +
                           "','" + oSub.HStdNextTimes +
                           "','" + oSub.HTechParamIDStd +
                           "','" + Convert.ToString(oSub.HIsRequired ? 1 : 0)+
                           "')";
                    oCn.RunProc(subSql);
                }

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_MaterialTechParamBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Gy_MaterialTechParamBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败！";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败2！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //============================

                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;