MES-WEB-API.git

			@@ -1,6 +1,7 @@
			ï»¿using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using SyntacticSugar.constant;
			using System;
			using System.Collections;
			using System.Collections.Generic;
			@@ -81,6 +82,61 @@
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region æ£éªåæ ·ååè¡¨ åé¡µåè¡¨
			[Route("QC_TakeSampleCheckBill/getQC_TakeSampleCheckBillListPage")]
			[HttpGet]
			public json getQC_TakeSampleCheckBillListPage(string sWhere, string user, int page, int size)
			{
			DataSet ds;
			json res = new json();
			try
			{
			List<object> columnNameList = new List<object>();
			//å¤ææé
			if (!DBUtility.ClsPub.Security_Log("QC_TakeSampleCheckBillMain_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéæ¥è¯¢ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			sWhere = sWhere.Replace("'", "''");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("exec h_p_QC_TakeSampleCheckBillList " + page + "," + size + ",''", "h_p_QC_TakeSampleCheckBillList");
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_QC_TakeSampleCheckBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_QC_TakeSampleCheckBillList");
			}

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			res.code = CodeConstant.SUCCEED;
			res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			res.Message = "Sucessï¼";
			res.list = columnNameList;
			res.data = ds.Tables[0];
			return res;
			}
			catch (Exception e)
			{
			res.code = CodeConstant.FAIL;
			res.count = CountConstant.FAIL;
			res.Message = "Exceptionï¼" + e.ToString();
			res.data = null;
			return res;
			}
			}
			#endregion
			@@ -342,6 +398,9 @@
			return objJsonResult;
			}


			oCN.BeginTran();

			//å é¤åæ§å¶=========================================
			string sql1 = "exec h_p_QC_TakeSampleCheckBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_TakeSampleCheckBill_BeforeDelCtrl");
			@@ -364,9 +423,6 @@
			}
			//==================================================================================



			oCN.BeginTran();

			oCN.RunProc("delete from QC_TakeSampleCheckBillMain where HInterID = " + HInterID);
			oCN.RunProc("delete from QC_TakeSampleCheckBillSub where HInterID= " + HInterID);
			@@ -732,8 +788,30 @@
			//è¿è¡éè¦è¿è¡çå³é/åå³éæä½
			if (IsAudit == 0) //å³éæäº¤
			{
			//å³éåæ§å¶=========================================
			string sql1 = "exec h_p_QC_TakeSampleCheckBill_BeforeCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_TakeSampleCheckBill_BeforeCloseCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :å³éåå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//==================================================================================

			//å³éæäº¤
			if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			if (oBill.CloseBill(lngBillKey, oBill.omodel.HBillNo, "h_p_QC_TakeSampleCheckBill_AfterCloseCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -752,8 +830,30 @@
			}
			if (IsAudit == 1) //åå³éæäº¤
			{
			//åå³éåæ§å¶=========================================
			string sql1 = "exec h_p_QC_TakeSampleCheckBill_BeforeUnCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_TakeSampleCheckBill_BeforeUnCloseCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :åå³éåå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//==================================================================================

			//åå³éæäº¤
			if (oBill.CancelClose(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			if (oBill.CancelClose(lngBillKey, oBill.omodel.HBillNo, "h_p_QC_TakeSampleCheckBill_AfterUnCloseCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -951,6 +1051,42 @@
			}
			#endregion

			#region è¿æ ·è·ååæ ·åæ°æ®
			[Route("QC_TakeSampleCheckBill/Get_BackSampleList")]
			[HttpGet]
			public object Get_BackSampleList(string sWhere)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			ds = oCN.RunProcReturn("select * from h_v_QC_TakeSampleCheckBillEdit where 1=1 "+ sWhere + " order by åæ®å· desc", "h_v_QC_TakeSampleCheckBillList");

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region æ£éªè¿æ ·ååè¡¨ æ¥è¯¢
			[Route("QC_TakeSampleCheckBill/QC_BackSampleCheckBillMainList")]
			[HttpGet]
			@@ -1002,6 +1138,61 @@
			objJsonResult.Message = "Exceptionï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region æ£éªè¿æ ·ååè¡¨ åé¡µåè¡¨
			[Route("QC_TakeSampleCheckBill/get_QC_BackSampleCheckBillListPage")]
			[HttpGet]
			public json get_QC_BackSampleCheckBillListPage(string sWhere, string user, int page, int size)
			{
			DataSet ds;
			json res = new json();
			try
			{
			List<object> columnNameList = new List<object>();
			//å¤ææé
			if (!DBUtility.ClsPub.Security_Log("QC_BackSampleCheckBillMain_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéæ¥è¯¢ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			sWhere = sWhere.Replace("'", "''");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("exec h_p_QC_BackSampleCheckBillList " + page + "," + size + ",''", "h_p_QC_BackSampleCheckBillList");
			}
			else
			{
			ds = oCN.RunProcReturn("exec h_p_QC_BackSampleCheckBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_QC_BackSampleCheckBillList");
			}

			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}

			res.code = CodeConstant.SUCCEED;
			res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			res.Message = "Sucessï¼";
			res.list = columnNameList;
			res.data = ds.Tables[0];
			return res;
			}
			catch (Exception e)
			{
			res.code = CodeConstant.FAIL;
			res.count = CountConstant.FAIL;
			res.Message = "Exceptionï¼" + e.ToString();
			res.data = null;
			return res;
			}
			}
			#endregion
			@@ -1251,7 +1442,7 @@
			return objJsonResult;
			}

			if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
			if (BillOld1.ShowBill(long.Parse(HInterID), ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -1260,7 +1451,7 @@
			return objJsonResult;
			}
			//å¤ææ¯å¦å¯å é¤
			if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
			if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -1269,7 +1460,7 @@
			return objJsonResult;
			}
			//å¤ææ¯å¦æ¯åå»ºç¶æè¿è¡å é¤
			if (int.Parse(BillOld.omodel.HBillStatus.ToString()) <= 1)
			if (int.Parse(BillOld1.omodel.HBillStatus.ToString()) <= 1)
			{
			//è¿è¡ ä¼è®¡æé´ ç»è´¦ çå¤æåæ§å¶
			int sYear = 0;
			@@ -1281,8 +1472,11 @@
			return objJsonResult;
			}


			oCN.BeginTran();

			//å é¤åæ§å¶=========================================
			string sql1 = "exec h_p_QC_BackSampleCheckBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			string sql1 = "exec h_p_QC_BackSampleCheckBill_BeforeDelCtrl " + BillOld1.omodel.HInterID + ",'" + BillOld1.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_BackSampleCheckBill_BeforeDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			@@ -1303,15 +1497,11 @@
			}
			//==================================================================================



			oCN.BeginTran();

			oCN.RunProc("delete from QC_BackSampleCheckBillMain where HInterID = " + HInterID);
			oCN.RunProc("delete from QC_BackSampleCheckBillSub where HInterID= " + HInterID);

			//å é¤åæ§å¶==================================================================================
			string sql2 = "exec h_p_QC_BackSampleCheckBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			string sql2 = "exec h_p_QC_BackSampleCheckBill_AfterDelCtrl " + BillOld1.omodel.HInterID + ",'" + BillOld1.omodel.HBillNo + "','" + user + "'";
			ds = oCN.RunProcReturn(sql2, "h_p_QC_BackSampleCheckBill_AfterDelCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			@@ -1671,8 +1861,30 @@
			//è¿è¡éè¦è¿è¡çå³é/åå³éæä½
			if (IsAudit == 0) //å³éæäº¤
			{
			//å³éåæ§å¶=========================================
			string sql1 = "exec h_p_QC_BackSampleCheckBill_BeforeCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_BackSampleCheckBill_BeforeCloseCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :å³éåå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//==================================================================================

			//å³éæäº¤
			if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			if (oBill.CloseBill(lngBillKey, oBill.omodel.HBillNo, "h_p_QC_BackSampleCheckBill_AfterCloseCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -1691,8 +1903,30 @@
			}
			if (IsAudit == 1) //åå³éæäº¤
			{
			//åå³éåæ§å¶=========================================
			string sql1 = "exec h_p_QC_BackSampleCheckBill_BeforeUnCloseCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
			ds = oCN.RunProcReturn(sql1, "h_p_QC_BackSampleCheckBill_BeforeUnCloseCtrl");
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :åå³éåå¤æå¤±è´¥ï¼è¯·ä¸ç½ç»ç®¡çäººåèç³»";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//==================================================================================

			//åå³éæäº¤
			if (oBill.CancelClose(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			if (oBill.CancelClose(lngBillKey, oBill.omodel.HBillNo, "h_p_QC_BackSampleCheckBill_AfterUnCloseCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;