~yxj/MES-WEB-API.git

			@@ -17,6 +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(); //模具报废入库对应单据类
			@@ -83,21 +84,21 @@

			[Route("Sc_MouldOtherOutBill/GetMouldOtherOutBill")]
			[HttpGet]
			public object GetMouldOtherOutBill(string sWhere,string user)
			public object GetMouldOtherOutBill(string sWhere,string user, string Organization)
			{
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBillList", 1, true, user))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBillList", 1, true, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = Sc_MouldOtherOutBill(sWhere);
			ds = Sc_MouldOtherOutBill(sWhere,Organization);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回记录成功！";
			@@ -114,15 +115,15 @@
			}
			}

			public static DataSet Sc_MouldOtherOutBill(string sWhere)
			public static DataSet Sc_MouldOtherOutBill(string sWhere, string Organization)
			{
			string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherOutBillList where 库存组织='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldOtherOutBillList order by 日期 desc", "h_v_Sc_MouldOtherOutBillList");
			return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 日期 desc", "h_v_Sc_MouldOtherOutBillList");
			}
			else
			{
			string sql1 = "select * from h_v_Sc_MouldOtherOutBillList where 1 = 1 ";
			string sql = sql1 + sWhere+ "order by 日期 desc";
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");
			}
			@@ -161,7 +162,7 @@
			ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
			设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty,
			单价 HPrice, 金额 HMoney,HWHSonID HWHID, 发料仓库代码 HWHCode, 发料仓库 HWHName,HSPID,
			仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark FROM h_v_Sc_MouldOtherOutBillList"), "h_v_Sc_MouldOtherOutBillList");
			仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldOtherOutBillList"), "h_v_Sc_MouldOtherOutBillList");

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

			@@ -218,11 +219,11 @@
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBill_Edit", 1, true, msg4))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Edit", 1, true, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -341,7 +342,7 @@
			}
			#endregion

			#region [器具其他入库单删除功能]
			#region [器具其他出库单删除功能]
			/// <summary>
			/// 模具处理领用单删除功能
			/// </summary>
			@@ -351,7 +352,7 @@
			public object DeltetMouldOtherOutBill(string HInterID,string user)
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBill_Delete", 1, true,user))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherInBill_Delete", 1, true,user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -421,7 +422,89 @@
			}
			#endregion

			#region 器具其他出库单审核/反审核
			[Route("Sc_MouldOtherOutBill/AuditMouldOtherOutBill")]
			[HttpGet]
			public object AuditMouldOtherOutBill(string HInterID, string user, int flag)
			{
			//flag=1 审核； flag=2 反审核
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Check", 1, true, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无审核权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID);
			if (lngBillKey == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据ID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			DLL.ClsSc_MouldProdOutBill oBill = new DLL.ClsSc_MouldProdOutBill();
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (flag == 1)
			{
			if (oBill.omodel.HBillStatus == 2)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前单据已审核，无需再次审核";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			string HCheckDate = DateTime.Now.Date.ToString();
			oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker='" + user + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='3828' and HInterID=" + HInterID);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			else
			{
			if (oBill.omodel.HBillStatus == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前单据未审核，无需反审核";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			string HCheckDate = DateTime.Now.Date.ToString();
			oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker=' ',HCheckDate=' ',HBillStatus=1 Where HBillType='3828' and HInterID=" + HInterID);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未找到";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			}
			}