~yxj/MES-WEB-API.git

			@@ -21,6 +21,8 @@
			public DAL.ClsSc_MouldScrapInBill BillNew0 = new DAL.ClsSc_MouldScrapInBill(); //模具报废入库对应单据类
			public DAL.ClsSc_MouldScrapInBill BillOld0 = new DAL.ClsSc_MouldScrapInBill(); //模具报废入库对应单据类

			public DLL.ClsSc_MouldRepairInBill BillNew01 = new DLL.ClsSc_MouldRepairInBill(); //模具改制入库对应单据类
			public DLL.ClsSc_MouldRepairInBill BillOld01 = new DLL.ClsSc_MouldRepairInBill(); //模具改制入库对应单据类

			/// <summary>
			/// 根据包装单返回此包装单内的相关信息
			@@ -4209,7 +4211,7 @@

			#region 器具改制入库单据维护列表

			[Route("Sc_MouldRepairInBillList/GetMouldRepairInBillList")]
			[Route("Sc_CheckToolsRepairWorkBillList/GetMouldRepairInBillList")]
			[HttpGet]
			public object GetMouldRepairInBillList(string sWhere)
			{
			@@ -4250,23 +4252,6 @@

			#endregion

			#region[器具改制入库单编辑时获取表头数据]
			[Route("Sc_MouldRepairInBill/Sc_MouldRepairInBillListCheckDetail")]
			[HttpGet]
			public ApiResult<DataSet> Sc_MouldRepairInBillListCheckDetail(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_Sc_MouldRepairInBillList where hmainid= " + HID + " ", "h_v_Sc_MouldRepairInBillList");
			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("Sc_MouldRepairInBill/Sc_MouldRepairInBillListCheckDetai")]
			[HttpGet]
			@@ -4278,9 +4263,10 @@
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sqlWhere == null \|\| sqlWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID 模具代码,设计寿命,剩余寿命,累积使用寿命,HWHID 仓库,
			HSPID 仓位代码,模具新规格,最后生产产品,退库类型,
			表头备注 FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");
			ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
			批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark
			FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -4291,9 +4277,10 @@
			{

			//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
			string sql1 = string.Format(@"SELECT HMaterID 模具代码,设计寿命,剩余寿命,累积使用寿命,HWHID 仓库,
			HSPID 仓位代码,模具新规格,最后生产产品,退库类型,
			表头备注 FROM h_v_Sc_MouldRepairInBillList where 1 = 1 ");
			string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
			批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark
			FROM h_v_Sc_MouldRepairInBillList where 1=1 ");
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");

			@@ -4329,23 +4316,72 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();

			string refSav = sArray[2].ToString();

			string UserName = "";
			string s = "";
			ListModels oListModels = new ListModels();
			try
			{
			DLL.ClsSc_MouldProdBackBill oBill = new DLL.ClsSc_MouldProdBackBill();
			List<Model.ClsSc_MouldProdBackBillMain> lsmain = new List<Model.ClsSc_MouldProdBackBillMain>();
			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_MouldProdBackBillMain(msg2);
			foreach (Model.ClsSc_MouldProdBackBillMain oItem in lsmain)
			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 = "3803";
			oItem.HBillSubType = "3803";
			oItem.HBillType = "3826";
			oItem.HBillSubType = "3826";
			//oItem.HBillNo = ""; //单据号
			//oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --日期
			//oItem.HInnerBillNo = ""; // --内部单据号
			@@ -4380,10 +4416,10 @@
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			//msg2 = msg2.Replace("'", "’");
			List<Model.ClsSc_MouldProdBackBillSub> ls = new List<Model.ClsSc_MouldProdBackBillSub>();
			ls = oListModels.getObjectByJson_Gy_MouldProdBackBillSub(msg3);
			List<Models.ClsSc_MouldRepairInBillSub> ls = new List<Models.ClsSc_MouldRepairInBillSub>();
			ls = oListModels.getObjectByJson_Gy_MouldRepairInHouseBillSub(msg3);
			int i = 0;
			foreach (Model.ClsSc_MouldProdBackBillSub oItemSub in ls)
			foreach (Models.ClsSc_MouldRepairInBillSub oItemSub in ls)
			{

			i++;
			@@ -4526,6 +4562,23 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region[模具改制入库单编辑时获取表头数据]
			[Route("Sc_CheckToolsRepairWorkBillList/Sc_MouldRepairInHouseBillListCheckDetai")]
			[HttpGet]
			public ApiResult<DataSet> Sc_MouldRepairInHouseBillListCheckDetai(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_Sc_MouldRepairInBillList where hmainid= " + HID + " ", "h_v_Sc_MouldRepairInBillList");
			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

			@@ -4936,7 +4989,7 @@
			// HSecUnitID, 辅助计量单位代码 HSecUnitCode, 辅助计量单位 HSecUnitName,换算率 HSecUnitRate,
			// HUnitID, 计量单位代码 HUnitCode, 计量单位 HUnitName,
			// 设计寿命 HDesignLife, 原剩余寿命 HLeaveLife, 新剩余寿命 HNewLife,表体备注 HRemark
			// FROM h_v_Sc_MouldLifeChangeBillList_Edit"), "h_v_Sc_MouldLifeChangeBillList_Edit");
			// FROM h_v_Sc_MouldLifeChangeBillList_Edit"), "h_v_Sc_MouldLifeChangeBillList_Edit");

			// objJsonResult.code = "0";
			// objJsonResult.count = 1;
			@@ -4951,7 +5004,7 @@
			// HSecUnitID, 辅助计量单位代码 HSecUnitCode, 辅助计量单位 HSecUnitName,换算率 HSecUnitRate,
			// HUnitID, 计量单位代码 HUnitCode, 计量单位 HUnitName,
			// 设计寿命 HDesignLife, 原剩余寿命 HLeaveLife, 新剩余寿命 HNewLife,表体备注 HRemark
			// FROM h_v_Sc_MouldLifeChangeBillList_Edit where 1 = 1 ");
			// FROM h_v_Sc_MouldLifeChangeBillList_Edit where 1 = 1 ");
			// string sql = sql1 + sqlWhere;
			// ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldLifeChangeBillList_Edit");