MES-WEB-API.git

			@@ -37,11 +37,30 @@
			{
			try
			{


			//保存前控制=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_QC_PatrolProcCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_QC_PatrolProcCheckBill_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;
			}
			//=========================================================


			//
			oCn.BeginTran();
			string sqlerro = @"UpDate QC_PatrolProcCheckBillMain set " +
			" HBillNo='" + omodel.HBillNo + "'" + //固定赋值===============
			",HDate='" + omodel.HDate + "'" +
			",HLastResult='" + omodel.HLastResult + "'" +
			",HYear='" + omodel.HYear.ToString() + "'" +
			",HPeriod='" + omodel.HPeriod.ToString() + "'" +
			",HBillStatus='" + omodel.HBillStatus + "'" +
			@@ -75,6 +94,8 @@
			//",HMaterID=" + omodel.HMaterID.ToString() +
			",HFirstCheckEmp=" + omodel.HFirstCheckEmp.ToString() +
			",HMainProcID=" + omodel.HMainProcID.ToString() +
			",HShiftsID=" + omodel.HShiftsID.ToString() +
			",HErrTreatment='" + omodel.HErrTreatment + "'" +
			" where HInterID=" + lngBillKey.ToString();
			//更新主表
			oCn.RunProc(sqlerro);
			@@ -144,6 +165,24 @@
			// return false;
			// }
			//}

			//=========================保存后控制
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_QC_PatrolProcCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_QC_PatrolProcCheckBill_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;
			@@ -162,6 +201,23 @@
			{
			//得到mainid
			omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);

			//保存前控制=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_QC_PatrolProcCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_QC_PatrolProcCheckBill_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;
			}
			//=========================================================


			//若MAINDI重复则重新获取
			oCn.BeginTran();
			//主表
			@@ -169,12 +225,12 @@
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
			",HYear,HPeriod,HRemark" +
			",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
			",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HMainProcID" +
			",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HMainProcID,HLastResult,HShiftsID,HErrTreatment" +
			") " +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
			"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
			"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
			",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + "," + omodel.HMainProcID +
			",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + "," + omodel.HMainProcID +" ,"+ omodel.HLastResult + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "'" +
			") ");
			//插入子表
			foreach (Model.ClsQC_PatrolProcCheckBillSub oSub in DetailColl)
			@@ -234,6 +290,23 @@
			// }
			//}
			//

			//=========================保存后控制
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_QC_PatrolProcCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_QC_PatrolProcCheckBill_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;