~yxj/MES-WEB-API.git

			@@ -83,12 +83,21 @@

			[Route("Sc_MouldMoveStockStepOutBill/GetMouldMoveStockStepOutBill")]
			[HttpGet]
			public object GetMouldMoveStockStepOutBill(string sWhere)
			public object GetMouldMoveStockStepOutBill(string sWhere, string user, string Organization)
			{
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBillList", 1, true, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = Sc_MouldMoveStockStepOutBill(sWhere);
			ds = Sc_MouldMoveStockStepOutBill(sWhere,Organization);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回记录成功！";
			@@ -105,16 +114,16 @@
			}
			}

			public static DataSet Sc_MouldMoveStockStepOutBill(string sWhere)
			public static DataSet Sc_MouldMoveStockStepOutBill(string sWhere, string Organization)
			{
			string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepOutBill where (调出组织='" + Organization + "' or 调入组织='" + Organization + "')");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMoveStockStepOutBill ", "h_v_Sc_MouldMoveStockStepOutBill");
			return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 日期 desc", "h_v_Sc_MouldMoveStockStepOutBill");
			}
			else
			{
			string sql1 = "select * from h_v_Sc_MouldMoveStockStepOutBill where 1 = 1 ";
			string sql = sql1 + sWhere;
			string sql = sql1 + sWhere+ "order by 日期 desc";
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");
			}

			@@ -152,8 +161,9 @@
			{
			ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
			设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty,
			单价 HPrice, 金额 HMoney,HWHSonID HWHID, 发料仓库代码 HWHCode, 发料仓库 HWHName,HSPID,
			仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark FROM h_v_Sc_MouldMoveStockStepOutBill"), "h_v_Sc_MouldMoveStockStepOutBill");
			单价 HPrice, 金额 HMoney,HStockOrgID,调入组织代码 HStockOrgCode,调入组织 HStockOrgName, HOtherOrgID ,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID,
			调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID,
			调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark FROM h_v_Sc_MouldMoveStockStepOutBill"), "h_v_Sc_MouldMoveStockStepOutBill");

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -162,12 +172,12 @@
			}
			else
			{

			//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
			string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
			设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty,
			单价 HPrice, 金额 HMoney,HWHSonID HWHID, 发料仓库代码 HWHCode, 发料仓库 HWHName,HSPID,
			仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark FROM h_v_Sc_MouldMoveStockStepOutBill where 1 = 1 ");
			单价 HPrice, 金额 HMoney,HStockOrgID,调入组织代码 HStockOrgCode,调入组织 HStockOrgName, HOtherOrgID,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID,
			调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID,
			调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark FROM h_v_Sc_MouldMoveStockStepOutBill where 1 = 1 ");
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");

			@@ -203,12 +213,22 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();


			string UserName = "";
			ListModels oListModels = new ListModels();
			try
			{
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Edit", 1, true, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有查看权限";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DLL.ClsSc_MouldMoveStockStepOutBill oBill = new DLL.ClsSc_MouldMoveStockStepOutBill();
			List<Model.ClsSc_MouldMoveStockStepOutBillMain> lsmain = new List<Model.ClsSc_MouldMoveStockStepOutBillMain>();
			msg2 = msg2.Replace("\\", "");
			@@ -330,17 +350,17 @@
			/// <returns></returns>
			[Route("Sc_MouldMoveStockStepOutBill/DeltetMouldMoveStockStepOutBil")]
			[HttpGet]
			public object DeltetMouldMoveStockStepOutBil(string HInterID)
			public object DeltetMouldMoveStockStepOutBil(string HInterID,string user)
			{
			//编辑权限
			//if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无删除权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Delete", 1, true, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			Int64 lngBillKey = 0;