MES-WEB-API.git

			@@ -83,6 +83,7 @@
			",HDeptID=" + omodel.HDeptID.ToString() +
			",HEmpID=" + omodel.HEmpID.ToString() +
			",HStopReason='" + omodel.HStopReason + "'" +
			",HStopType='" + omodel.HStopType + "'" +
			",HReportType='" + omodel.HReportType + "'" +
			",HBarCode='" + omodel.HBarCode + "'" +
			",HAddr='" + omodel.HAddr + "'" +
			@@ -153,10 +154,21 @@
			{
			try
			{
			DataSet ds;
			//得到mainid
			omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			//若MAINDI重复则重新获取
			oCn.BeginTran();
			//保存前控制=========================================
			ds = oCn.RunProcReturn("exec h_p_Sc_MESStopWorkBill_BeforeSaveCtrl " + omodel.HInterID + "," + omodel.HICMOInterID + "," + omodel.HICMOEntryID + ",'" + omodel.HICMOBillNo + "'", "h_p_Sc_MESStopWorkBill_BeforeSaveCtrl");

			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "1")
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//=========================================================
			//主表
			oCn.RunProc("Insert Into Sc_MESStopWorkBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
			@@ -165,7 +177,7 @@
			",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStopBeginWorkTime,HStopEndWorkTime,HSourceID" +
			",HGroupID,HDeptID,HEmpID,HStopReason,HReportType,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
			",HSourceInterID_Main,HSourceEntryID_Main,HSourceBillNo_Main,HSourceBillType_Main" +
			",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
			",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HStopType" +
			") " +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + omodel.HMaker + "',getdate()" +
			"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
			@@ -173,12 +185,36 @@
			",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate(),'" + omodel.HStopEndWorkTime.ToShortDateString() + "'," + omodel.HSourceID.ToString() +
			"," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HStopReason + "','" + omodel.HReportType + "','" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" +
			"," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "'" +
			"," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "'" +
			"," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "','"+ omodel.HStopType + "'" +
			") ");
			//插入子表
			//根据开工单内码设置生产状态表停工状态(先把本资源全部工单设置为非停工状态，再设置本单对应得源单为停工状态)
			oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + omodel.HInterID + ",@flag='停工'", "h_p_JIT_MESBeginWorkBill_BeginWork");
			sReturn = "新增单据成功！";

			//再次验证保存是否合理
			ds = oCn.RunProcReturn("exec h_p_JIT_MESStopWorkBill_SaveCtrl @HInterId=" + omodel.HInterID + "", "h_p_JIT_MESStopWorkBill_SaveCtrl");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			sReturn = "无验证数据！";
			oCn.RollBack();
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}

			//保存后控制=========================================
			ds = oCn.RunProcReturn("exec h_p_Sc_MESStopWorkBill_AfterSaveCtrl " + omodel.HInterID + "," + omodel.HICMOInterID + "," + omodel.HICMOEntryID + ",'" + omodel.HICMOBillNo + "'", "h_p_Sc_MESStopWorkBill_AfterSaveCtrl");

			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "1")
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//=========================================================

			sReturn = omodel.HInterID.ToString();
			oCn.Commit();
			return true;
			}
			@@ -386,15 +422,76 @@
			}
			}

			//删除单据
			public bool DeleteBill(Int64 lngBillKey, string HBillNo, string procName, string user, ref string sReturn)
			{
			try
			{
			oCn.BeginTran();
			//判断是否允许删除
			DataSet ds = oCn.RunProcReturn("exec h_p_JIT_MESStopWorkBill_DelCtrl @HInterId=" + lngBillKey + "", "h_p_JIT_MESBeginWorkBill_SaveCtrl");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			sReturn = "无验证数据！";
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
			{
			sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			return false;
			}

			//删除关联关系
			oCn.RunProc("exec h_p_JIT_MESStopWorkBill_DelRelation @HInterId=" + lngBillKey + "");

			//删除明细表
			oCn.RunProc("Delete From " + MvarItemKeySub + " where HInterID=" + lngBillKey.ToString());
			//删除主表
			oCn.RunProc("Delete From " + MvarItemKey + " where HInterID=" + lngBillKey.ToString());

			//删除后控制==================================================================================
			string sql2 = "exec " + procName + " " + lngBillKey + ",'" + HBillNo + "','" + user + "'";
			ds = oCn.RunProcReturn(sql2, procName);
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{

			sReturn = "删除失败!原因:删除后判断失败，请与网络管理人员联系";
			oCn.RollBack();
			return false;
			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			sReturn = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
			oCn.RollBack();
			return false;
			}
			//==============================================================================================

			sReturn = "删除单据成功！";
			oCn.Commit();
			return true;
			}
			catch (Exception e)
			{
			sReturn = e.Message;
			oCn.RollBack();
			throw (e);
			}
			}

			//审核
			public bool CheckBill(Int64 lngBillKey, ref string sReturn)
			{

			try
			{
			string HChecker = DBUtility.ClsPub.CurUserName;
			string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
			oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
			oCn.BeginTran();
			oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
			//根据开工单内码设置生产状态表开工状态(先把本资源全部工单设置为非开工状态，再设置本单对应得源单为开工状态)
			oCn.RunProc("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + lngBillKey + ",@flag='停工'");
			oCn.Commit();

			//生成调拨单
			//得到调拨单 mainid 单据号
			//long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -414,6 +511,6 @@





			}
			}