MES-WEB-API.git

			@@ -16,6 +16,7 @@
			using WebAPI;
			using WebAPI.Models;
			using WebAPI.Service;
			using WebAPI.Utility;

			namespace WebAPI.Controllers
			{
			@@ -32,9 +33,6 @@
			public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
			string ComputerName = SystemInformation.ComputerName; //è®¾å¤åç§°


			WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();


			#region å¬ç¨æ¹æ³
			@@ -509,7 +507,7 @@
			//çé¢ä¸æªéæ©ä»åº æ ä»ä½éæ©åè¡¨çé¢è¾å¥è¿æ»¤æ¡ä»¶
			if (HWhID == 0)
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%')", "h_v_IF_StockPlace");
			ds = oCn.RunProcReturn("select top 50 HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%')", "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -987,10 +985,176 @@

			#endregion

			#region å·¥åºèµæ

			/// <summary>
			/// æ«ç è¿åå·¥åºä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetProcess_Json")]
			[HttpGet]
			public object GetProcess_Json(string HBarCode, Int64 HStockOrgID)
			{
			try
			{
			Int64 HProcID = 0;
			HProcID = DBUtility.ClsPub.isLong(HBarCode);
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName from Gy_Process with(nolock) where HStopflag=0 and HItemID=" + HProcID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "Gy_Process");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼è¯·ç¡®è®¤ææ«å·¥åºæ¡ç æ¯å¦å±äºè¯¥ç»ç»ï¼ä¸ä¸ºéç¦ç¨ç¶æï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è¿åå·¥åºä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// è·åå·¥åºåè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetProcessList_Json")]
			[HttpGet]
			public object GetProcessList_Json(string Process, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName from Gy_Process with(nolock) where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + Process + "%' or HName like '%" + Process + "%')", "Gy_Process");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½å·¥åºè®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è¿åå·¥åºä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion


			#region æ«ç æ¨¡åè°ç¨æ¹æ³

			#region å¶ä»å¥åº è·åå¥åºç±»å

			/// <summary>
			/// è·åå¥åºç±»å
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetStockInStyle_Json")]
			[HttpGet]
			public Object GetStockInStyle_Json()
			{
			try
			{
			ds = oWebs.get_StockInStyle();
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢ä¸å°å¥åºç±»åä¿¡æ¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åå¥åºç±»åä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region å¶ä»åºåº è·ååºåºç±»å

			/// <summary>
			/// è·ååºåºç±»å
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetStockOutStyle_Json")]
			[HttpGet]
			public Object GetStockOutStyle_Json()
			{
			try
			{
			ds = oWebs.get_StockOutStyle();
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢ä¸å°åºåºç±»åä¿¡æ¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååºåºç±»åä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region ç´æ¥è°æ¨ è·åè°æ¨åºè´§ç±»å

			@@ -1119,6 +1283,56 @@
			#endregion


			#region æ«ç æ¨¡å è¿åæºååè¡¨ä¿¡æ¯
			/// <summary>
			/// æºååè¡¨ä¿¡æ¯ï¼æ ¹æ®åæ®ç±»åãæºåç±»åãç»ç»IDè¿åæºååè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetSourceBillList_Json")]
			[HttpGet]
			public object GetSourceBillList_Json(string HBillType, string HSourceBillType, Int64 HStockOrgID, string HSourceBillNo, string HMater, string HCustom)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_GetSourceBillList '" + HBillType + "','" + HSourceBillType + "'," + HStockOrgID.ToString() + ",'" + HSourceBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetSourceBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½æºåä¿¡æ¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åæºååæ®ä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åæºååæ®ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion


			#region æ«ç æ¨¡å æ ¹æ®æ¡ç å é¤ç¼ååè¡¨ä¸å¯¹åºæ¡ç è®°å½

			/// <summary>
			@@ -1131,6 +1345,9 @@
			{
			try
			{
			//æ ¹æ®ææ¡ç åæ®µå é¤æ¬åæ¡ç åºå¥åºç¼åè¡¨æ°æ®
			oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HBarCode_Pack<>'' and HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "' and HBarCode_Pack='" + HBarCode + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			//æ ¹æ®æ¡ç åæ®µå é¤æ¬åæ¡ç åºå¥åºç¼åè¡¨æ°æ®
			oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HBarCode<>'' and HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "' and HBarCode='" + HBarCode + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -1195,22 +1412,12 @@
			{
			try
			{
			if (oWebs.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, HBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID=" + HInterID.ToString() + " and HMaterID= " + HMaterID.ToString() + " and HAuxPropID= " + HAuxPropID.ToString() + " and HBillType='" + HBillType + "' and HSourceInterID=" + HSourceInterID.ToString() + " and HSourceEntryID=" + HSourceEntryID.ToString() + " and HQty<>0 ", ref DBUtility.ClsPub.sExeReturnInfo);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -1266,6 +1473,50 @@
			}

			#endregion


			#region æ«ç æ¨¡å å®¢æ·ãä¼ ç¥¨ãæ¡ç éªè¯è°ç¨

			/// <summary>
			/// æ«ç æ¨¡å å®¢æ·ãä¼ ç¥¨ãæ¡ç éªè¯è°ç¨
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetCheakBarCodeAndCP_Json")]
			[HttpGet]
			public object GetCheakBarCodeAndCP_Json(long HCusID, string HCP, string HBarCode)
			{
			try
			{
			HBarCode = HBarCode.Trim();
			if (oWebs.Get_CheakBarCodeAndCP(HCusID, HCP, HBarCode, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¢æ·ãä¼ ç¥¨ãæ¡ç éªè¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion


			#endregion

			@@ -1882,6 +2133,61 @@

			#endregion

			#region çäº§å¥åº æ ¡éªæ¨¡å¼

			/// <summary>
			/// çäº§å¥åºæ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveProductInBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveProductInBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getProductInBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1202";
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveProductInBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "çäº§å¥åºæ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion

			#region éè´å¥åº ä¸ä¼ çå
			@@ -1968,6 +2274,60 @@

			#endregion

			#region éè´å¥åº æ ¡éªæ¨¡å¼

			/// <summary>
			/// éè´å¥åºæ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SavePOStockInBill_BillCheck_Json")]
			[HttpPost]
			public object set_SavePOStockInBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_POStockInBillMain> lsmain = new List<Model.ClsKf_POStockInBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getPOStockInBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_POStockInBillMain websLsmain = new WebS.ClsKf_POStockInBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1201";
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SavePOStockInBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "éè´å¥åºæ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion

			@@ -2139,6 +2499,61 @@

			#endregion

			#region å¶ä»å¥åº æ ¡éªæ¨¡å¼

			/// <summary>
			/// å¶ä»å¥åºæ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveOtherInBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveOtherInBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getOtherInBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1203";
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveOtherInBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¶ä»å¥åºæ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion

			#region é¢æåºåº ä¸ä¼ çå
			@@ -2191,6 +2606,10 @@
			{
			websLsmain.HMainSourceBillType = "çäº§å¤æå";
			}
			else if (lsmain[0].HMainSourceBillType == "3710")
			{
			websLsmain.HMainSourceBillType = "çäº§è®¢å";
			}
			else
			{
			websLsmain.HMainSourceBillType = "æå·¥å½å¥";
			@@ -2199,6 +2618,11 @@
			websLsmain.HBillerID = lsmain[0].HBillerID;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
			websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;

			if(sSourceType== "3710")
			{
			sSourceType = "3720";
			}

			if (oWebs.set_SaveMateOutBill_New(websLsmain, sSourceType, ref DBUtility.ClsPub.sErrInfo))
			{
			@@ -2222,6 +2646,61 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "é¢æåºåºåä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region é¢æåºåº æ ¡éªæ¨¡å¼

			/// <summary>
			/// é¢æåºåºæ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveMateOutBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveMateOutBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_MateOutBillMain> lsmain = new List<Model.ClsKf_MateOutBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getMateOutBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_MateOutBillMain websLsmain = new WebS.ClsKf_MateOutBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1204";
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveMateOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "çäº§é¢ææ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -2590,6 +3069,61 @@

			#endregion

			#region å¶ä»åºåº æ ¡éªæ¨¡å¼

			/// <summary>
			/// å¶ä»åºåºæ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveOtherOutBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveOtherOutBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_OtherOutBillMain> lsmain = new List<Model.ClsKf_OtherOutBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getOtherOutBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_OtherOutBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1206";
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveOtherOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¶ä»åºåºæ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion

			#region çäº§è¡¥æ ä¸ä¼ çå
			@@ -2890,6 +3424,61 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç´æ¥è°æ¨åä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region ç´æ¥è°æ¨ æ ¡éªæ¨¡å¼

			/// <summary>
			/// ç´æ¥è°æ¨æ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveMoveStockBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveMoveStockBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			List<Model.ClsKf_MoveStockBillMain> lsmain = new List<Model.ClsKf_MoveStockBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getMoveStockBillMainByJson(msg1);

			WebAPI.WebS.ClsKf_MoveStockBillMain websLsmain = new WebS.ClsKf_MoveStockBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1207";
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveMoveStockBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç´æ¥è°æ¨æ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -3282,6 +3871,92 @@

			#endregion

			#region éå®éè´§ ä¸ä¼ çå

			#region éå®éè´§ æ°å¢æ¨¡å¼

			/// <summary>
			/// éå®éè´§æ°å¢ä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveSellOutBackBill_Json")]
			[HttpPost]
			public object set_SaveSellOutBackBill_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			try
			{
			List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getICStockBillMainByJson(msg1);
			WebS.ClsKf_ICStockBillMain websLsmain = new WebS.ClsKf_ICStockBillMain();
			string sSourceType = lsmain[0].HMainSourceBillType;
			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = lsmain[0].HBillType;
			websLsmain.HDate = lsmain[0].HDate;
			websLsmain.HDeptID = lsmain[0].HDeptID;
			websLsmain.HWHID = lsmain[0].HWHID;
			websLsmain.HSCWHID = lsmain[0].HSCWHID;
			websLsmain.HSupID = lsmain[0].HSupID;
			websLsmain.HKeeperID = lsmain[0].HKeeperID;
			websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
			websLsmain.HEmpID = lsmain[0].HEmpID;
			websLsmain.HManagerID = lsmain[0].HManagerID;
			websLsmain.HRemark = lsmain[0].HRemark;
			websLsmain.HExplanation = lsmain[0].HExplanation;
			websLsmain.HInnerBillNo = lsmain[0].HInnerBillNo;
			websLsmain.HRedBlueFlag = lsmain[0].HRedBlueFlag;
			websLsmain.HBillSubType = lsmain[0].HBillSubType;
			if (lsmain[0].HMainSourceBillType == "1403")
			{
			websLsmain.HMainSourceBillType = "éè´§éç¥å";
			}
			else if (lsmain[0].HMainSourceBillType == "1401")
			{
			websLsmain.HMainSourceBillType = "éå®è®¢å";
			}
			else
			{
			websLsmain.HMainSourceBillType = "æå·¥å½å¥";
			}
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HBillerID = lsmain[0].HBillerID;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
			websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveSellOutBackBill_New(websLsmain, sSourceType, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "éå®éè´§åä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion

			#region çäº§ç»æå ä¸ä¼ çå

			/// <summary>
			@@ -3387,6 +4062,8 @@
			BillNew.omodel.HWorkerID = mainList[0].HWorkerID;
			BillNew.omodel.HWorkerBarCode = mainList[0].HWorkerBarCode;
			BillNew.omodel.HGroupID = mainList[0].HGroupID;
			BillNew.omodel.HProcID = mainList[0].HProcID;
			BillNew.omodel.HProcNo = mainList[0].HProcNo;
			BillNew.omodel.HMainSourceBillType = mainList[0].HMainSourceBillType;
			if (mainList[0].HMainSourceBillType == "3772")
			{
			@@ -3694,31 +4371,55 @@
			[HttpGet]
			public object get_SourceBarCode_MateOut_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Double HPTQty, Int64 HPlanMode, Int64 HFIFOWhID, Int64 HStockOrgID)
			{
			try
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			{
			WebSoBar = oWebs.get_SourceBarCode_MateOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HPTQty, HPlanMode, HFIFOWhID, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N") //ç³»ç»åæ°æ¯å¦ä¸ºç§æäºæ¨¡å¼,Nä¸ºå¬æäºæ¨¡å¼ï¼Yä¸ºç§æäºæ¨¡å¼
			{
			if(HSourceBillType == "1214")
			{
			//éæ°åæ¥çäº§åæéç¥å
			Kf_MateOutRequestBillController obill = new Kf_MateOutRequestBillController();
			objJsonResult = obill.GetKf_MateOutRequestBill_Sync_Json(HSourceBillNo, HSourceBillType);
			}
			}

			try
			{
			WebSoBar = oWebs.get_SourceBarCode_MateOut(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HPTQty, HPlanMode, HFIFOWhID, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.Message = "æ«ææºåæ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}

			}
			catch (Exception e)
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææºåæ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -4104,6 +4805,48 @@

			#endregion

			#region éå®éè´§ æ«ææºåæ¡ç

			/// <summary>
			/// éå®éè´§ æ«ææºåæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_SourceBarCode_SellOutBack_Json")]
			[HttpGet]
			public object Get_SourceBarCode_SellOutBack_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			WebSoBar = oWebs.get_SourceBarCode_SellOutBack(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææºåæ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion


			@@ -4126,6 +4869,20 @@
			{
			sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo, HMaker);
			SourceFlag = true;
			}
			else if(oSystemParameter.omodel.WMS_CampanyName == "æ£®æ¥·" && HSourceBillType == "1241")
			{
			//èªå¨åè£çº¿åæ¥éè¶çäº§å¥åºç³è¯·å
			sJXCode = Kf_OtherInBill_SK(sBarCode, HCustom1);
			//åæ¥è¿ç¨ä¸åçå¼å¸¸ï¼ç´æ¥è¿åæ¥éä¿¡æ¯
			if (sJXCode.Contains("åçå¼å¸¸"))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = sJXCode;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			@@ -4178,9 +4935,9 @@
			/// ç©ææ¡ç ææ¬æ¡ è°æ¨æ«ç è°ç¨ 20240222
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_BarCode_MoveStock_Json")]
			[Route("WEBSController/get_BarCode_MoveStock_New_Json")]
			[HttpGet]
			public Object get_BarCode_MoveStock_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle, string HCustom1, string HCustom2)
			public Object get_BarCode_MoveStock_New_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle, string HCustom1, string HCustom2)
			{
			string sErrMsg = "";
			string sJXCode = "";
			@@ -4469,7 +5226,15 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			objJsonResult.data = new
			{
			Materlist = ds.Tables[0], //è¿åç©ææç»åè¡¨ä¿¡æ¯ï¼0ï¼
			Mouldlist = ds.Tables[1], //è¿åæ¨¡æ²»å·åè¡¨ä¿¡æ¯ï¼1ï¼
			FIFOlist = ds.Tables[2], //è¿ååè¿ååºåè¡¨ä¿¡æ¯ï¼2ï¼
			BarCodelist = ds.Tables[3], //è¿åæ¡ç æç»åè¡¨ä¿¡æ¯ï¼3ï¼
			ICMOReportlist = ds.Tables[4], //è¿åæºåçäº§æ±æ¥åæ¡ç æç»åè¡¨ä¿¡æ¯ï¼4ï¼
			BarCodeDetailslist = ds.Tables[5] //è¿åå½åææ«ææ¡ç æç»ä¿¡æ¯ï¼5ï¼
			};
			return objJsonResult;
			}
			else
			@@ -4650,6 +5415,48 @@

			#endregion

			#region æ«æåæ®æ¡ç å·²åå¨æ«ç è®°å½ä¸åæ®åçåæ´åä¸¤è¾¹æ°æ®ä¸ä¸è´æ¶ï¼æ¸ç©ºåæ«ç æ°æ® 20241216

			/// <summary>
			/// å·²åå¨æ«ç è®°å½ä¸åæ®åçåæ´åä¸¤è¾¹æ°æ®ä¸ä¸è´æ¶ï¼æ¸ç©ºåæ«ç æ°æ®
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_ClearBarCode_BillCheck_Json")]
			[HttpGet]
			public object get_ClearBarCode_BillCheck_Json(Int64 HInterID, string HBillType, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_ClearBarCode_BillCheck " + HInterID.ToString() + ",'" + HBillType + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_ClearBarCode_BillCheck");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¸ç©ºåæ«ç æ°æ®åçéè¯¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¸ç©ºåæ«ç æ°æ®å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ«æç©ææ¡ç åºå¥åºæ¨¡å

			/// <summary>
			@@ -4663,14 +5470,102 @@
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			string sJXCode = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")

			#region ç³»ç»åæ°è·å
			//éè´å¥åºå
			if (HBillType == "1201")
			{
			//éå®åºåºå
			sSourceBarCodeCtl = "Y";
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§å¥åºå
			if (HBillType == "1202")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»å¥åºå
			if (HBillType == "1203")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//éå®åºåºå
			else if (HBillType == "1205")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»åºåºå
			else if (HBillType == "1206")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤é¢æå
			else if (HBillType == "1211")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§è¡¥æå
			else if (HBillType == "1254")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤è¡¥æå
			else if (HBillType == "1255")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			#endregion

			if (oSystemParameter.omodel.WMS_CampanyName == "å®ç") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			@@ -4746,6 +5641,71 @@

			#endregion

			#region è¿ååæ®åè¡¨ä¿¡æ¯ 20241114

			/// <summary>
			/// è¿ååæ®åè¡¨ä¿¡æ¯ æ ¡éªæ¨¡å¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_New_Json")]
			[HttpGet]
			public object GetKf_PonderationBillMain_Temp_BillCheck_New_Json(long HInterID, string HBillType, string sWhere, string HSourceBarCodeCtl)
			{
			try
			{
			//ååæ®ä¸ºæ«ç çæï¼å¯¹åæ«æçæ¡ç è¿è¡æ ¸å¯¹
			if (HSourceBarCodeCtl == "Y")
			{
			ds = oCn.RunProcReturn("exec h_p_KF_PonderationBillMain_TempList_Verify " + HInterID.ToString() + ",'" + HBillType + "','" + sWhere + "'", "h_p_KF_PonderationBillMain_TempList_Verify");
			}
			//ååæ®éæ«ç çæ
			else
			{
			ds = oCn.RunProcReturn("exec h_p_KF_PonderationBillMain_TempList_BillCheck " + HInterID.ToString() + ",'" + HBillType + "','" + sWhere + "'", "h_p_KF_PonderationBillMain_TempList_BillCheck");
			}

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = new
			{
			Materlist = ds.Tables[0], //è¿åç©ææç»åè¡¨ä¿¡æ¯ï¼0ï¼
			BarCodeDetailslist = ds.Tables[1], //è¿åå½åææ«ææ¡ç æç»ä¿¡æ¯ï¼5ï¼
			};
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region è¿ååæ®åè¡¨ä¿¡æ¯

			/// <summary>
			@@ -4792,6 +5752,50 @@
			objJsonResult.Message = "è·ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ ¡éªæ«ç æ¨¡åï¼å é¤éä¸è¡æ¡ç åºå¥åºä¸´æ¶è¡¨è®°å½ 20241114

			/// <summary>
			/// æ«ç æ¨¡åï¼å é¤éä¸è¡æ¡ç åºå¥åºä¸´æ¶è¡¨è®°å½
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json")]
			[HttpGet]
			public object set_DeleteBarCodeByEntryID_BillCheck_New_Json(long HInterID, string HBillType, long HSourceInterID, long HSourceEntryID, string HSourceBarCodeCtl)
			{
			//ååæ®ä¸ºæ«ç çæï¼å¯¹åæ«æçæ¡ç è¿è¡æ ¸å¯¹
			if (HSourceBarCodeCtl == "Y")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ ¡éªæ¡ç ï¼æ éå é¤ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//ååæ®éæ«ç çæ
			else
			{
			try
			{
			oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "' and HSourceInterID=" + HSourceInterID.ToString() + " and HSourceEntryID=" + HSourceEntryID.ToString() + " and HQty<>0 ", ref DBUtility.ClsPub.sExeReturnInfo);
			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;
			}
			}
			}

			@@ -4861,7 +5865,7 @@

			#endregion

			#region ç¼åæ¨¡å è¿åç¼ååè¡¨ä¿¡æ¯
			#region æ ¡éªç¼åæ¨¡å è¿åç¼ååè¡¨ä¿¡æ¯

			/// <summary>
			/// è¿åç¼ååè¡¨ä¿¡æ¯ æ ¡éªæ¨¡å¼
			@@ -4905,6 +5909,186 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç¼ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ ¡éªç¼åæ¨¡å æ ¹æ®åæ®ID,å é¤ä¸´æ¶è¡¨è®°å½ 20241216

			/// <summary>
			/// æ ¹æ®åæ®ID,å é¤ä¸´æ¶è¡¨è®°å½
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/DeleteTempBillList_BillCheck_Json")]
			[HttpGet]
			public object DeleteTempBillList_BillCheck_Json(long HInterID, string HBillNo, string HBillType, string HMaker, string MvarReportTitle, Int64 HStockOrgID)
			{
			string WorkList = "å é¤æ ¡éªç¼ååæ®ï¼åæ®å·ï¼" + HBillNo;
			string SystemName = "WMS-" + MvarReportTitle + "æ¨¡å";
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼

			#region ç³»ç»åæ°è·å
			//éè´å¥åºå
			if (HBillType == "1201")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§å¥åºå
			if (HBillType == "1202")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»å¥åºå
			if (HBillType == "1203")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//éå®åºåºå
			else if (HBillType == "1205")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»åºåºå
			else if (HBillType == "1206")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤é¢æå
			else if (HBillType == "1211")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§è¡¥æå
			else if (HBillType == "1254")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤è¡¥æå
			else if (HBillType == "1255")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			#endregion

			//ååæ®ä¸ºæ«ç çæï¼å¯¹åæ«æçæ¡ç è¿è¡æ ¸å¯¹ï¼å é¤æ¡ç åºå¥åºæ ¡éªç¼åè®°å½
			if (sSourceBarCodeCtl == "Y")
			{
			try
			{
			oCn.BeginTran();
			oCn.RunProc("Delete from KF_PonderationBillMain_Temp_Verify where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			//åå¥æ¥å¿
			oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			"(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','å é¤')"
			);
			oCn.Commit();
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åæ®å·ï¼" + HBillNo + " å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤æéåæ®æ¡ç åºå¥åºä¸´æ¶è¡¨è®°å½å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//ååæ®éæ«ç çæï¼å é¤æ¡ç åºå¥åºç¼ååè¡¨è®°å½
			else
			{
			try
			{
			oCn.BeginTran();
			oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "' and HSubBillType=1", ref DBUtility.ClsPub.sExeReturnInfo);
			//åå¥æ¥å¿
			oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			"(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','å é¤')"
			);
			oCn.Commit();
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åæ®å·ï¼" + HBillNo + " å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤æéåæ®æ¡ç åºå¥åºä¸´æ¶è¡¨è®°å½å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -4974,6 +6158,227 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ ¡éªç¼åæ¨¡å å·²ä¸ä¼ æ¥è¯¢çé¢å·æ° 20241216

			/// <summary>
			/// å·²ä¸ä¼ æ¥è¯¢çé¢ï¼æ ¹æ®åæ®ç±»åãåæ®å·ãç¨æ·æ¥è¯¢å·²ä¸ä¼ åæ®ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetKf_ICStockBillQueryList_User_BillCheck_Json")]
			[HttpGet]
			public object GetKf_ICStockBillQueryList_User_BillCheck_Json(string HBillType, string HBillNo, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillQueryByUserList_BillCheck '" + HBillType + "','" + HBillNo + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_Kf_ICStockBillQueryByUserList_BillCheck");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢ä¸å°è¯¥åæ®è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·ååæ®ä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åå·²ä¸ä¼ åæ®ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ ¡éªç¼åæ¨¡å å·²ä¸ä¼ åè¡¨çé¢ï¼æ¤éåè½ï¼å é¤WMSè¡¨è®°å½ï¼å¹¶æ´æ°TEMPè¡¨ä¸çä¸ä¼ åæ®µ HRelationInterID=0 20241216

			/// <summary>
			/// å·²ä¸ä¼ åè¡¨çé¢ï¼æ¤éåè½ï¼å é¤WMSè¡¨è®°å½ï¼å¹¶æ´æ°TEMPè¡¨ä¸çä¸ä¼ åæ®µ HRelationInterID=0
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_DeleteICStockBillAndWMS_BillCheck_Json")]
			[HttpGet]
			public object set_DeleteICStockBillAndWMS_BillCheck_Json(Int64 HInterID, string HBillNo, string HBillType, string HMaker, string MvarReportTitle, Int64 HStockOrgID)
			{
			string WorkList = "æ¤éæ ¡éªå·²ä¸ä¼ åæ®ï¼åæ®å·ï¼" + HBillNo;
			string SystemName = "WMS-" + MvarReportTitle + "æ¨¡å";
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode; //åºåæ§å¶-WMSåºåæ§å¶ERPæ¨¡å¼ (WISEãCLOUDãMES)
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼

			#region ç³»ç»åæ°è·å
			//éè´å¥åºå
			if (HBillType == "1201")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§å¥åºå
			if (HBillType == "1202")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»å¥åºå
			if (HBillType == "1203")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//éå®åºåºå
			else if (HBillType == "1205")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»åºåºå
			else if (HBillType == "1206")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤é¢æå
			else if (HBillType == "1211")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§è¡¥æå
			else if (HBillType == "1254")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤è¡¥æå
			else if (HBillType == "1255")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			#endregion

			try
			{
			oCn.BeginTran();
			ds = oCn.RunProcReturn("exec h_p_WMS_ICStockBillAndWMS_Delete_BillCheck " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + sSourceBarCodeCtl + "','" + sERPMode + "'", "h_p_WMS_ICStockBillAndWMS_Delete_BillCheck");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤éåæ®å·²ä¸ä¼ è®°å½å¤±è´¥ï¼æ¤éåæ®å¤æéè¯¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0; //å¤±è´¥ï¼
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			//åå¥æ¥å¿
			oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			"(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','æ¤é')"
			);
			oCn.Commit();
			objJsonResult.code = "0";
			objJsonResult.count = 1; //æåï¼
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤éåæ®å·²ä¸ä¼ è®°å½å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			@@ -5969,6 +7374,55 @@

			#endregion

			#region ä¸æé²éåæ«ç æ¨¡å æµæ°´å·åè½¦è°ç¨æ¹æ³
			/// <summary>
			/// æµæ°´å·åè½¦è¿åä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_ProcNo_MaterToSource_Json")]
			[HttpGet]
			public object get_ProcNo_MaterToSource_Json(Int64 HInterID, string HBillNo, string HBillType, string HProcExchBillNo, Int64 HProcNo, string HMaker)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddProcNo_MaterToSource " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HProcExchBillNo + "'," + HProcNo.ToString() + ",'" + HMaker + "'", "h_p_WMS_AddProcNo_MaterToSource");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æµæ°´å·åè½¦è¿åä¿¡æ¯å¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æµæ°´å·åè½¦è¿åä¿¡æ¯è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region ä¸æé²éåæ«ç æ¨¡å æ«æç©ææ¡ç è°ç¨æ¹æ³
			/// <summary>
			/// æ«æç©ææ¡ç
			@@ -6053,26 +7507,7 @@
			HSupIDs = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}

			string HSourceInterIDs = "0";
			string HSourceEntryIDs = "0";
			string HSourceBillNos = "0";
			string HUnitIDs = "0";
			//æ¥è¯¢éè´è®¢å
			ds = oCn.RunProcReturn(@"select a.HInterID,b.HEntryID,a.HBillNo,b.HUnitID from Cg_POOrderBillMain a
			inner join Cg_POOrderBillSub b on a.HInterID = b.HInterID where HBillNo='" + str[3] + "' and b.HMaterID=" + HMaterIDs, "Cg_POOrderBillMain");
			if (ds.Tables[0].Rows.Count == 0)
			{
			//sErrMsg = "æ¡ç è§£æå¤±è´¥,è¯·ç¡®è®¤æ¡ç éè´è®¢åæ¯å¦æ£ç¡®!";
			//return null;
			}
			else
			{
			HSourceInterIDs = ds.Tables[0].Rows[0]["HInterID"].ToString();
			HSourceEntryIDs = ds.Tables[0].Rows[0]["HEntryID"].ToString();
			HSourceBillNos = ds.Tables[0].Rows[0]["HBillNo"].ToString();
			HUnitIDs = ds.Tables[0].Rows[0]["HUnitID"].ToString();
			}

			string HInnerBillNos = "";
			//æ¥è¯¢åé¨éè´è®¢åå·
			ds = oCn.RunProcReturn(@" select * from h_v_IF_POInStockList where éè´è®¢åå·= '" + str[3] + "' ", "h_v_IF_POInStockList");
			@@ -6085,7 +7520,27 @@
			else
			{
			HInnerBillNos = ds.Tables[0].Rows[0]["åé¨éè´è®¢åå·"].ToString();
			HSourceBillNos = ds.Tables[0].Rows[0]["éè´è®¢åå·"].ToString();
			}

			string HSourceInterIDs = "0";
			string HSourceEntryIDs = "0";
			string HUnitIDs = "0";
			//æ¥è¯¢éè´è®¢å
			ds = oCn.RunProcReturn(@"select a.HInterID,b.HEntryID,a.HBillNo,b.HUnitID from Cg_POOrderBillMain a
			inner join Cg_POOrderBillSub b on a.HInterID = b.HInterID where HBillNo='" + HSourceBillNos + "' and b.HMaterID=" + HMaterIDs, "Cg_POOrderBillMain");
			if (ds.Tables[0].Rows.Count == 0)
			{
			//sErrMsg = "æ¡ç è§£æå¤±è´¥,è¯·ç¡®è®¤æ¡ç éè´è®¢åæ¯å¦æ£ç¡®!";
			//return null;
			}
			else
			{
			HSourceInterIDs = ds.Tables[0].Rows[0]["HInterID"].ToString();
			HSourceEntryIDs = ds.Tables[0].Rows[0]["HEntryID"].ToString();
			HUnitIDs = ds.Tables[0].Rows[0]["HUnitID"].ToString();
			}

			double HQty = double.Parse(str[6]);

			//æ¥æè·åæ¹å¼
			@@ -6405,6 +7860,269 @@
			}

			#endregion

			#endregion

			#endregion


			#region ä¸ç¹ç§åæ«ç è®°å½åæ¨¡åè°ç¨æ¹æ³ 20240723

			#region ä¸ç¹ç§åæ«ç è®°å½åæ«ç æ¨¡å æ«æå®¢æ·æ¡ç è°ç¨æ¹æ³
			/// <summary>
			/// æ«æå®¢æ·æ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_CusBarCode_CusBarCodeCheck_Json")]
			[HttpGet]
			public object Get_CusBarCode_CusBarCodeCheck_Json(string HCusBarCode_Y, string HCusBarCode_N)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_CheckCusBarCode_CusBarCodeCheck '" + HCusBarCode_Y + "','" + HCusBarCode_N + "'", "h_p_WMS_CheckCusBarCode_CusBarCodeCheck");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æå®¢æ·æ¡ç å¤æéè¯¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æå®¢æ·æ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region ä¸ç¹ç§åæ«ç è®°å½åæ«ç æ¨¡å æ«æç©ææ¡ç è°ç¨æ¹æ³
			/// <summary>
			/// æ«æç©ææ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_BarCode_CusBarCodeCheck_Json")]
			[HttpGet]
			public object Get_BarCode_CusBarCodeCheck_Json(string HBarCode, string HCusBarCode_Y, string HCusBarCode_N, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_CusBarCodeCheck " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode + "','" + HCusBarCode_Y + "','" + HCusBarCode_N + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_CusBarCodeCheck");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æç©ææ¡ç ï¼åå¥ä¸´æ¶è¡¨å¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æç©ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region ä¸ç¹ç§åæ«ç è®°å½åæ«ç æ¨¡å è·åæ«ç æ¨¡ååè¡¨ä¿¡æ¯è°ç¨æ¹æ³
			/// <summary>
			/// è·åæ«ç æ¨¡ååè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetCusBarCodeCheckBillTmpList_Json")]
			[HttpGet]
			public object GetCusBarCodeCheckBillTmpList_Json(Int64 HInterID, string HBillNo, string HBillType)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_CusBarCodeCheckBillTmpList " + HInterID.ToString() + ",'" + HBillType + "'", "h_p_WMS_CusBarCodeCheckBillTmpList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region ä¸ç¹ç§åæ«ç è®°å½åæ«ç æ¨¡å å é¤åè½æé®è°ç¨ å é¤éä¸è¡ä¸´æ¶è¡¨è®°å½

			/// <summary>
			/// å é¤éä¸è¡ä¸´æ¶è¡¨è®°å½
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_DelCusBarCodeCheckBill_temp_Json")]
			[HttpGet]
			public object set_DelCusBarCodeCheckBill_temp_Json(Int64 HInterID, string HBillType, Int64 HItemID)
			{
			try
			{
			oCn.RunProc("Delete from WMS_CusBarCodeCheckBill_temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + " and HItemID=" + HItemID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
			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

			#region ä¸ç¹ç§åæ«ç è®°å½å ä¸ä¼ çå

			/// <summary>
			/// ä¸ç¹ç§åæ«ç è®°å½åæ°å¢ä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveCusBarCodeCheckBill_Json")]
			[HttpPost]
			public object set_SaveCusBarCodeCheckBill_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			try
			{
			string sMainStr = "[" + msg1.ToString() + "]";
			List<Model.ClsWMS_CusBarCodeCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWMS_CusBarCodeCheckBillMain>>(sMainStr);
			Model.ClsWMS_CusBarCodeCheckBillMain omodel = new Model.ClsWMS_CusBarCodeCheckBillMain();
			omodel.HInterID = mainList[0].HInterID;
			omodel.HBillNo = mainList[0].HBillNo;
			omodel.HBillType = mainList[0].HBillType;
			omodel.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString());
			omodel.HRemark = mainList[0].HRemark;
			omodel.HMaker = mainList[0].HMaker;
			omodel.HSTOCKORGID = mainList[0].HSTOCKORGID;
			omodel.HDeptID = mainList[0].HDeptID;

			//å¤æä¼è®¡ææ¯å¦åç
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Today, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			omodel.HYear = sYear;
			omodel.HPeriod = sPeriod;
			}

			oCn.BeginTran();
			//çæä¸ç¹ç§åæ«ç è®°å½å
			//æå¥åè¡¨
			oCn.RunProc("EXEC h_p_WMS_CusBarCodeCheckBillSub_Insert " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'");
			//æå¥ä¸»è¡¨
			oCn.RunProc("Insert Into WMS_CusBarCodeCheckBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
			",HDeptID,HStockOrgID" +
			") " +
			" values('" + omodel.HBillType + "','" + omodel.HBillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
			", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
			", " + omodel.HDeptID.ToString() + "," + omodel.HSTOCKORGID.ToString() +
			") ");

			oCn.Commit();
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "çæä¸ç¹ç§åæ«ç è®°å½åæåï¼åæ®å·ä¸ºï¼" + omodel.HBillNo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¸ç¹ç§åæ«ç è®°å½åä¸ä¼ å¤±è´¥ï¼" + e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			@@ -7307,9 +9025,241 @@
			}
			}
			#endregion

			#region éå®åºåºè¿½æº¯è®°å½æ¥è¡¨
			/// <summary>
			/// è·åéå®åºåºè¿½æº¯è®°å½
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetKf_SellOutBarTraceReport_Json")]
			[HttpGet]
			public object GetKf_SellOutBarTraceReport_Json(DateTime HBeginDate, DateTime HEndDate, string HBarCode, Int64 HStockOrgID, string HWhere)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_Kf_SellOutBarTraceReport '" + HBeginDate.ToShortDateString() + "','" + HEndDate.ToShortDateString() + "','" + HBarCode + "'," + HStockOrgID.ToString() + ",'" + HWhere + "'", "h_p_Kf_SellOutBarTraceReport");

			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢éå®åºåºè¿½æº¯è®°å½ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region ä»åºåºå¥åºæ¥è¡¨


			#region è·ååæ®ç±»åä¿¡æ¯
			/// <summary>
			/// è·ååæ®ç±»åä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetICStockBill_BillType_Json")]
			[HttpGet]
			public object GetICStockBill_BillType_Json()
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_KF_StockInOutReport_BillType ", "h_p_KF_StockInOutReport_BillType");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååæ®ç±»åä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region ä»åºåºå¥åºæç»æ¥è¡¨
			/// <summary>
			/// ä»åºåºå¥åºæç»æ¥è¡¨
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetKF_StockInOutEntryReport_Json")]
			[HttpGet]
			public object GetKF_StockInOutEntryReport_Json(string sWhere)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_KF_StockInOutEntryReport " + sWhere, "h_p_KF_StockInOutEntryReport");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½åæè¾å¥è¿æ»¤æ¡ä»¶ï¼æ²¡æè¿åä»»ä½ç»æï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢ä»åºåºå¥åºæç»æ¥è¡¨å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region ä»åºåºå¥åºè®°å½æ¥è¡¨
			/// <summary>
			/// ä»åºåºå¥åºè®°å½æ¥è¡¨
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetKF_StockInOutRecordReport_Json")]
			[HttpGet]
			public object GetKF_StockInOutRecordReport_Json(string sWhere)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_KF_StockInOutRecordReport " + sWhere, "h_p_KF_StockInOutRecordReport");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å½åæè¾å¥è¿æ»¤æ¡ä»¶ï¼æ²¡æè¿åä»»ä½ç»æï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢ä»åºåºå¥åºè®°å½ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#endregion


			#endregion

			#region å®¢æ·æ¡ç æ«æè®°å½å
			#region å®¢æ·æ¡ç æ«æè®°å½å å¤æåæ®å·æ¯å¦ä¸ºç¼ååè¡¨ä¸çåæ®å·ï¼æ¯ åæåå¹¶è¿åæ°æ®ï¼å¦ åå¤æå¤±è´¥ã
			[Route("WEBSController/Gy_getCusBarCodeBill_judgeHBillNoIsInTempList")]
			[HttpGet]
			public object Gy_getCusBarCodeBill_judgeHBillNoIsInTempList(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			//å¤æä¿®æ¹åçåæ®å·ï¼ä¸ååç ï¼æ¯å¦åå¨å¯¹åºå·²ç»ä¸ä¼ çåæ®ä¿¡æ¯
			string sql = "select * from Gy_getCusBarCodeBillMain " +
			"where HInterID = " + HInterID + " " +
			"and HBillNo = '" + HBillNo + "' " +
			"and HBillType = '" + HBillType + "' " +
			"and HMaker = '" + HMaker + "' " +
			"and HOrgID = " + HStockOrgID;
			DataSet ds = oCn.RunProcReturn(sql, "Gy_getCusBarCodeBillMain");
			if(ds!=null && ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿®æ¹å¤±è´¥ï¼åå ï¼ä¿®æ¹åæ®å·ä¸åç å¯¹åºçåæ®å·²ç»æäº¤ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//å¤æä¿®æ¹åçåæ®å·ï¼ä¸ååç ï¼æ¯å¦åå¨å¯¹åºå·²ç»ä¸ä¼ çåæ®ä¿¡æ¯
			string sql1 = "select top(1)* from Gy_getCusBarCodeBill_Temp " +
			"where HBillNo = '" + HBillNo + "' " +
			"and HBillType = '" + HBillType + "' " +
			"and HMaker = '" + HMaker + "' " +
			"and HOrgID = " + HStockOrgID;
			DataSet ds1 = oCn.RunProcReturn(sql1, "Gy_getCusBarCodeBill_Temp");
			if (ds1 != null && ds1.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = ds1.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿®æ¹å¤±è´¥ï¼åå ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region å®¢æ·æ¡ç æ«æè®°å½å æ«ææ¡ç
			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æææ¡ç
			@@ -7923,12 +9873,12 @@

			if (sWhere == null \|\| sWhere == "")
			{
			sql = "select top(1000)* from h_v_Gy_getCusBarCodeBillList_Query order by å¶åæ¥æ desc";
			sql = "select * from h_v_Gy_getCusBarCodeBillList_Query order by å¶åæ¥æ desc";
			ds = oCn.RunProcReturn(sql, "h_v_Gy_getCusBarCodeBillList_Query");
			}
			else
			{
			sql = "select top(1000)* from h_v_Gy_getCusBarCodeBillList_Query where 1=1 " + sWhere + " order by å¶åæ¥æ desc";
			sql = "select * from h_v_Gy_getCusBarCodeBillList_Query where 1=1 " + sWhere + " order by å¶åæ¥æ desc";
			ds = oCn.RunProcReturn(sql, "h_v_Gy_getCusBarCodeBillList_Query");
			}

			@@ -7968,6 +9918,795 @@
			}
			}
			#endregion

			#region å®¢æ·æ¡ç æ«æè®°å½å ç»´æ¤åè¡¨-æ¡ç åè¡¨

			/// <summary>
			/// è¿åç»æåè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Gy_getCusBarCodeBill_rushedBarCodeList_CodeList")]
			[HttpGet]
			public object Gy_getCusBarCodeBill_rushedBarCodeList_CodeList(long HInterID, string HBillNo, string HBillType, long HOrgID)
			{
			try
			{
			string sql = "select * from Gy_getCusBarCodeBill_Temp where HBillNo = '" + HBillNo + "' and HBillType = '" + HBillType + "' and HOrgID = " + HOrgID + " Order by HDate desc";
			ds = oCn.RunProcReturn(sql, "Gy_getCusBarCodeBill_Temp");
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion
			#endregion

			#region æ«ç éªè¯å
			#region æ«ç éªè¯å æ«ç ç©ææ¡ç
			[Route("WEBSController/Gy_BarCodeConfirmBill_rushBarCode")]
			[HttpGet]
			public object Gy_BarCodeConfirmBill_rushBarCode(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID, string HBarCode)
			{
			DataSet ds;
			try
			{
			string sql = "exec h_p_Gy_BarCodeConfirmBill_rushBarCode " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + HMaker + "'," + HStockOrgID + ",'" + HBarCode + "'";
			ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_rushBarCode");
			if(ds==null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼åå ï¼æ«ç æ¡ç éè¯¯ï¼è¯·å¯»æ¾ITäººåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼åå ï¼" + ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}

			objJsonResult.code = "1";
			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

			#region æ«ç éªè¯å è¿åæ«ææ¡ç åè¡¨ä¿¡æ¯
			[Route("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList")]
			[HttpGet]
			public object Gy_BarCodeConfirmBill_rushedBarCodeList(long HInterID, string HBillNo, string HBillType, long HOrgID)
			{
			try
			{
			string sql = "select * from h_v_Gy_BarCodeConfirmBillTempList_singleBill " +
			"where HInterID = " + HInterID + " and åæ®å· = '" + HBillNo + "' and HBillType = '" + HBillType + "' and HOrgID = " + HOrgID + " Order by æ«ç æ¶é´ desc";
			ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillTempList_singleBill");
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ«ç éªè¯å è¿åè¡¥æ«æ¸ååè¡¨
			[Route("WEBSController/Gy_BarCodeConfirmBill_getSuppRushList")]
			[HttpGet]
			public object Gy_BarCodeConfirmBill_getSuppRushList(long HInterID, string HBillNo, string HBillType, long HOrgID)
			{
			try
			{
			string sql = "exec h_p_Gy_BarCodeConfirmBill_getSuppRushList " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HOrgID;
			ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_getSuppRushList");
			if (ds == null \|\| ds.Tables.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ«ç éªè¯å å é¤æ«ç è®°å½

			/// <summary>
			/// å é¤æç»è¡¨ä½éä¸è¡è®°å½
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Gy_BarCodeConfirmBill_DeleteRushedBarCodeList")]
			[HttpGet]
			public object Gy_BarCodeConfirmBill_DeleteRushedBarCodeList(Int64 HInterID, string HBillNo, string HBillType, string HBarCode, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			string sql = "delete from Gy_BarCodeConfirmBillTempList " +
			"where HInterID = " + HInterID + "" +
			" and HBillNo = '" + HBillNo + "'" +
			" and HBillType = '" + HBillType + "'" +
			" and HStockOrgID = " + HStockOrgID + "" +
			" and HBarCode = '" + HBarCode + "'";
			oCn.RunProc(sql);

			objJsonResult.code = "1";
			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

			#region æ«ç éªè¯å è¿åç¼ååè¡¨ä¿¡æ¯
			[Route("WEBSController/Gy_BarCodeConfirmBill_TempList")]
			[HttpGet]
			public object Gy_BarCodeConfirmBill_TempList(string HBillType, string HMaker, long HStockOrgID)
			{
			DataSet ds;
			try
			{
			string sql = "exec h_p_Gy_BarCodeConfirmBill_TempList '" + HBillType + "','" + HMaker + "'," + HStockOrgID;
			ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_TempList");
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®ç¼åè®°å½æ¥è¯¢å¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åç¼åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç¼ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ«ç éªè¯å å é¤ç¼åè®°å½

			/// <summary>
			/// å é¤æç»è¡¨ä½éä¸è¡è®°å½
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Gy_BarCodeConfirmBill_DeleteTempListNote")]
			[HttpGet]
			public object Gy_BarCodeConfirmBill_DeleteTempListNote(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
			{
			DataSet ds;
			try
			{
			//å é¤åæ§å¶============================================================================================================================
			string sql_beforeDeleteTempListNote = "exec h_p_Gy_BarCodeConfirmBill_beforeDeleteTempListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
			ds = oCn.RunProcReturn(sql_beforeDeleteTempListNote, "h_p_Gy_BarCodeConfirmBill_beforeDeleteTempListNote");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥ï¼åå ï¼å é¤åæ§å¶å¤±è´¥ï¼è¯·å¯»æ¾ç½ç»ç®¡çäººå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥ï¼åå ï¼" + ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			//=============================================================================================================================================

			//å¼å¯äºå¡
			oCn.BeginTran();

			string sql = "delete from Gy_BarCodeConfirmBillTempList where " +
			" HInterID = " + HInterID + "" +
			" and HBillNo = '" + HBillNo + "'" +
			" and HBillType = '" + HBillType + "'" +
			" and HStockOrgID = " + HStockOrgID + "";
			oCn.RunProc(sql);

			//å é¤åæ§å¶============================================================================================================================
			string sql_afterDeleteTempListNote = "exec h_p_Gy_BarCodeConfirmBill_afterDeleteTempListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
			ds = oCn.RunProcReturn(sql_afterDeleteTempListNote, "h_p_Gy_BarCodeConfirmBill_afterDeleteTempListNote");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥ï¼åå ï¼å é¤åæ§å¶å¤±è´¥ï¼è¯·å¯»æ¾ç½ç»ç®¡çäººå";
			objJsonResult.data = null;

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

			oCn.RollBack();
			return objJsonResult;
			}
			//=============================================================================================================================================

			oCn.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æåï¼"; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCn.RollBack();

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region æ«ç éªè¯å ç»´æ¤åè¡¨

			/// <summary>
			/// è¿åç»æç¼ååè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Gy_BarCodeConfirmBillList")]
			[HttpGet]
			public object Gy_BarCodeConfirmBillList(string sWhere, string user)
			{
			DataSet ds;
			try
			{
			string sql = "";

			if (sWhere == null \|\| sWhere == "")
			{
			sql = "select * from h_v_Gy_BarCodeConfirmBillList_Query order by æ¥æ desc";
			ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillList_Query");
			}
			else
			{
			sql = "select * from h_v_Gy_BarCodeConfirmBillList_Query where 1=1 " + sWhere + " order by æ¥æ desc";
			ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillList_Query");
			}

			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢å¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "æ¥è¯¢æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region æ«ç éªè¯å ç»´æ¤åè¡¨-æ¡ç åè¡¨-æ«ç åè¡¨

			/// <summary>
			/// è¿åç»æåè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList_CodeList")]
			[HttpGet]
			public object Gy_BarCodeConfirmBill_rushedBarCodeList_CodeList(long HSourceInterID, string HSourceEntryID, string HSourceBillType, long HOrgID)
			{
			try
			{
			string sql = "select * from Gy_BarCodeConfirmBillTempList where HSourceInterID = " + HSourceInterID + " and HSourceEntryID = " + HSourceEntryID + " and HSourceBillType = '" + HSourceBillType + "' and HStockOrgID = " + HOrgID + " Order by HMakeDate desc";
			ds = oCn.RunProcReturn(sql, "Gy_BarCodeConfirmBillTempList");
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ«ç éªè¯å ç»´æ¤åè¡¨-æ¡ç åè¡¨-æªæ«ç åè¡¨

			/// <summary>
			/// è¿åç»æåè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList_waitCodeList")]
			[HttpGet]
			public object Gy_BarCodeConfirmBill_rushedBarCodeList_waitCodeList(long HSourceInterID, string HSourceEntryID, string HSourceBillType, long HOrgID)
			{
			try
			{
			string sql = "exec h_p_Gy_BarCodeConfirmBill_waitRushBarCodeList " + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillType + "'," + HOrgID;
			ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_waitRushBarCodeList");
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			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 = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion
			#endregion


			#region æ£®æ¥·å¶ä»å¥åºæ«ç
			public string Kf_OtherInBill_SK(string sBarCode,string HCustom1)
			{
			string HReturnResult;
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

			try
			{
			DataSet ds;
			string sql = "select HBarCode,HSourceInterID,HSourceEntryID,HSourceBillNo from Gy_BarCodeBill with(nolock) where HBarCode = '" + sBarCode + "'";
			string HDataBaseName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");//è·åéè¶æ°æ®åºåç§°
			string HSourceBillNo_TB = "";
			Int64 HSourceInterID = 0;

			ds = oCn.RunProcReturn(sql, "Gy_BarCodeBill");
			//å¤ææ¡ç ä¿¡æ¯æ¯å¦å¨æ¡ç æ¡£æ¡ä¸
			if (ds == null \|\| ds.Tables[0].Rows.Count < 1)
			{
			LogService.Write("å¶ä»å¥åºï¼æ¡ç æ¡£æ¡ä¸ä¸åå¨æ¤æ¡ç ç¼å·ï¼" + sBarCode);

			return "åçå¼å¸¸ï¼æ¡ç æ¡£æ¡ä¸ä¸åå¨æ¤æ¡ç ç¼å·ï¼" + sBarCode;
			}
			else
			{
			//è·åå¥åºç³è¯·ååå·/ä¸»ID
			HSourceBillNo_TB = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillNo"]);
			HSourceInterID = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[0]["HSourceInterID"]);
			//æ ¹æ®å¥åºç³è¯·ååå·å¤æåæ®ä¿¡æ¯æ¯å¦å·²ç»åæ¥å°éè¶
			sql = string.Format(@"select FID,FBILLNO from {0}..TFKO_t_Cust100009 with(nolock) where FBILLNO = '" + HSourceBillNo_TB + "'", HDataBaseName);

			ds = oCn.RunProcReturn(sql, "TFKO_t_Cust100009");
			//å¥åºç³è¯·åæ²¡æåæ¥å°éè¶åè¿è¡åæ¥
			if (ds == null \|\| ds.Tables[0].Rows.Count < 1)
			{
			sql = "exec h_p_Kf_StockInRequestBillToErp '" + HSourceInterID + "','" + HSourceBillNo_TB + "'";

			LogService.Write("å¶ä»å¥åºè·åæºåä¿¡æ¯ï¼" + sql);

			ds = oCn.RunProcReturn(sql, "h_p_Kf_StockInRequestBillToErp");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			LogService.Write("åçå¼å¸¸ï¼webapiå¥åºç³è¯·ååæ¥ï¼è·åä¿¡æ¯å¤±è´¥ï¼" + sBarCode + "," + HSourceBillNo_TB + "," + HSourceInterID);
			return "åçå¼å¸¸ï¼webapiå¥åºç³è¯·ååæ¥ï¼è·åä¿¡æ¯å¤±è´¥";
			}
			else
			{
			JObject model = new JObject();
			if (HCustom1 == "1")
			{
			//çäº§è¿ä¿®ç³è¯·
			model.Add("FBillTypeID", new JObject() { ["FNumber"] = "SCRKSQ004" }); //åæ®ç±»å
			}
			else {
			//æ åçäº§å¥åºç³è¯·å
			model.Add("FBillTypeID", new JObject() { ["FNumber"] = "SCRUSQD" }); //åæ®ç±»å
			}

			//model.Add("FBillType", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FBillType"]) }); //åæ®ç±»å
			model.Add("FDate", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ¥æ"])); //åæ®æ¥æ
			model.Add("FStockOrgId", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["åºåç»ç»ä»£ç "]) }); //åºåç»ç»ä»£ç ???
			model.Add("FBillNo", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["åæ®å·"])); //åæ®å·
			model.Add("FStockDirect", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["åºåæ¹å"])); //åºåæ¹å
			model.Add("FDEPTID", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["é¨é¨ä»£ç "]) }); //çäº§è½¦é´
			model.Add("F_paez_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["å¥åºç å"])); //å¥åºç å
			model.Add("F_paez_Integer2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çåæ°"])); //çåæ°
			model.Add("F_paez_Integer1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çç®¡åªæ°"])); //çç®¡åªæ°
			model.Add("F_paez_Integer3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["å®é¿"])); //å®é¿ ???
			//model.Add("F_paez_BaseProperty4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çé"])); //çé
			model.Add("F_paez_Base", new JObject() { ["FSTAFFNUMBER"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["å·¥å·"]) }); //å·¥å· ???å¿å¡« FSTAFFNUMBER
			model.Add("F_paez_Combo", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çæ¬¡ä»£ç "])); //çæ¬¡ ???å¿å¡«
			//model.Add("F_paez_BaseProperty1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ¹å·"])); //æ¹å·
			model.Add("F_paez_Integer", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç®±æ°"])); //ç®±æ° ???
			model.Add("F_paez_Decimal2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ»é"])); //æ»é
			//model.Add("F_paez_BaseProperty2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æåç¼ç "])); //æåç¼ç
			//model.Add("F_paez_BaseProperty5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["åå"])); //åå
			model.Add("F_paez_Base1", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çº¿å·"]) }); //çº¿å· ???å¿å¡«

			//model.Add("F_paez_BaseProperty", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æºå°"])); //æºå°
			model.Add("F_paez_Decimal", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç®±é"])); //ç®±é
			//model.Add("F_WJUK_Text", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ¥æº"])); //æ¥æº
			model.Add("FDEPTID1", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["é¨é¨ä»£ç "]) });//é¨é¨
			//model.Add("F_paez_BaseProperty6", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ»å"])); //æ»å
			//model.Add("F_paez_BaseProperty7", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç®¡è²"])); //ç®¡è²
			model.Add("F_paez_Assistant", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ççº§"]) });//ççº§ ???å¿å¡«
			model.Add("F_paez_Text11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æå°ç®±å·"])); //æå°ç®±å·
			//model.Add("F_paez_Text3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ææ¬"])); //ææ¬
			model.Add("F_paez_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æå¤§ç®±å·"])); //æå¤§ç®±å·
			//model.Add("F_paez_PrintTimes", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æå°æ¬¡æ°"])); //æå°æ¬¡æ°
			//model.Add("F_paez_Text5", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["çº¿å·"])); //æ¡ç æå°
			//model.Add("F_paez_BaseProperty10", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["é¨é¨ä»£ç "]) }); //çäº§é¨é¨
			model.Add("F_paez_Combo1", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ¯å¦åå¤è´¸"])); //æ¯å¦åå¤è´¸
			model.Add("F_paez_Combo2", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["äº§åç±»å"])); //äº§åç±»å
			model.Add("F_paez_Combo3", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["æ»¡çç¶æ"])); //æ»¡çç¶æ
			//model.Add("F_paez_BaseProperty11", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["è§æ ¼åå·"])); //è§æ ¼åå·
			//model.Add("F_paez_BaseProperty12", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç½å«"])); //ç½å«
			//model.Add("F_TFKO_Text4", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç®±å·åç¼"])); //ç®±å·åç¼
			model.Add("F_paez_WB", new JObject() { ["FNumber"] = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["ç½å«"]) }); //ç½å«1 ???

			JArray Fentity = new JArray();
			foreach (DataRow item in ds.Tables[0].Rows)
			{
			JObject FentityModel = new JObject();
			FentityModel.Add("FMATERIALID", new JObject() { ["FNumber"] = item["ç©æä»£ç "].ToString() }); // ç©æä»£ç
			FentityModel.Add("FUnitID", new JObject() { ["FNumber"] = item["è®¡éåä½ä»£ç "].ToString() }); // åä½ä»£ç ???
			FentityModel.Add("FQty", item["åé"].ToString()); //åé
			FentityModel.Add("FBASEUNITID", new JObject() { ["FNumber"] = item["åºæ¬è®¡éåä½ä»£ç "].ToString() }); // åºæ¬åä½ä»£ç
			FentityModel.Add("FBASEQTY", item["å®æ¶æ°é"].ToString()); //å®æ¶æ°é
			FentityModel.Add("FSecUNITID", new JObject() { ["FNumber"] = item["åºåè¾è®¡éåä½ä»£ç "].ToString() }); // åºåè¾åä½
			FentityModel.Add("FSecQTY", item["åºåè¾åä½å®æ¶æ°é"].ToString()); //å®æ¶æ°éï¼åºåè¾åä½ï¼
			FentityModel.Add("FOWNERTYPEID", item["è´§ä¸»ç±»å"].ToString()); //è´§ä¸»ç±»å ???æ°å¼
			FentityModel.Add("FOWNERID", new JObject() { ["FNumber"] = item["è´§ä¸»ä»£ç "].ToString() }); // è´§ä¸»ä»£ç
			FentityModel.Add("FKEEPERTYPEID", item["ä¿ç®¡èç±»å"].ToString()); //ä¿ç®¡èç±»å ???æ°å¼
			FentityModel.Add("FKEEPERID", new JObject() { ["FNumber"] = item["ä¿ç®¡èä»£ç "].ToString() }); // ä¿ç®¡èä»£ç
			FentityModel.Add("FAuxPropId", new JObject() { ["FAUXPROPID__FF100003"] = new JObject() { ["FNumber"] = item["è¾å©å±æ§ä»£ç "].ToString() } }); // è¾å©å±æ§
			FentityModel.Add("FExtAuxUnitId", new JObject() { ["FNumber"] = item["è¾è®¡éåä½ä»£ç "].ToString() }); // è¾åä½
			FentityModel.Add("FExtAuxUnitQty", item["æç»ç®±æ°"].ToString()); //ç®±æ°
			FentityModel.Add("F_TFKO_Assistant", new JObject() { ["FNumber"] = item["ç½å«ä»£ç "].ToString() }); // ç½å« ???å¿å¡«
			FentityModel.Add("F_TFKO_Assistant1", new JObject() { ["FNumber"] = item["ååä»£ç "].ToString() }); // åå
			FentityModel.Add("F_TFKO_Assistant2", new JObject() { ["FNumber"] = item["è²æ³½ä»£ç "].ToString() }); // è²æ³½ ???å¿å¡«
			FentityModel.Add("F_TFKO_Assistant3", new JObject() { ["FNumber"] = item["çº¤åº¦ä»£ç "].ToString() }); // çº¤åº¦
			FentityModel.Add("F_paez_Qty", item["æ¯é"].ToString()); //æ¯é ???ä¸è½å°äºçäº0
			FentityModel.Add("F_TFKO_Text1", item["ç®¡è²"].ToString()); //ç®¡è²
			FentityModel.Add("F_TFKO_Text2", item["æ»å"].ToString()); //æ»å
			FentityModel.Add("FBoxcode", item["ç®±å·"].ToString()); //ç®±å·
			FentityModel.Add("F_PAEZ_SQSL", item["ç³è¯·åæ°é"].ToString()); //ç³è¯·åæ°é
			FentityModel.Add("F_paez_Integer4", item["çåæ°"].ToString()); //çåæ°
			FentityModel.Add("F_paez_BaseQty", item["å®åæ°é"].ToString()); //å®åæ°é
			FentityModel.Add("F_paez_Qty1", item["å®æ¶æ°é"].ToString()); //å®æ¶æ°é
			FentityModel.Add("F_paez_Text2", item["ç®±å·"].ToString()); //ç®±å· ???ä¸è½ä¸ºæ°å
			FentityModel.Add("FLOT", new JObject() { ["FNumber"] = item["æ¹å·"].ToString() }); // è¾è®¡éåä½ä»£ç


			//JArray Fentity2 = new JArray();
			//JObject FentityModel2 = new JObject();
			//FentityModel2.Add("FEntity_Link_FFlowId", item["FEntity_Link_FFlowId"].ToString());
			//FentityModel2.Add("FEntity_Link_FFlowLineId", item["FEntity_Link_FFlowLineId"].ToString());
			//FentityModel2.Add("FEntity_Link_FRuleId", item["FEntity_Link_FRuleId"].ToString());
			//FentityModel2.Add("FEntity_Link_FSTableName", item["FEntity_Link_FSTableName"].ToString());
			//FentityModel2.Add("FEntity_Link_FSBillId", item["FEntity_Link_FSBillId"].ToString());
			//FentityModel2.Add("FEntity_Link_FSId", item["FEntity_Link_FSId"].ToString());
			//Fentity2.Add(FentityModel2);
			//FentityModel.Add("FEntity_Link", Fentity2);
			//FentityModel.Add("FBFLowId", new JObject() { ["FID"] = item["FBFLOWID"].ToString() });
			Fentity.Add(FentityModel);
			}
			model.Add("FEntity", Fentity); //æç»ä¿¡æ¯
			JObject jsonRoot = new JObject()
			{
			["Creator"] = "",
			["NeedUpDateFields"] = new JArray(),
			["NeedReturnFields"] = new JArray(),
			//["IsDeleteEntry"] = "true",
			//["SubSystemId"] = "",
			//["IsVerifyBaseDataField"] = "false",
			["IsDeleteEntry"] = "true",
			["SubSystemId"] = "",
			["IsVerifyBaseDataField"] = "true",
			["IsEntryBatchFill"] = "false",
			["ValidateFlag"] = "true",
			["NumberSearch"] = "true",
			["IsAutoAdjustField"] = "false",
			["InterationFlags"] = "",
			["IgnoreInterationFlag"] = "",
			//["IsAutoSubmitAndAudit"] = true,//èªå¨è°ç¨æäº¤åå®¡æ ¸åè½
			["Model"] = model
			};

			//ä»éç½®æä»¶è·å CLOUDç½åãè´¦å¥ä¿¡æ¯ãç»å½ç¨æ·ãç»å½å¯ç
			if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
			{
			LogService.Write("åçå¼å¸¸ï¼å¥åºç³è¯·ååæ¥è·åç»å½è´¦å·å¯ç å¤±è´¥ï¼ï¼" + sBarCode + "," + HSourceBillNo_TB + "," + HSourceInterID);
			return "åçå¼å¸¸ï¼å¥åºç³è¯·ååæ¥è·åç»å½è´¦å·å¯ç å¤±è´¥ï¼";
			}
			LogService.Write("å¶ä»å¥åº,å³å°ç»å½éè¶");
			var loginRet = InvokeHelper.Login();
			LogService.Write("å¶ä»å¥åº,ç»å½éè¶ç»æ1ï¼" + loginRet);
			LogService.Write("å¶ä»å¥åº,ç»å½éè¶ç»æ2ï¼" + JObject.Parse(loginRet)["LoginResultType"].Value<int>());

			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess == 0)
			{
			LogService.Write("å¶ä»å¥åº,ç»å½éè¶å¤±è´¥ï¼" + sBarCode + "," + HSourceBillNo_TB + "," + HSourceInterID);
			return "åçå¼å¸¸ï¼ç»å½éè¶å¤±è´¥ï¼";
			}
			else
			{
			string result = InvokeHelper.Save("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(jsonRoot));//ä¿å

			if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			LogService.Write("å¥åºç³è¯·ååæ¥éè¶äºå¤±è´¥ï¼" + JsonConvert.SerializeObject(jsonRoot));
			return "åçå¼å¸¸ï¼å¥åºç³è¯·ååæ¥éè¶äºå¤±è´¥ï¼åå·:" + HSourceBillNo_TB + result + jsonRoot;
			}
			LogService.Write("å¥åºç³è¯·ååæ¥éè¶äºæåï¼" + JsonConvert.SerializeObject(jsonRoot));
			//æäº¤å®¡æ ¸
			string result1 = string.Empty;
			string result2 = string.Empty;
			var fID = JObject.Parse(result)["Result"]["Id"].ToString();
			var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
			var json = new
			{
			Ids = fID,
			};

			string sErrMsg = "";
			string sJXCode = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			{
			if (oSystemParameter.omodel.Kf_StockInRequestBill_AutoCheck == "Y") //ç³»ç»åæ° èªå¨å®¡æ ¸
			{
			result1 = InvokeHelper.Submit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//æäº¤
			result2 = InvokeHelper.Audit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//å®¡æ ¸

			if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			LogService.Write("å¥åºç³è¯·ååå·:" + ",æäº¤å¤±è´¥" + result1);
			return "åçå¼å¸¸ï¼å¥åºç³è¯·ååå·:" + ",æäº¤å¤±è´¥" + result1;
			}

			if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			LogService.Write("å¥åºç³è¯·ååå·:" + ",å®¡æ ¸å¤±è´¥" + result2);
			return "åçå¼å¸¸ï¼å¥åºç³è¯·ååå·:" + ",å®¡æ ¸å¤±è´¥" + result2;
			}
			}
			}
			}
			}

			//æ´æ°æ¡ç æºåidä¿¡æ¯
			sql = string.Format($@"update a set HSourceInterID = isnull(b.FID,0),HSourceEntryID = isnull(c.FEntryID,0) from Gy_BarCodeBill a left join AIS20220609121235..TFKO_t_Cust100009 b on a.HSourceBillNo = b.FBillNo left join AIS20220609121235..TFKO_t_Cust_Entry100065 c on b.FID = C.FID and a.HBarcodeNo = c.FSEQ where HSourceBillNo = '{HSourceBillNo_TB}'");
			//æ§è¡æ´æ°è¯å¥
			oCn.RunProc(sql);

			}
			}

			HReturnResult = sBarCode;
			}
			catch (Exception ex)
			{
			LogService.Write(sBarCode + ",ç¨åºåçå¼å¸¸ï¼" + ex.Message + ";" + ex.StackTrace);
			HReturnResult = "åçå¼å¸¸ï¼" + ex.Message + ";" + ex.StackTrace;
			}
			return HReturnResult;
			}
			#endregion
			}
			}