MES-WEB-API.git

			@@ -18,6 +18,7 @@
			public DataSet ds = new DataSet();
			public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			public WebServer webserver = new WebServer();
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

			public DAL.ClsSc_MouldScrapInBill BillNew0 = new DAL.ClsSc_MouldScrapInBill(); //模具报废入库对应单据类
			public DAL.ClsSc_MouldScrapInBill BillOld0 = new DAL.ClsSc_MouldScrapInBill(); //模具报废入库对应单据类
			@@ -4251,11 +4252,11 @@
			string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairInBillList where 库存组织='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldRepairInBillList");
			return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 制单日期 desc", "h_v_Sc_MouldRepairInBillList");
			}
			else
			{
			string sql = sql1 + sWhere+ "order by hmainid desc";
			string sql = sql1 + sWhere+ "order by 制单日期 desc";
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
			}

			@@ -4278,7 +4279,7 @@
			{
			ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
			批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName
			FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");


			@@ -4289,8 +4290,8 @@
			//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, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位
			FROM h_v_Sc_MouldRepairInBillList where 1=1 ");
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName
			FROM h_v_Sc_MouldRepairInBillList where 1=1 ");
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");

			@@ -4318,7 +4319,209 @@
			}
			#endregion

			#region 器具改制入库单保存/编辑
			#region 器具改制入库单保存/编辑 20240702作废
			/// <summary>
			/// 保存器具改制入库单
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			//[Route("Sc_MouldRepairInBill/SaveGetMouldRepairInBillList")]
			//[HttpPost]
			//public object SaveGetMouldRepairInBillList([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 refSav = sArray[2].ToString();
			// string msg4 = sArray[3].ToString();

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

			// DLL.ClsSc_MouldRepairInBill oBill = new DLL.ClsSc_MouldRepairInBill();
			// List<Models.ClsSc_MouldRepairInBillMain> lsmain = new List<Models.ClsSc_MouldRepairInBillMain>();
			// msg2 = msg2.Replace("\\", "");
			// msg2 = msg2.Replace("\n", ""); //\n
			// lsmain = oListModels.getObjectByJson_Gy_MouldRepairInHouseBillMain(msg2);
			// foreach (Models.ClsSc_MouldRepairInBillMain oItem in lsmain)
			// {
			// if (refSav == "Add")
			// {
			// //单据号是否重复
			// if (BillNew01.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld0.omodel.HInterID))
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "单据号重复！不允许保存！";
			// objJsonResult.data = 1;
			// return objJsonResult;
			// }
			// }
			// if (refSav == "Update")
			// {
			// if (BillOld01.ShowBill(oItem.HInterID, ref s) == false)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "此单据有误！";
			// objJsonResult.data = 1;
			// return objJsonResult;
			// }
			// //判断是否可编辑
			// if (BillOld0.omodel.HChecker != "" && BillOld0.omodel.HChecker != null)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "此单据已经被审核，不允许修改！";
			// objJsonResult.data = 1;
			// return objJsonResult;
			// }
			// if (BillOld0.omodel.HBillStatus > 1)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "此单据处于不可编辑状态，不允许修改！";
			// objJsonResult.data = 1;
			// return objJsonResult;
			// }
			// if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld0, ref s))
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = s + "，不允许修改";
			// objJsonResult.data = 1;
			// return objJsonResult;
			// }
			// }
			// //oItem.HMaker = "";
			// UserName = oItem.HMaker; //制单人
			// oItem.HBillType = "3826";
			// oItem.HBillSubType = "3826";
			// //oItem.HBillNo = ""; //单据号
			// //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --日期
			// //oItem.HInnerBillNo = ""; // --内部单据号
			// oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			// oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
			// //oItem.HEquipID = 0; //设备ID(Gy_EquipMent)
			// //oItem.HPeriod = 0;
			// //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --维修日期
			// //oItem.HCheckResult = ""; //验收结论--(正常，异常)
			// //oItem.HEmpID = 0; //验收人(Gy_Employee)
			// //oItem.HManagerID = 0; //负责人(Gy_Employee)
			// //oItem.HDeptID = 0; //验收部门(Gy_Department)
			// //oItem.HExplanation = ""; //摘要(故障描述)
			// //oItem.HRemark = ""; //备注

			// //oItem.HMainSourceInterID = oItem.HInterID;

			// //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
			// 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
			// //msg2 = msg2.Replace("'", "’");
			// List<Models.ClsSc_MouldRepairInBillSub> ls = new List<Models.ClsSc_MouldRepairInBillSub>();
			// ls = oListModels.getObjectByJson_Gy_MouldRepairInHouseBillSub(msg3);
			// int i = 0;
			// foreach (Models.ClsSc_MouldRepairInBillSub oItemSub in ls)
			// {

			// i++;
			// oItemSub.HEntryID = i;

			// //oItemSub.HRepairCheckID = 0; //验收项目ID
			// //oItemSub.HRepairCheckContent = ""; //验收内容
			// //oItemSub.HManagerID = 0; //负责人ID
			// //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; //关联金额
			// //oItemSub.HRepairID = 0; //维修项目
			// //oItemSub.HRepairExplanation =""; //维修要求
			// //oItemSub.HMoney = 0; //维修费用
			// oBill.DetailColl.Add(oItemSub);

			// }
			// //保存
			// //保存完毕后处理
			// bool bResult;
			// if (oBill.omodel.HInterID == 0)
			// {
			// // 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)
			// {
			// 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 器具改制入库单保存/编辑 20240702
			/// <summary>
			/// 保存器具改制入库单
			/// </summary>
			@@ -4328,171 +4531,137 @@
			[HttpPost]
			public object SaveGetMouldRepairInBillList([FromBody] JObject msg)
			{
			DAL.ClsSc_MouldRepairInBill oBill = new DAL.ClsSc_MouldRepairInBill();

			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 refSav = sArray[2].ToString();
			string msg4 = sArray[3].ToString();

			string UserName = "";
			string s = "";
			ListModels oListModels = new ListModels();
			string sMainStr = sArray[0].ToString(); //主表数据
			string sSubStr = sArray[1].ToString(); //子表数据
			string OperationType = sArray[2].ToString(); //操作类型（Add新增、Update编辑）
			string HMaker = sArray[3].ToString(); //制单人
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Edit", 1, false, msg4))
			//判断权限
			if (OperationType == "Add")
			{
			BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
			//判断新增权限
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill", 1, false, HMaker))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "您没有该模块新增权限,请与管理员联系！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
			//判断编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Edit", 1, false, HMaker))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "您没有该模块编辑权限,请与管理员联系！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//表头赋值
			sMainStr = sMainStr.Replace("\\", "");
			sMainStr = sMainStr.Replace("\n", "");
			sMainStr = "[" + sMainStr.ToString() + "]";
			List<Model.ClsSc_MouldStockBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillMain>>(sMainStr);
			foreach (Model.ClsSc_MouldStockBillMain oItem in lsmain)
			{
			//单据号是否重复
			if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号重复！不允许保存！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//判断会计期是否合理
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s;
			objJsonResult.data = null;
			return objJsonResult;
			}

			oItem.HYear = sYear;
			oItem.HPeriod = sPeriod;
			DBUtility.ClsPub.CurUserName = oItem.HMaker;
			oBill.omodel = oItem;
			}
			//表体赋值
			//按 },{来拆分数组 //去掉【和】
			sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
			sSubStr = sSubStr.Replace("\\", "");
			sSubStr = sSubStr.Replace("\n", "");
			sSubStr = "[" + sSubStr.ToString() + "]";
			List<Model.ClsSc_MouldStockBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(sSubStr);
			int i = 0;
			foreach (Model.ClsSc_MouldStockBillSub oItemSub in ls)
			{
			i++;
			oItemSub.HEntryID = i;
			oBill.DetailColl.Add(oItemSub);
			}

			string sErrMsg = "";
			bool bResult;
			//获取系统参数
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			{
			//保存
			if (OperationType == "Add") //新增保存
			{
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);

			if (oSystemParameter.omodel.WMS_CampanyName == "四维尔") //系统参数客户定制化名称空白为通用
			{
			//修改器具档案位置
			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);

			if (oSystemParameter.omodel.WMS_CampanyName == "四维尔") //系统参数客户定制化名称空白为通用
			{
			//修改器具档案位置
			string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
			oCn.RunProc(sql);
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}

			DLL.ClsSc_MouldRepairInBill oBill = new DLL.ClsSc_MouldRepairInBill();
			List<Models.ClsSc_MouldRepairInBillMain> lsmain = new List<Models.ClsSc_MouldRepairInBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Gy_MouldRepairInHouseBillMain(msg2);
			foreach (Models.ClsSc_MouldRepairInBillMain oItem in lsmain)
			{
			if (refSav == "Add")
			{
			//单据号是否重复
			if (BillNew01.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld0.omodel.HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号重复！不允许保存！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			if (refSav == "Update")
			{
			if (BillOld01.ShowBill(oItem.HInterID, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据有误！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//判断是否可编辑
			if (BillOld0.omodel.HChecker != "" && BillOld0.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据已经被审核，不允许修改！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (BillOld0.omodel.HBillStatus > 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据处于不可编辑状态，不允许修改！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld0, ref s))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s + "，不允许修改";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			//oItem.HMaker = "";
			UserName = oItem.HMaker; //制单人
			oItem.HBillType = "3826";
			oItem.HBillSubType = "3826";
			//oItem.HBillNo = ""; //单据号
			//oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --日期
			//oItem.HInnerBillNo = ""; // --内部单据号
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
			//oItem.HEquipID = 0; //设备ID(Gy_EquipMent)
			//oItem.HPeriod = 0;
			//oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --维修日期
			//oItem.HCheckResult = ""; //验收结论--(正常，异常)
			//oItem.HEmpID = 0; //验收人(Gy_Employee)
			//oItem.HManagerID = 0; //负责人(Gy_Employee)
			//oItem.HDeptID = 0; //验收部门(Gy_Department)
			//oItem.HExplanation = ""; //摘要(故障描述)
			//oItem.HRemark = ""; //备注

			//oItem.HMainSourceInterID = oItem.HInterID;

			//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
			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
			//msg2 = msg2.Replace("'", "’");
			List<Models.ClsSc_MouldRepairInBillSub> ls = new List<Models.ClsSc_MouldRepairInBillSub>();
			ls = oListModels.getObjectByJson_Gy_MouldRepairInHouseBillSub(msg3);
			int i = 0;
			foreach (Models.ClsSc_MouldRepairInBillSub oItemSub in ls)
			{

			i++;
			oItemSub.HEntryID = i;

			//oItemSub.HRepairCheckID = 0; //验收项目ID
			//oItemSub.HRepairCheckContent = ""; //验收内容
			//oItemSub.HManagerID = 0; //负责人ID
			//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; //关联金额
			//oItemSub.HRepairID = 0; //维修项目
			//oItemSub.HRepairExplanation =""; //维修要求
			//oItemSub.HMoney = 0; //维修费用
			oBill.DetailColl.Add(oItemSub);

			}
			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			// 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 = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
			oCn.RunProc(sql);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //成功！
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			@@ -4500,7 +4669,7 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			@@ -4508,8 +4677,8 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			objJsonResult.Message = "保存失败！" + e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			@@ -4781,10 +4950,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;