~yxj/MES-WEB-API.git

			@@ -75,11 +75,11 @@
			string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where 库存组织='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by hmainid desc", "h_v_Sc_MouldProdInHouseBillList");
			return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by 制单日期 desc", "h_v_Sc_MouldProdInHouseBillList");
			}
			else
			{
			string sql = sql1 + sWhere+ "order by hmainid desc";
			string sql = sql1 + sWhere+ "order by 制单日期 desc";
			Log.LogInfo(sql);
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
			}
			@@ -144,9 +144,22 @@
			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(lngBillKey, 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 = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			@@ -166,7 +179,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未找到";
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -424,7 +437,7 @@
			ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
			批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
			实收数量 HQty, 单价 HPrice, 金额 HMoney,hwhid1 HWHID, 收料仓库代码 HWHCode,收料仓库 HWHName,
			HSPID, 收料仓位代码 HSPCode,收料仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位
			HSPID, 收料仓位代码 HSPCode,收料仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName
			FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList");

			}
			@@ -435,7 +448,7 @@
			string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
			批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
			实收数量 HQty, 单价 HPrice, 金额 HMoney,hwhid1 HWHID, 收料仓库代码 HWHCode,收料仓库 HWHName,
			HSPID, 收料仓位代码 HSPCode,收料仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位
			HSPID, 收料仓位代码 HSPCode,收料仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName
			FROM h_v_Sc_MouldProdInHouseBillList where 1=1");
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
			@@ -627,24 +640,28 @@
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
			DataSet db=oCn.RunProcReturn(sql, "h_p_Sc_MouldChangeFileStatus");
			if (db.Tables[0].Rows[0]["issuccess"].ToString()=="0")
			//修改器具档案位置
			string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
			DataSet db = oCn.RunProcReturn(sql, "h_p_Sc_MouldChangeFileStatus");
			if (db.Tables[0].Rows[0]["issuccess"].ToString() == "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "器具位置同步失败！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			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)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			@@ -673,9 +690,9 @@
			#endregion

			#region 器具采购入库单审核/反审核
			[Route("Sc_MouldProdInHouseBill/AuditMouldProdInHouseBill")]
			[Route("Sc_MouldProdInHouseBill/AuditMouldProdInHouseBills")]
			[HttpGet]
			public object AuditMouldProdInHouseBill(string HInterID, string user, int flag)
			public object AuditMouldProdInHouseBills(string HInterID, string user, int flag)
			{
			//flag=1 审核； flag=2 反审核
			//编辑权限