~yxj/MES-WEB-API.git

			@@ -17,7 +17,7 @@
			private json objJsonResult = new json();
			public DataSet ds = new DataSet();
			public WebServer webserver = new WebServer();

			public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			public DAL.ClsSc_MouldScrapInBill BillNew0 = new DAL.ClsSc_MouldScrapInBill(); //模具报废入库对应单据类
			public DAL.ClsSc_MouldScrapInBill BillOld0 = new DAL.ClsSc_MouldScrapInBill(); //模具报废入库对应单据类

			@@ -88,7 +88,7 @@
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBillList", 1, true, user))
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBillList", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -98,6 +98,7 @@
			}

			ds = Sc_MouldOtherInBill(sWhere, Organization);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回记录成功！";
			@@ -119,11 +120,11 @@
			string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherInBillList where 库存组织='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 日期 desc", "h_v_Sc_MouldOtherInBillList");
			return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 制单日期 desc", "h_v_Sc_MouldOtherInBillList");
			}
			else
			{
			string sql = sql1 + sWhere+ "order by 日期 desc";
			string sql = sql1 + sWhere+ "order by 制单日期 desc";
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherInBillList");
			}

			@@ -163,7 +164,7 @@
			{
			ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
			设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty,
			单价 HPrice, 金额 HMoney,HWHSonID HWHID, 发料仓库代码 HWHCode, 发料仓库 HWHName,HSPID,
			单价 HPrice, 金额 HMoney,收料仓库ID HWHID, 收料仓库代码 HWHCode, 收料仓库 HWHName,HSPID,
			仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID FROM h_v_Sc_MouldOtherInBillList"), "h_v_Sc_MouldOtherInBillList");

			}
			@@ -172,7 +173,7 @@
			//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,
			单价 HPrice, 金额 HMoney,收料仓库ID HWHID, 收料仓库代码 HWHCode, 收料仓库 HWHName,HSPID,
			仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID FROM h_v_Sc_MouldOtherInBillList where 1 = 1 ");
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldOtherInBillList");
			@@ -180,8 +181,8 @@
			}
			//查汇总
			ds1 = oCN.RunProcReturn(string.Format(@"select 物料代码,max(物料名称)物料名称,规格型号,max(单据号)单据号,批次,sum(实发数量)实发数量,
			HWHSonID,max(发料仓库代码)发料仓库代码,max(发料仓库)发料仓库,表体备注 from h_v_Sc_MouldOtherInBillList
			where 1=1 " + sqlWhere + " group by 物料代码,规格型号,HWHSonID,批次,表体备注"), "h_v_Sc_MouldOtherInBillList");
			收料仓库ID,max(收料仓库代码)收料仓库代码,max(收料仓库)收料仓库,表体备注 from h_v_Sc_MouldOtherInBillList
			where 1=1 " + sqlWhere + " group by 物料代码,规格型号,收料仓库ID,批次,表体备注"), "h_v_Sc_MouldOtherInBillList");

			list.Add(ds.Tables[0]);
			list.Add(ds1.Tables[0]);
			@@ -223,7 +224,7 @@
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBill_Edit", 1, true, msg4))
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBill_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -312,10 +313,16 @@
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
			oCn.RunProc(sql);
			}
			else
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改成功
			//string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
			string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
			oCn.RunProc(sql);
			}
			if (bResult)
			{
			@@ -356,7 +363,7 @@
			public object DeltetMouldOtherInBill(string HInterID,string user)
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBill_Delete", 1, true, user))
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBill_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -395,10 +402,21 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			//删除前查找当前单据的所有器具ID
			//string swhere = "";
			//DataSet ds = oCn.RunProcReturn("select HMaterID from Sc_MouldStockBillSub where HinterID=" + HInterID, "Sc_MouldStockBillSub");
			//for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
			//{
			// swhere = swhere + ds.Tables[0].Rows[i]["HMaterID"].ToString() + ",";
			//}
			//swhere = swhere.Substring(0, swhere.Length - 1);
			bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			if (IsDete)
			{
			//删除成功修改器具档案位置
			//string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 0,0,'{swhere}' ");
			string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
			oCn.RunProc(sql);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;