MES-WEB-API.git

			@@ -31,7 +31,7 @@
			try
			{
			List<object> columnNameList = new List<object>();
			if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Query", 1, false, user))
			if (!DBUtility.ClsPub.Security_Log("Sc_EmployeeSignInNoteBillMain_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -144,7 +144,7 @@
			ListModels oListModels = new ListModels();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Edit", 1, false, msg4))
			if (!DBUtility.ClsPub.Security_Log("Sc_EmployeeSignInNoteBillMain_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -262,14 +262,14 @@
			/// <param name="IsAudit">审核(0),反审核(1)</param>
			/// <param name="CurUserName">审核人</param>
			/// <returns></returns>
			[Route("WLYayBillController/AuditWLYayBill1")]
			[Route("Sc_EmployeeSignInNoteBillController/Audit")]
			[HttpGet]
			public object AuditWLYayBill(int HInterID, int IsAudit, string CurUserName)
			public object Audit(int HInterID, int IsAudit, string CurUserName)
			{
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier_Check", 1, false, CurUserName))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_EmployeeSignInNoteBillMain_Check", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -278,7 +278,7 @@
			return objJsonResult;
			}

			var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
			var ds = oCN.RunProcReturn("select * from Sc_EmployeeSignInNoteBillMain where HInterID=" + HInterID, "Sc_EmployeeSignInNoteBillMain");
			if (ds.Tables[0].Rows.Count > 0)
			{
			if (IsAudit == 0) //审核判断
			@@ -317,7 +317,7 @@

			if (IsAudit == 0) //审核判断
			{
			oCN.RunProc("update WL_YayBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() ,HBillStatus=2 where HInterID=" + HInterID);
			oCN.RunProc("update Sc_EmployeeSignInNoteBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() ,HBillStatus=2 where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -326,7 +326,7 @@
			}
			if (IsAudit == 1) //反审核判断
			{
			oCN.RunProc("update WL_YayBillMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID=" + HInterID);
			oCN.RunProc("update Sc_EmployeeSignInNoteBillMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID=" + HInterID);

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -349,54 +349,212 @@
			}
			#endregion

			//#region
			//[Route("Sc_EmployeeSignInNoteBillController/APP_Edit_json")]
			//[HttpPost]
			//public object APP_Edit_json(int HInterID,string HBarCode)
			//{
			// DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain where HBarCode='"+ HBarCode+"'", "Gy_EquipFileBillMain");
			// if(ds!=null\|\|ds.Tables.Count>0)
			// {
			// var EquipmentID = ds.Tables[0].Rows[0]["HInterID"];
			// DataSet dds = oCN.RunProcReturn("exec h_p_SB_HEquipHMould_Query "+ EquipmentID, "h_p_SB_HEquipHMould_Query");
			// if(dds != null \|\| dds.Tables.Count > 0)
			// {

			// }
			// }
			//}
			//#endregion







			[Route("WLYayBillController/updateBillMEs1")]
			#region app扫码模块
			[Route("Sc_EmployeeSignInNoteBillController/APP_Edit_json")]
			[HttpGet]
			public object updateBillMEs(int HInterID,int HEntryID, int ScatteredVolume, string CurUserName)
			public object APP_Edit_json(int HInterID, string HBarCode)
			{
			var ds = oCN.RunProcReturn("select * from WL_YayBillMain a inner join WL_YayBillSub_Material b on b.HInterID=a.HInterID where a.HInterID=" + HInterID, "WL_YayBillMain");
			if (ds != null \|\| ds.Tables[0].Rows.Count <= 0)
			oCN.BeginTran();
			DataSet ds = oCN.RunProcReturn("exec h_p_getMESByEquipmentCode_app '" + HBarCode+"'", "h_p_getMESByEquipmentCode_app");
			//DataSet ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain where HBarCode='" + HBarCode + "'", "Gy_EquipFileBillMain");
			if (ds != null \|\| ds.Tables.Count > 0)
			{
			oCN.BeginTran();
			oCN.RunProc("update WL_YayBillSub_Material set HScatteredVolume= " + ScatteredVolume + " where HInterID=" + HInterID+ "and HEntryID="+ HEntryID);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "成功";
			objJsonResult.data = null;
			oCN.Commit();
			return objJsonResult;
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "成功";
			objJsonResult.data = ds.Tables;
			oCN.Commit();
			return objJsonResult;

			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "更新失败！";
			objJsonResult.Message = "没有返回任何记录！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			return objJsonResult;
			}
			#endregion


			#region 保存/编辑

			[Route("Sc_EmployeeSignInNoteBillController/SaveBill_APP")]
			[HttpPost]
			public object SaveBill_APP([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();


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

			DAL.ClsSc_EmployeeSignInNoteBill oBill = new DAL.ClsSc_EmployeeSignInNoteBill();
			List<Model.ClsSc_EmployeeSignInNoteBill> lsmain = new List<Model.ClsSc_EmployeeSignInNoteBill>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Sc_EmployeeSignInNoteBill(msg2);

			foreach (Model.ClsSc_EmployeeSignInNoteBill oItem in lsmain)
			{
			oItem.HMaker = msg4;
			DBUtility.ClsPub.CurUserName = msg4; //制单人
			oItem.HBillType = "4616";
			oItem.HBillSubType = "4616";
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
			oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
			oItem.HCheckEmp = oItem.HEmpID;
			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<Model.ClsSc_EmployeeSignInNoteBillSub> ls = new List<Model.ClsSc_EmployeeSignInNoteBillSub>();
			//ls = oListModels.getObjectByJson_Sc_EmployeeSignInNoteBillSub(msg3);
			//int i = 0;
			//foreach (Model.ClsSc_EmployeeSignInNoteBillSub oItem in ls)
			//{

			// i++;
			// oItem.HEntryID = i;
			// oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			// oItem.HCloseType = false; //关闭类型
			// oBill.DetailColl.Add(oItem);

			//}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			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 删除

			[Route("Sc_EmployeeSignInNoteBillController/deleteBill")]
			[HttpGet]
			public object deleteBill(string HItemID, string user)
			{
			DataSet ds;
			//string ModRightNameCheck = "Sc_ProcessReport_check";
			try
			{
			//删除权限
			if (!DBUtility.ClsPub.Security_Log("Sc_EmployeeSignInNoteBillMain_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (string.IsNullOrWhiteSpace(HItemID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HItemID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();//开始事务
			ds = oCN.RunProcReturn("select * from Sc_EmployeeSignInNoteBillMain where HInterID=" + HItemID, "Sc_EmployeeSignInNoteBillMain");
			DataSet dds = oCN.RunProcReturn("select * from Sc_EmployeeSignInNoteBillSub where HInterID=" + HItemID, "Sc_EmployeeSignInNoteBillSub");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有数据，无法删除！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}


			oCN.RunProc("delete Sc_EmployeeSignInNoteBillMain where HInterID=" + HItemID);
			if (dds != null \|\| dds.Tables[0].Rows.Count != 0)
			{
			oCN.RunProc("delete Sc_EmployeeSignInNoteBillSub where HInterID=" + HItemID);
			}
			oCN.Commit();//提交事务
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "数据删除成功！";
			objJsonResult.data = null;
			return objJsonResult; ;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}