MES-WEB-API.git

			@@ -7522,22 +7522,10 @@
			oItem.HBillType = "3819";
			oItem.HBillSubType = "3819";

			//oItem.HInterID =0;
			//oItem.HBillNo = "";
			oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --日期
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			//oItem.HMakeDate = "";
			//oItem.HYear = "";
			//oItem.HPeriod = "";
			//oItem.HRemark = "";
			//oItem.HCycleUnit = "";
			//oItem.HCheckCycle = "";
			//oItem.HBeginDate = "";
			//oItem.HEndDate = "";
			//oItem.HInnerBillNo = "";
			//oItem.HExplanation = "";

			//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);

			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
			{
			objJsonResult.code = "0";
			@@ -7580,7 +7568,6 @@
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			@@ -7592,7 +7579,121 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			#endregion

			#region 模具保养记录表保存/编辑APP
			/// <summary>
			/// 保存模具维修单
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("Sc_MouldMaintainBill/SaveGetMouldMaintainBillListAPP")]
			[HttpPost]
			public object SaveGetMouldMaintainBillListAPP([FromBody] JObject msg)
			{
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string msg5 = sArray[2].ToString();

			string UserName = "";
			ListModels oListModels = new ListModels();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainBill_Edit", 1, false, msg5))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DAL.ClsSc_MouldMaintainBill oBill = new DAL.ClsSc_MouldMaintainBill();
			List<Model.ClsSc_MouldMaintainBillMain> lsmain = new List<Model.ClsSc_MouldMaintainBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Sc_MouldMaintainBillMain(msg2);
			foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
			{
			UserName = oItem.HMaker; //制单人
			DBUtility.ClsPub.CurUserName = UserName;
			oItem.HBillType = "3819";
			oItem.HBillSubType = "3819";

			oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --日期
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);


			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oBill.omodel = oItem;
			}
			//保养项表体数据
			//按 },{来拆分数组 //去掉【和】
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			List<Model.ClsSc_MouldMaintainRuleBillSub_Item> ls = new List<Model.ClsSc_MouldMaintainRuleBillSub_Item>();
			ls = oListModels.getObjectByJson_Sc_MouldMaintainRuleBillSub_Item(msg3);
			int i = 0;
			foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oItemSub in ls)
			{

			i++;
			oItemSub.HEntryID = i;
			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HSourceInterID = 0; // 源单主内码
			oItemSub.HSourceEntryID = 0; //源单子内码
			oBill.DetailCol.Add(oItemSub);

			}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			bResult = oBill.AddBill_APP(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyBill_APP(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -8257,7 +8358,6 @@
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string msg4 = sArray[2].ToString();
			//string msg5 = sArray[3].ToString();

			string UserName = "";
			ListModels oListModels = new ListModels();
			@@ -8279,28 +8379,14 @@
			lsmain = oListModels.getObjectByJson_Sc_MouldDotCheckBillMain(msg2);
			foreach (Model.ClsSc_MouldDotCheckBillMain oItem in lsmain)
			{
			//oItem.HMaker = "";
			UserName = oItem.HMaker; //制单人
			oItem.HMaker = msg4;
			oItem.HBillType = "3821";
			oItem.HBillSubType = "3821";

			//oItem.HInterID =0;
			//oItem.HBillNo = "";
			oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --日期
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			//oItem.HMakeDate = "";
			//oItem.HYear = "";
			//oItem.HPeriod = "";
			//oItem.HRemark = "";
			//oItem.HCycleUnit = "";
			//oItem.HCheckCycle = "";
			//oItem.HBeginDate = "";
			//oItem.HEndDate = "";
			//oItem.HInnerBillNo = "";
			//oItem.HExplanation = "";

			//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
			{
			objJsonResult.code = "0";
			@@ -8316,7 +8402,6 @@
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			//msg2 = msg2.Replace("'", "’");
			List<Model.ClsSc_MouldDotCheckBillSub> ls = new List<Model.ClsSc_MouldDotCheckBillSub>();
			ls = oListModels.getObjectByJson_Sc_MouldDotCheckBillSub(msg3);
			int i = 0;
			@@ -8325,57 +8410,26 @@

			i++;
			oItemSub.HEntryID = i;
			//oItemSub.HCloseMan = ""; //行关闭

			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false; //关闭类型
			//oItemSub.HRemark = ""; //备注

			oItemSub.HSourceInterID = 0; // 源单主内码
			oItemSub.HSourceEntryID = 0; //源单子内码
			//oItemSub.HSourceBillNo = ""; //源单单号
			//oItemSub.HSourceBillType = ""; //源单类型

			oItemSub.HRelationQty = 0; //关联数量
			//oItemSub.HRelationMoney = 0; //关联金额
			//HMaterID = "";//配件代码
			//HUnitID = "";//单位代码
			//HQty = "";//实际用量
			//HQtyMust = "";//单位用量
			//HRemark = "";//备注


			oBill.DetailColl.Add(oItemSub);

			}

			////配件项表体数据
			////按 },{来拆分数组 //去掉【和】
			//msg5 = msg5.Substring(1, msg5.Length - 2);
			//msg5 = msg5.Replace("\\", "");
			//msg5 = msg5.Replace("\n", ""); //\n
			// //msg2 = msg2.Replace("'", "’");
			//List<Model.ClsSc_MouldDotCheckBillSub_Item> ls1 = new List<Model.ClsSc_MouldDotCheckBillSub_Item>();
			//ls1 = oListModels.getObjectByJson_Sc_MouldDotCheckBillSub_Item(msg5);
			//int j = 0;
			//foreach (Model.ClsSc_MouldDotCheckBillSub_Item oItemSub in ls1)
			//{

			// j++;
			// oItemSub.HEntryID = j;
			// //oItemSub.HCloseMan = ""; //行关闭
			// oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			// oItemSub.HCloseType = false; //关闭类型

			// oItemSub.HSourceInterID = 0; // 源单主内码
			// oItemSub.HSourceEntryID = 0; //源单子内码

			// oItemSub.HRelationQty = 0; //关联数量
			// oBill.DetailCol.Add(oItemSub);
			//}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			@@ -8387,7 +8441,128 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			#endregion

			#region 模具点检记录表保存/编辑APP
			/// <summary>
			/// 保存模具维修单
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("Sc_MouldDotCheckBill/SaveGetMouldDotCheckBillListAPP")]
			[HttpPost]
			public object SaveGetMouldDotCheckBillListAPP([FromBody] JObject msg)
			{
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			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("Sc_MouldDotCheckBill_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DAL.ClsSc_MouldDotCheckBill oBill = new DAL.ClsSc_MouldDotCheckBill();
			List<Model.ClsSc_MouldDotCheckBillMain> lsmain = new List<Model.ClsSc_MouldDotCheckBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Sc_MouldDotCheckBillMain(msg2);
			foreach (Model.ClsSc_MouldDotCheckBillMain oItem in lsmain)
			{
			UserName = oItem.HMaker; //制单人
			oItem.HMaker = msg4;
			oItem.HBillType = "3821";
			oItem.HBillSubType = "3821";

			oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --日期
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);

			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oBill.omodel = oItem;
			}
			//表体数据
			//按 },{来拆分数组 //去掉【和】
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			List<Model.ClsSc_MouldDotCheckBillSub> ls = new List<Model.ClsSc_MouldDotCheckBillSub>();
			ls = oListModels.getObjectByJson_Sc_MouldDotCheckBillSub(msg3);
			int i = 0;
			foreach (Model.ClsSc_MouldDotCheckBillSub oItemSub in ls)
			{

			i++;
			oItemSub.HEntryID = i;

			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false; //关闭类型

			oItemSub.HSourceInterID = 0; // 源单主内码
			oItemSub.HSourceEntryID = 0; //源单子内码

			oItemSub.HRelationQty = 0; //关联数量


			oBill.DetailColl.Add(oItemSub);

			}


			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			bResult = oBill.AddBill_APP(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyBill_APP(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			@@ -8448,7 +8623,7 @@
			list.Add(ds.Tables[0]);
			list.Add(ds1.Tables[0]);

			objJsonResult.code = "0";
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			@@ -8997,7 +9172,7 @@
			return objJsonResult;
			}
			#endregion


			#endregion

			#region 模具点检计划表
			@@ -10381,13 +10556,14 @@
			return objJsonResult;
			}

			sWhere = sWhere.Replace("'", "''");

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("exec h_p_Sc_MouldScrapOutHouseBillList " + page + "," + size + ",''", "h_p_Sc_MouldScrapOutHouseBillList");
			}
			else
			{
			{
			sWhere = sWhere.Replace("'", "''");
			ds = oCN.RunProcReturn("exec h_p_Sc_MouldScrapOutHouseBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_MouldScrapOutHouseBillList");
			}

			@@ -10651,7 +10827,7 @@
			public object SaveGetMouldScrapOutHouseBillList([FromBody] JObject msg)
			{
			DAL.ClsSc_MouldScrapOutBill oBill = new DAL.ClsSc_MouldScrapOutBill();

			oCn.BeginTran();
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			@@ -10663,6 +10839,7 @@
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Edit", 1, false, HMaker))
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "您没有该模块新增/编辑权限,请与管理员联系！";
			@@ -10687,6 +10864,7 @@
			//单据号是否重复
			if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号重复！不允许保存！";
			@@ -10699,6 +10877,7 @@
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s;
			@@ -10734,7 +10913,31 @@
			//保存
			if (oBill.omodel.HInterID == 0) //新增保存
			{
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);

			if (oSystemParameter.omodel.WMS_CampanyName == "海诚")
			{

			bResult = oBill.AddBillWithWebs(ref DBUtility.ClsPub.sExeReturnInfo, oCn);

			if (bResult)
			{
			if (!setOutBill(msg,oBill.omodel.HInterID, ref DBUtility.ClsPub.sErrInfo))
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "金蝶单据保存失败！" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}



			if (oSystemParameter.omodel.WMS_CampanyName == "四维尔") //系统参数客户定制化名称空白为通用
			{
			@@ -10757,6 +10960,7 @@
			}
			else
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
			@@ -10766,14 +10970,18 @@

			if (bResult)
			{
			objJsonResult.code = "0";
			oCn.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //成功！
			objJsonResult.data = null;
			return objJsonResult;


			}
			else
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			@@ -10783,6 +10991,7 @@
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.Message;
			@@ -10790,6 +10999,63 @@
			return objJsonResult;
			}
			}

			public bool setOutBill([FromBody] JObject msg,long HInterID,ref string sErrInfo)
			{
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string sMainStr = sArray[0].ToString(); //主表数据
			string sSubStr = sArray[1].ToString(); //子表数据
			string HMaker = sArray[2].ToString(); //制单人
			try
			{
			//List<Model.ClsKf_OtherOutBillMain> lsmain = new List<Model.ClsKf_OtherOutBillMain>();
			ListModels oListModels = new ListModels();
			sMainStr = sMainStr.Replace("\\", "");
			sMainStr = sMainStr.Replace("\n", "");
			sMainStr = "[" + sMainStr.ToString() + "]";
			//lsmain = oListModels.getOtherOutBillMainByJson(sMainStr);
			List<Model.ClsSc_MouldStockBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillMain>>(sMainStr);
			//lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			//lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			string sSourceBillType = "3832";

			WebAPI.WebS.ClsKf_OtherOutBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
			websLsmain.HInterID = HInterID;
			websLsmain.HDate = lsmain[0].HDate;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HSupID = lsmain[0].HSupID;
			websLsmain.HDeptID = lsmain[0].HDeptID;
			websLsmain.HEmpID = lsmain[0].HKeeperID;
			websLsmain.HKeeperID = lsmain[0].HKeeperID;
			websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
			websLsmain.HRemark = lsmain[0].HRemark??"test";
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HBillerID = 0;
			websLsmain.HSTOCKORGID = 100038;
			websLsmain.HOWNERID = 100038;
			websLsmain.HBillType = "1206";//固定值
			websLsmain.HBillSubType = "test";
			WebS.WebService1 oWebs = new WebS.WebService1();
			WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
			if (oWebs.set_SaveOtherOutBill_New_haicheng(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			return true;
			}
			else
			{
			return false;
			}

			}
			catch (Exception e)
			{
			DBUtility.ClsPub.sErrInfo = "上传失败！" + e.ToString();
			return false;
			}
			}

			#endregion

			#region [模具处理出库单删除功能]
			@@ -14768,7 +15034,7 @@
			#endregion

			#region 器具保养记录拍照上传
			[Route("Sc_MouldMaintainBill/UploadFile")]
			[Route("Sc_MouldMaintainBill/UploadFile_Maintain")]
			[HttpPost]
			public object UploadFile_Maintain()
			{
			@@ -15523,56 +15789,20 @@
			}
			#endregion


			#region[编辑时获取表头数据]
			[Route("Gy_QCVerificationBillMain/Gy_QCVerificationBillMainCheckDetai")]
			#region[编辑时获取数据]
			[Route("Gy_QCVerificationBillMain/Gy_QCVerificationBillDetail")]
			[HttpGet]
			public ApiResult<DataSet> Gy_QCVerificationBillMainCheckDetai(string HID)
			public ApiResult<DataSet> Gy_QCVerificationBillDetail(string HID)
			{
			if (string.IsNullOrEmpty(HID))
			return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCVerificationBillMain_Edit where hmainid= " + HID + " ", "h_v_Gy_QCVerificationBillMain");
			var dataSet = oCN.RunProcReturn("select * from h_v_Gy_QCVerificationBillMain_Edit where hmainid= " + HID + " ", "h_v_Gy_QCVerificationBillMain_Edit");
			if (dataSet == null \|\| dataSet.Tables[0].Rows.Count == 0)
			return new ApiResult<DataSet> { code = -1, msg = "不存在单号" };
			return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
			}
			#endregion

			#region[编辑时获取表体数据]
			[Route("Gy_QCVerificationBillMain/SGy_QCVerificationBillMainListProjectDetai")]
			[HttpGet]
			public object SGy_QCVerificationBillMainListProjectDetai(string sqlWhere)
			{
			DataSet ds;
			List<object> list = new List<object>();
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			string sql = "select HInspectInstruMentID,检验仪器代码 HInspectInstruMentNumber,检验仪器名称 HInspectInstruMentName,生效日期 HBeginDate,失效日期 HEndDate,校准状态 HHCalibrationStatus from h_v_Gy_QCVerificationBillMain_Edit where 1 = 1 " + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Gy_QCVerificationBillMain_Edit");

			list.Add(ds.Tables[0]);

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = null;
			objJsonResult.list = list;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			}
			return objJsonResult;
			}
			#endregion

			#endregion

			#region 器具校准记录单保存/编辑

			@@ -15683,8 +15913,279 @@
			}
			}
			#endregion

			#region 器具校准记录文件上传
			[Route("Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification")]
			[HttpPost]
			public object UploadFile_Gy_QCVerification()
			{
			string path = "";
			string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //单据号
			string HRemark = HttpContext.Current.Request.Params["HRemark"]; //备注
			string HUserName = HttpContext.Current.Request.Params["HUserName"]; //创建人
			HttpPostedFile files = HttpContext.Current.Request.Files["file"];
			string Ret = "";
			if (oSystemParameter.ShowBill(ref Ret))
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特")
			{
			path = "D:/网站发布/LAYUI/Files/Gy_QCVerification/" + HBillNo;
			}
			else
			{
			path = HttpContext.Current.Server.MapPath("~/../Files/Gy_QCVerification/" + HBillNo);
			}
			}
			dynamic dyResult = UploadFile_Gy_QCVerification(files, path, HBillNo, HRemark, HUserName);
			if (dyResult != null && dyResult.result == 1)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "上传成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = dyResult.returnval;
			objJsonResult.data = null;
			return objJsonResult;
			}

			}

			public dynamic UploadFile_Gy_QCVerification(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
			{
			dynamic Result_Ob = new { result = 1, returnval = "上传成功！" };
			string filePath = Path.GetFullPath(files.FileName);//文件上传路径
			string fileExtension = Path.GetExtension(files.FileName);// 文件扩展名
			string filename = files.FileName;//文件名
			string fileSavePath = path;// 上传保存路径
			int filesize = files.ContentLength;//获取上传文件的大小单位为字节byte
			int Maxsize = 40000 * 1024;//定义上传文件的最大空间大小为40M
			try
			{
			if (files == null \|\| files.ContentLength <= 0)
			{
			Result_Ob = new { result = 0, returnval = "文件不能为空!" };
			return Result_Ob;
			}
			if (filesize >= Maxsize)
			{
			Result_Ob = new { result = 0, returnval = "上传文件超过40M，不能上传！" };
			return Result_Ob;
			}

			string fileurl = Path.Combine(fileSavePath, filename);
			if (Directory.Exists(fileurl) == true) //如果存在重名文件就提示
			{
			Result_Ob = new { result = 0, returnval = "存在同名文件！" };
			return Result_Ob;
			}
			//删除数据表数据
			ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
			if (Directory.Exists(path))
			{
			File.Delete(fileurl); //删除指定文件
			files.SaveAs(fileurl);
			string StrPath = "";

			string Ret = "";
			if (oSystemParameter.ShowBill(ref Ret))
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特")
			{
			StrPath = "D:/网站发布/LAYUI/Files/Gy_QCVerification/" + HBillNo + "/" + filename;
			}
			else
			{
			StrPath = "/files/Gy_QCVerification/" + HBillNo + "/" + filename;
			}
			}
			if (File.Exists(fileurl))
			{
			//这里可以执行一些其它的操作，比如更新数据库
			//写入数据表
			oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
			",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
			",HFileClsID,HSourceBillNo" +
			") values('"
			+ filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
			",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
			"','" + 0 + "','" + HBillNo +
			"') ");
			}
			else
			{
			Result_Ob = new { result = 0, returnval = "上传失败！此文件为恶意文件" };
			}
			}
			else
			{
			Directory.CreateDirectory(fileSavePath); //添加文件夹
			files.SaveAs(fileurl);
			string StrPath = "/files/Gy_QCVerification/" + HBillNo + "/" + filename;
			if (File.Exists(fileurl))
			{
			//这里可以执行一些其它的操作，比如更新数据库
			//写入数据表
			oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
			",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
			",HFileClsID,HSourceBillNo" +
			") values('"
			+ filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
			",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
			"','" + 0 + "','" + HBillNo +
			"') ");
			}
			else
			{
			Result_Ob = new { result = 0, returnval = "上传失败！此文件为恶意文件" };
			}
			}

			}
			catch (Exception e)
			{
			Result_Ob = new { result = 0, returnval = e.Message };
			}
			return Result_Ob;
			}

			/// <summary>
			/// 根据单据号查找上传文件列表
			/// </summary>
			/// <param name="sWhere"></param>
			/// <returns></returns>
			[Route("Gy_QCVerificationBillMain/Gy_QCVerification_Filelist")]
			[HttpGet]
			public object Gy_QCVerification_Filelist(string HBillNo)
			{
			string Ret = "";
			var url = "";
			if (oSystemParameter.ShowBill(ref Ret))
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特")
			{
			url = "D:/网站发布/LAYUI/Files/Gy_QCVerification/" + HBillNo + "/";
			}
			else
			{
			url = fileip + "/Files/Gy_QCVerification/" + HBillNo + "/";
			}
			}
			try
			{
			ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo='" + HBillNo + "'", "MES_AccessoriesList");
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 根据ID,单据号,文件名删除文件
			/// </summary>
			/// <param name="sWhere"></param>
			/// <returns></returns>
			[Route("Gy_QCVerificationBillMain/Gy_QCVerification_DeleteFilelist")]
			[HttpGet]
			public object Gy_QCVerification_DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName)
			{
			try
			{

			oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}


			#endregion


			#endregion

			#region 器具处理出库单返回源单数据
			/// <summary>
			/// 返回源单数据
			/// </summary>
			/// <returns></returns>
			[Route("Sc_MouldScrapOutHouseBill/GetSourceBill_MouldScrapOutHouse_Json")]
			[HttpGet]
			public object GetSourceBill_MouldScrapOutHouse_Json(Int64 HInterID, Int64 HEntryID, string HBillType)
			{
			try
			{
			string sViewName = "";
			//器具领用申请单
			if (HBillType == "3823")
			{
			sViewName = "h_v_Sc_MouldScrapRequestBillList";
			}

			if (sViewName == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "不支持该源单类型！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCn.RunProcReturn("select * from h_v_Sc_MouldScrapRequestBillList where hmainid="+ HInterID.ToString()+ "and hsubid="+ HEntryID, "h_v_Sc_MouldScrapRequestBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未查询到源单信息！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "获取源单信息失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}