MES-WEB-API.git

			@@ -16,9 +16,11 @@
			using WebAPI;
			using WebAPI.Models;
			using WebAPI.Service;
			using WebAPI.Utility;

			namespace WebAPI.Controllers
			{

			public class WEBSController : ApiController
			{
			public DBUtility.ClsPub.Enum_BillStatus BillStatus;
			@@ -31,10 +33,8 @@
			public WebS.WebService1 oWebs = new WebS.WebService1();
			public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
			DBUtility.ClsXt_BaseBill oBaseBill = new DBUtility.ClsXt_BaseBill();
			string ComputerName = SystemInformation.ComputerName; //è®¾å¤åç§°


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


			#region å¬ç¨æ¹æ³
			@@ -47,6 +47,7 @@
			/// <returns></returns>
			[Route("WEBSController/GetUser_Json")]
			[HttpGet]
			[AllowAnonymous]
			public object GetUser_Json(string HUserNumber, string HPassWord, Int64 HStockOrgID, string HStockOrgName)
			{
			try
			@@ -73,7 +74,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds2.Tables[0].Rows[0]["HBack"])==1)
			else if (DBUtility.ClsPub.isLong(ds2.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -92,11 +93,23 @@
			return objJsonResult;
			}

			if(!oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç»å½å¼å¸¸ï¼Token çæå¼å¸¸ï¼æ æ³è·åå¬å¸ä¿¡æ¯ï¼";
			}

			string tokenStr = JWTHelper.GenerateToken(ds.Tables[0].Rows[0]["Czybm"].ToString(), ds.Tables[0].Rows[0]["Czymc"].ToString());


			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ç»å½æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			JObject jobjJsonResult = JObject.FromObject(objJsonResult);
			jobjJsonResult["token"] = tokenStr;
			return jobjJsonResult;
			}
			}
			catch (Exception e)
			@@ -112,6 +125,8 @@
			#endregion

			#region ç¨æ·æ¨¡åæéå¤æ

			#region ç¨æ·æ¨¡åæéå¤æ å¤æéè¶è´¦å·æ¯å¦æ£ç¡®

			/// <summary>
			/// è¿å¥æ¨¡åæ¶è¿è¡ç¨æ·æéå¤æ
			@@ -185,6 +200,48 @@
			return objJsonResult;
			}
			}

			#endregion

			#region ç¨æ·æ¨¡åæéå¤æ

			/// <summary>
			/// è¿å¥æ¨¡åæ¶è¿è¡ç¨æ·æéå¤æ
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/CheckModRight_ERP_Json")]
			[HttpGet]
			public object CheckModRight_ERP_Json(string ModRightName, string HUserName)
			{
			try
			{
			//å¤ææé
			if (!DBUtility.ClsPub.Security_Log(ModRightName, 3, false, HUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¨æ²¡æå¯¹åºæ¨¡åæé,è¯·ä¸ç®¡çåèç³»ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			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

			#endregion

			@@ -382,12 +439,50 @@
			{
			Int64 HWhID = 0;
			HWhID = DBUtility.ClsPub.isLong(HBarCode.Replace("HWH", ""));
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HSPFlag from Gy_Warehouse with(nolock) where HStopflag=0 and HItemID=" + HWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "Gy_Warehouse");
			ds = oCn.RunProcReturn("exec h_p_Gy_Warehouse_PDA " + HWhID.ToString() + "," + HStockOrgID.ToString(), "h_p_Gy_Warehouse_PDA");
			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>
			/// è·åPDAä»åºåè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetWarehouseList_Json")]
			[HttpGet]
			public object GetWarehouseList_Json(string Warehouse, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_Gy_WarehouseList_PDA '" + Warehouse + "'," + HStockOrgID.ToString(), "h_p_Gy_WarehouseList_PDA");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½ä»åºè®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -424,42 +519,22 @@
			{
			try
			{
			Int64 sHSPID = 0;
			Int64 sHWhID = 0;
			if (HBarCode.Contains(";"))
			//æ¡ç æ ¼å¼='HSP'+ä»åºåç +';'+ä»ä½åç
			if (HBarCode.Contains("HSP") && HBarCode.Contains(";"))
			{
			string[] sArray = HBarCode.Replace("HSP", "").Split(';');
			sHSPID = DBUtility.ClsPub.isLong(sArray[1]);
			sHWhID = DBUtility.ClsPub.isLong(sArray[0]);
			}
			Int64 sHSPID = 0;
			Int64 sHWhID = 0;
			if (HBarCode.Contains(";"))
			{
			string[] sArray = HBarCode.Replace("HSP", "").Split(';');
			sHSPID = DBUtility.ClsPub.isLong(sArray[1]);
			sHWhID = DBUtility.ClsPub.isLong(sArray[0]);
			}

			if(HWhID==0)
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			if (HWhID == 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;
			}
			}
			else
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + HWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			DataSet ds2 = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds2 == null \|\| ds2.Tables[0].Rows.Count == 0)
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -472,9 +547,53 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds2.Tables[0];
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			else
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + HWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			DataSet ds2 = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds2 == null \|\| ds2.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 = ds2.Tables[0];
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			}
			else
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HBarCode='" + HBarCode + "' and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼è¯·ç¡®è®¤ææ«ä»ä½æ¡ç æ¯å¦å±äºè¯¥ç»ç»ï¼ä¸ä¸ºéç¦ç¨ç¶æï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			@@ -509,7 +628,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";
			@@ -637,6 +756,44 @@
			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/GetDepartmentList_Json")]
			[HttpGet]
			public object GetDepartmentList_Json(string Department, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName from Gy_Department with(nolock) where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + Department + "%' or HName like '%" + Department + "%')", "Gy_Department");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½é¨é¨è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -953,11 +1110,18 @@
			/// <returns></returns>
			[Route("WEBSController/GetEquipList_Json")]
			[HttpGet]
			public object GetEquipList_Json(string Equip)
			public object GetEquipList_Json(string Equip, int HCenterID)
			{
			try
			{
			ds = oCn.RunProcReturn("select HInterID,HEquipFileNumber,HName,HSourceID,HSourceName from h_v_Gy_EquipFileBill where HEquipFileNumber like '%" + Equip + "%' or HName like '%" + Equip + "%'", "h_v_Gy_EquipFileBill");
			if (HCenterID != 0)
			{
			ds = oCn.RunProcReturn("select HInterID,HEquipFileNumber,HName,HSourceID,HSourceName,HCenterID from h_v_Gy_EquipFileBill where HCenterID='" + HCenterID + "' and ( HEquipFileNumber like '%" + Equip + "%' or HName like '%" + Equip + "%')", "h_v_Gy_EquipFileBill");
			}
			else
			{
			ds = oCn.RunProcReturn("select HInterID,HEquipFileNumber,HName,HSourceID,HSourceName from h_v_Gy_EquipFileBill where HEquipFileNumber like '%" + Equip + "%' or HName like '%" + Equip + "%'", "h_v_Gy_EquipFileBill");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -968,7 +1132,7 @@
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			@@ -987,10 +1151,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 ç´æ¥è°æ¨ è·åè°æ¨åºè´§ç±»å

			@@ -1118,6 +1448,100 @@

			#endregion

			#region æ«ç æ¨¡å æ«ææºå è¿è¡æ§å¶å¤æ
			/// <summary>
			/// æºååè¡¨ä¿¡æ¯ï¼æ ¹æ®åæ®ç±»åãæºåç±»åãç»ç»IDè¿åæºååè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetSourceBillList_Control")]
			[HttpGet]
			public object GetSourceBillList_Control(string HBillType, string HSourceBillType, Int64 HStockOrgID, string HSourceBillNo, string HMater, string HCustom)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_GetSourceBillList_Control '" + HBillType + "','" + HSourceBillType + "'," + HStockOrgID.ToString() + ",'" + HSourceBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetSourceBillList_Control");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¤ææºåå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			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 æ«ç æ¨¡å è¿åæºååè¡¨ä¿¡æ¯
			/// <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 æ«ç æ¨¡å æ ¹æ®æ¡ç å é¤ç¼ååè¡¨ä¸å¯¹åºæ¡ç è®°å½

			@@ -1131,6 +1555,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;
			@@ -1143,6 +1570,84 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤æ¡ç åºå¥åºç¼ååè¡¨æ¡ç è®°å½å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion


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

			/// <summary>
			/// æ ¹æ®æ¡ç æ´æ°æ¡ç åºå¥åºç¼åè¡¨æ°é
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_UpdatePonderationBillMain_Temp_BarCode_Json")]
			[HttpGet]
			public object set_UpdatePonderationBillMain_Temp_BarCode_Json(long HInterID, string HBillType, string HBarCode, double HQty, long HItemID)
			{
			try
			{
			//(HBarCode_Pack <> '' and HInterID = { HInterID.ToString() } and HBillType = '{HBillType}' and HBarCode_Pack = '{HBarCode}') or
			// (HBarCode <> '' and HInterID ={ HInterID.ToString()}
			//and HBillType = '{HBillType}' and HBarCode = '{HBarCode}')
			// æ ¹æ®ææ¡ç åæ®µåæ¡ç åæ®µ å¤æ æ´æ°çæ¡ç æ°éæ¯å¦å¤§äºæå¤§æ°éæå°äº0
			ds = oCn.RunProcReturn($@"select * from KF_PonderationBillMain_Temp where
			HItemID = {HItemID}
			", "KF_PonderationBillMain_Temp");

			if(ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			// ææ«æ¡ç ä¸åå¨
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ´æ°å¤±è´¥ï¼ææ«æ¡ç ä¸åå¨...";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if(HQty < 0)
			{
			// æ´æ°çæ¡ç æ°éå°äº0
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ´æ°å¤±è´¥ï¼æ´æ°æ°éå°äº0...";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//if(Double.Parse(ds.Tables[0].Rows[0]["HQtyMust"].ToString()) < HQty)
			//{
			//// æ´æ°çæ¡ç æ°éæ¯å¦å¤§äºæå¤§æ°é
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = $"æ´æ°å¤±è´¥ï¼æ¡ç æ°é{HQty}å¤§äºæå¤§å¯æ«æ°é{ds.Tables[0].Rows[0]["HQtyMust"].ToString()}...";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}

			//æ ¹æ®ææ¡ç åæ®µæ´æ°æ¬åæ¡ç åºå¥åºç¼åè¡¨æ°æ®
			//oCn.RunProc($"Update KF_PonderationBillMain_Temp set HQty = {HQty} where HBarCode_Pack<>'' and HInterID={HInterID.ToString()} and HBillType='{HBillType}' and HBarCode_Pack='{HBarCode}'", ref DBUtility.ClsPub.sExeReturnInfo);

			//æ ¹æ®æ¡ç åæ®µæ´æ°æ¬åæ¡ç åºå¥åºç¼åè¡¨æ°æ®
			//oCn.RunProc($"Update KF_PonderationBillMain_Temp set HQty = {HQty} where HBarCode<>'' and HInterID={HInterID.ToString()} and HBillType='{HBillType}' and HBarCode='{HBarCode}'", ref DBUtility.ClsPub.sExeReturnInfo);

			//æ ¹æ®æ¡ç èªå¢å æ´æ° æ¡ç åºå¥åºç¼åè¡¨æ°æ®
			oCn.RunProc($"exec h_p_KF_PonderationBillMain_Temp_Update {HInterID}, '{HBillType}', '{HBarCode}', {HQty}, {HItemID}", ref DBUtility.ClsPub.sExeReturnInfo);

			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.Message.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1195,22 +1700,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)
			{
			@@ -1238,7 +1733,129 @@
			{
			try
			{
			if (oWebs.set_DelPonderationBillMain_Temp_FIFO(HInterID, HBillType, ref DBUtility.ClsPub.sErrInfo))
			//æ´æ°åè¿ååºä¸´æ¶è¡¨ç¶æ
			oCn.RunProc("EXEC h_p_WMS_UPDateICInventory_FIFO_Tmp " + HInterID.ToString() + ",'" + HBillType + "'");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ´æ°åè¿ååºä¸´æ¶è¡¨HlineStatuså¼å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// åºåºæ«ç æ¨¡åï¼éåºæ¶æ´æ°åè¿ååºä¸´æ¶è¡¨ç¶æ HlineStatus 20250722
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_DelPonderationBillMain_Temp_FIFO_New_Json")]
			[HttpGet]
			public object set_DelPonderationBillMain_Temp_FIFO_New_Json(long HInterID, string HBillType, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode; //åºåæ§å¶-WMSåºåæ§å¶ERPæ¨¡å¼ (WISEãCLOUDãMES)
			string sFIFOCtl = "N"; //åè¿ååºæ§å¶ï¼'Y'ä¸ºæ§å¶ï¼

			//çäº§é¢æå-åè¿ååºæ§å¶
			if (HBillType == "1204" && (oSystemParameter.omodel.Kf_MateOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_MateOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//éå®åºåºå-åè¿ååºæ§å¶
			else if (HBillType == "1205" && (oSystemParameter.omodel.Kf_SellOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_SellOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//å¶ä»åºåºå-åè¿ååºæ§å¶
			else if (HBillType == "1206" && (oSystemParameter.omodel.Kf_OtherOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_OtherOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//å§å¤åºåºå-åè¿ååºæ§å¶
			else if (HBillType == "1211" && (oSystemParameter.omodel.Kf_EntrustOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_EntrustOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//ç´æ¥è°æ¨å-åè¿ååºæ§å¶
			else if (HBillType == "1207" && (oSystemParameter.omodel.Kf_MoveStockBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_MoveStockBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//åæ¥å¼è°åºå-åè¿ååºæ§å¶
			else if (HBillType == "1250" && (oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//çäº§è¡¥æå-åè¿ååºæ§å¶
			else if (HBillType == "1254" && (oSystemParameter.omodel.Kf_MateReplenishOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_MateReplenishOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//å§å¤è¡¥æå-åè¿ååºæ§å¶
			else if (HBillType == "1255" && (oSystemParameter.omodel.Kf_EntrustReplenishOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_EntrustReplenishOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}

			try
			{
			if (sFIFOCtl == "Y")
			{
			//æ´æ°åè¿ååºä¸´æ¶è¡¨ç¶æ
			oCn.RunProc("EXEC h_p_WMS_UPDateICInventory_FIFO_Tmp " + HInterID.ToString() + ",'" + HBillType + "'");
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ´æ°åè¿ååºä¸´æ¶è¡¨HlineStatuså¼å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#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;
			@@ -1259,13 +1876,14 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ´æ°åè¿ååºä¸´æ¶è¡¨HlineStatuså¼å¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "å®¢æ·ãä¼ ç¥¨ãæ¡ç éªè¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion


			#endregion

			@@ -1321,8 +1939,150 @@
			}
			}

			/// <summary>
			/// ç¼ååè¡¨çé¢ï¼è¿åç¼ååè¡¨ä¿¡æ¯ 20250513
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetKf_PonderationBillMain_TempList_Other_Json")]
			[HttpGet]
			public object GetKf_PonderationBillMain_TempList_Other_Json(string HBillType, string HMaker, Int64 HStockOrgID, string HSubBillType)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_Other '" + HBillType + "','" + HMaker + "'," + HStockOrgID.ToString() + ",'" + HSubBillType + "'", "h_p_KF_GetPonderationBillMain_TempList_Other");
			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_PonderationBillMain_TempList_New_Json_YPSellOut")]
			[HttpGet]
			public object GetKf_PonderationBillMain_TempList_New_Json_YPSellOut(string HBillType, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New_YPSellOut '" + HBillType + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New_YPSellOut");

			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 æ ·åéå®åºåºç¼ååè¡¨çé¢ï¼è¿åå·²ä¸ä¼ åè¡¨ä¿¡æ¯
			[Route("WEBSController/GetKf_ICStockBillList_Json_YPSellOut")]
			[HttpGet]
			public object GetKf_ICStockBillList_Json_YPSellOut(string HBillType, string HBillNo, string HSourceBillNo, string HMaker, Int64 HStockOrgID, string sWhere)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillQueryList_New_YPSellOut '" + HBillType + "','" + HBillNo + "','" + HSourceBillNo + "','" + HMaker + "'," + HStockOrgID.ToString() + ",'" + sWhere + "'", "h_p_Kf_ICStockBillQueryList_New_YPSellOut");
			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 ç¼ååè¡¨ ç¼è¾åè½è°ç¨

			@@ -1472,7 +2232,7 @@
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillQueryList_New '" + HBillType + "','" + HBillNo + "','" + HSourceBillNo + "','" + HMaker + "'," + HStockOrgID.ToString() + ",'" + sWhere+"'", "h_p_Kf_ICStockBillQueryList_New");
			ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillQueryList_New '" + HBillType + "','" + HBillNo + "','" + HSourceBillNo + "','" + HMaker + "'," + HStockOrgID.ToString() + ",'" + sWhere + "'", "h_p_Kf_ICStockBillQueryList_New");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -1522,50 +2282,73 @@
			[HttpGet]
			public object set_DeleteICStockBillAndWMS_Json(Int64 HInterID, string HBillNo, string HBillType, string HMaker, string MvarReportTitle)
			{
			try
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			{
			string WorkList = "æ¤éå·²ä¸ä¼ åæ®ï¼åæ®å·ï¼" + HBillNo;
			string SystemName = "WMS-" + MvarReportTitle + "æ¨¡å";
			oCn.BeginTran();
			ds = oCn.RunProcReturn("exec h_p_WMS_ICStockBillAndWMS_Delete " + HInterID + ",'" + HBillNo + "','" + HBillType + "'", "h_p_WMS_ICStockBillAndWMS_Delete");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			//æ¤éåå¤æéè¶äºä¸åæ®æ¯å¦åå¨
			if (!GetBillQuery_WMS(HInterID, HBillNo, HBillType, HMaker, oSystemParameter.omodel.WMS_CloudMode, oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode, 2, ref sErrMsg))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}

			try
			{
			oCn.BeginTran();
			ds = oCn.RunProcReturn("exec h_p_WMS_ICStockBillAndWMS_Delete " + HInterID + ",'" + HBillNo + "','" + HBillType + "'", "h_p_WMS_ICStockBillAndWMS_Delete");
			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
			{
			string WorkList = "æ¤éå·²ä¸ä¼ åæ®ï¼åæ®å·ï¼" + HBillNo;
			string SystemName = "WMS-" + MvarReportTitle + "æ¨¡å";
			//åå¥æ¥å¿
			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 = "æ¤éåæ®å·²ä¸ä¼ è®°å½å¤±è´¥ï¼æ¤éåæ®å¤æéè¯¯ï¼";
			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.Message = "æ¤éåæ®å·²ä¸ä¼ è®°å½å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			else
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤éåæ®å·²ä¸ä¼ è®°å½å¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1650,27 +2433,124 @@
			}

			/// <summary>
			/// å é¤ç¼ååè¡¨åæ®
			/// å é¤ç¼ååè¡¨åæ®ï¼å é¤æ¶å¤æåæ®æ¯å¦å¼å¸¸ï¼åå¥æ¥å¿ 20250722
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_DelPonderationBillMain_Temp_Json")]
			[HttpGet]
			public object set_DelPonderationBillMain_Temp_Json(long HInterID, string HBillType)
			public object set_DelPonderationBillMain_Temp_Json(long HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID, string MvarReportTitle)
			{
			try
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			string sERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode; //åºåæ§å¶-WMSåºåæ§å¶ERPæ¨¡å¼ (WISEãCLOUDãMES)
			string sFIFOCtl = "N"; //åè¿ååºæ§å¶ï¼'Y'ä¸ºæ§å¶ï¼

			//çäº§é¢æå-åè¿ååºæ§å¶
			if (HBillType == "1204" && (oSystemParameter.omodel.Kf_MateOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_MateOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//éå®åºåºå-åè¿ååºæ§å¶
			else if (HBillType == "1205" && (oSystemParameter.omodel.Kf_SellOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_SellOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//å¶ä»åºåºå-åè¿ååºæ§å¶
			else if (HBillType == "1206" && (oSystemParameter.omodel.Kf_OtherOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_OtherOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//å§å¤åºåºå-åè¿ååºæ§å¶
			else if (HBillType == "1211" && (oSystemParameter.omodel.Kf_EntrustOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_EntrustOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//ç´æ¥è°æ¨å-åè¿ååºæ§å¶
			else if (HBillType == "1207" && (oSystemParameter.omodel.Kf_MoveStockBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_MoveStockBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//åæ¥å¼è°åºå-åè¿ååºæ§å¶
			else if (HBillType == "1250" && (oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_MoveStockStepOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//çäº§è¡¥æå-åè¿ååºæ§å¶
			else if (HBillType == "1254" && (oSystemParameter.omodel.Kf_MateReplenishOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_MateReplenishOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}
			//å§å¤è¡¥æå-åè¿ååºæ§å¶
			else if (HBillType == "1255" && (oSystemParameter.omodel.Kf_EntrustReplenishOutBill_FIFOCtl.ToUpper() == "Y" \|\| oSystemParameter.omodel.Kf_EntrustReplenishOutBill_FIFOList.ToUpper() == "Y"))
			{
			sFIFOCtl = "Y";
			}

			//å é¤åå¤æéè¶äºä¸åæ®æ¯å¦åå¨
			if (!GetBillQuery_WMS(HInterID, HBillNo, HBillType, HMaker, oSystemParameter.omodel.WMS_CloudMode, sERPMode, 1, ref sErrMsg))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}

			try
			{
			oCn.BeginTran();
			ds = oCn.RunProcReturn("exec h_p_WMS_PonderationBillMain_Temp_Delete " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + sFIFOCtl + "','" + sERPMode + "'", "h_p_WMS_PonderationBillMain_Temp_Delete");
			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
			{
			string WorkList = "å é¤ç¼ååæ®ï¼åæ®å·ï¼" + HBillNo;
			string SystemName = "WMS-" + MvarReportTitle + "æ¨¡å";
			//åå¥æ¥å¿
			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;
			}
			}
			catch (Exception e)
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤æ¡ç åºå¥åºç¼ååè¡¨åæ®å¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1713,6 +2593,210 @@
			}
			}

			#endregion

			#region éè¶äºåæ®æ¥è¯¢
			public bool GetBillQuery_WMS(Int64 HInterID, string HBillNo, string HBillType, string HMaker, string sCloudMode, string sERPMode, Int64 sHType, ref string sErrMsg)
			{
			//sCloudModeï¼ç³»ç»åæ° æ¯å¦ä¸ºç§æäºæ¨¡å¼(Nä¸ºå¬æäºæ¨¡å¼ï¼Yä¸ºç§æäºæ¨¡å¼)ï¼
			//sERPModeï¼ç³»ç»åæ° åºåæ§å¶-WMSåºåæ§å¶ERPæ¨¡å¼ (WISEãCLOUDãMES)ï¼
			//sHTypeï¼å¼ 1 å¯¹åºç¼ååè¡¨å é¤ï¼å¼ 2 å¯¹åºå·²ä¸ä¼ æ¤éï¼

			//å¬æäºæ¨¡å¼
			if (sCloudMode == "N")
			{
			string sFormId = ""; //ä¸å¡å¯¹è±¡è¡¨åId

			//çäº§æ±æ¥å
			if (HBillType == "3711")
			{
			sFormId = "PRD_MORPT";
			}
			//éè´å¥åºåãå§å¤å¥åºå
			else if (HBillType == "1201" \|\| HBillType == "1210")
			{
			sFormId = "STK_InStock";
			}
			//çäº§å¥åºå
			else if (HBillType == "1202")
			{
			sFormId = "PRD_INSTOCK";
			}
			//å¶ä»å¥åºå
			else if (HBillType == "1203")
			{
			sFormId = "STK_MISCELLANEOUS";
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			sFormId = "PRD_PickMtrl";
			}
			//éå®åºåºå
			else if (HBillType == "1205")
			{
			sFormId = "SAL_OUTSTOCK";
			}
			//å¶ä»åºåºå
			else if (HBillType == "1206")
			{
			sFormId = "STK_MisDelivery";
			}
			//å§å¤åºåºå
			else if (HBillType == "1211")
			{
			sFormId = "SUB_PickMtrl";
			}
			//çäº§è¡¥æå
			else if (HBillType == "1254")
			{
			sFormId = "PRD_FeedMtrl";
			}
			//å§å¤è¡¥æå
			else if (HBillType == "1255")
			{
			sFormId = "SUB_FEEDMTRL";
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			{
			sFormId = "STK_TransferDirect";
			}
			//åæ¥å¼è°åºå
			else if (HBillType == "1250")
			{
			sFormId = "STK_TRANSFEROUT";
			}
			//åæ¥å¼è°å¥å
			else if (HBillType == "1251")
			{
			sFormId = "STK_TRANSFERIN";
			}
			//éè´éæåï¼éè´å¥åºåçº¢åï¼
			else if (HBillType == "1239")
			{
			sFormId = "PUR_MRB";
			}
			//çäº§éåºåï¼äº§åå¥åºåçº¢åï¼
			else if (HBillType == "1245")
			{
			sFormId = "PRD_RetStock";
			}
			//å¶ä»å¥åºåï¼çº¢åï¼
			else if (HBillType == "1248")
			{
			sFormId = "";
			}
			//å§å¤éåºåï¼å§å¤å¥åºåçº¢åï¼
			else if (HBillType == "1246")
			{
			sFormId = "";
			}
			//çäº§éæåï¼çäº§é¢æåçº¢åï¼
			else if (HBillType == "1244")
			{
			sFormId = "PRD_ReturnMtrl";
			}
			//éå®éè´§åï¼éå®åºåºåçº¢åï¼
			else if (HBillType == "1247")
			{
			sFormId = "SAL_RETURNSTOCK";
			}
			//å¶ä»åºåºåï¼çº¢åï¼
			else if (HBillType == "1249")
			{
			sFormId = "";
			}
			//å§å¤éæåï¼å§å¤åºåºåçº¢åï¼
			else if (HBillType == "1238")
			{
			sFormId = "SUB_RETURNMTRL";
			}

			//ç»å½éè¶
			var loginRet = InvokeHelper.Login();
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			//å¤ææ¯å¦ç»å½æå
			if (isSuccess < 0)
			{
			sErrMsg = "é»è®¤éè¶äºè´¦å·ç»å½å¤±è´¥ï¼";
			return false;
			}
			else
			{
			//åæ®æ¥è¯¢
			var sJson = new
			{
			FormId = sFormId,
			FieldKeys = "FBillNo",
			FilterString = $@"FBillNo='{HBillNo}'",
			OrderString = "",
			TopRowCount = 0,
			StartRow = 0,
			Limit = 0
			}; ;
			var _result = InvokeHelper.Query(sFormId, JsonConvert.SerializeObject(sJson));
			var _saveObj = JArray.Parse(_result);

			//å¤æè¿åçæ°ç»ä¸ææ æ°æ®ï¼æ æ°æ®ä»£è¡¨æ²¡æ¥è¯¢å°å¯¹åºåæ®
			if (_saveObj.Count == 0)
			{
			return true;
			}
			else
			{
			//sHType = 1å¯¹åºç¼ååè¡¨å é¤
			if (sHType == 1)
			{
			//å¤æè¿åçæ°ç»æ°æ®ä¸æ¯å¦åå¨"false"ï¼åå¨ä»£è¡¨éå¥çä¸å¡å¯¹è±¡è¡¨åIdä¸æ£ç¡®
			if (_saveObj[0][0].ToString().Contains("false") == true)
			{
			return true;
			}
			else
			{
			sErrMsg = "æ°æ®åå¨å¼å¸¸ï¼ä¸åè®¸å é¤ï¼åæ®å·ï¼" + HBillNo + " å¨éè¶äºä¸å·²çæåæ®ï¼è¯·åå¨éè¶äºéå é¤è¯¥åæ®ï¼å¹¶å¨ç¼ååè¡¨çå·²ä¸ä¼ çé¢æ¤éè¯¥åæ®ï¼åå¯¹è¯¥åæ®è¿è¡ç¼è¾æå é¤æä½ï¼";
			return false;
			}
			}
			//sHType = 2å¯¹åºå·²ä¸ä¼ æ¤é
			else
			{
			//å¤æè¿åçæ°ç»æ°æ®ä¸æ¯å¦åå¨"false"ï¼åå¨ä»£è¡¨éå¥çä¸å¡å¯¹è±¡è¡¨åIdä¸æ£ç¡®
			if (_saveObj[0][0].ToString().Contains("false") == true)
			{
			sErrMsg = "æ¤æ¨¡åæä¸æ¯ææ¤éåè½ï¼";
			return false;
			}
			else
			{
			sErrMsg = "æ¤éåæ®å¤±è´¥ï¼åæ®å·ï¼" + HBillNo + "ï¼éè¶äºéæªå é¤ï¼ä¸åè®¸æ¤éï¼";
			return false;
			}
			}
			}
			}
			}
			//ç§æäºæ¨¡å¼
			else
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_BillQuery " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + sERPMode + "'," + sHType.ToString(), "h_p_WMS_BillQuery");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			sErrMsg = "åæ®æ¥è¯¢åçéè¯¯ï¼";
			return false;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			return false;
			}
			else
			{
			return true;
			}
			}
			}
			#endregion

			#endregion
			@@ -1882,6 +2966,62 @@

			#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.HMaker = lsmain[0].HMaker;
			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 éè´å¥åº ä¸ä¼ çå
			@@ -1894,6 +3034,7 @@
			/// <returns></returns>
			[Route("WEBSController/set_SavePOStockInBill_Json")]
			[HttpPost]
			[Permission(HModName = "Kf_POStockInBill", Operate = "_Edit")]
			public object set_SavePOStockInBill_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			@@ -1968,6 +3109,61 @@

			#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.HMaker = lsmain[0].HMaker;
			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

			@@ -2097,7 +3293,7 @@
			websLsmain.HRedBlueFlag = lsmain[0].HRedBlueFlag;
			websLsmain.HStockStyle = lsmain[0].HStockStyle;
			websLsmain.HBillSubType = lsmain[0].HBillSubType;
			if(lsmain[0].HMainSourceBillType== "1241")
			if (lsmain[0].HMainSourceBillType == "1241")
			{
			websLsmain.HMainSourceBillType = "å¥åºç³è¯·å";
			}
			@@ -2132,6 +3328,62 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¶ä»å¥åºåä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#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.HMaker = lsmain[0].HMaker;
			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;
			}
			@@ -2191,6 +3443,14 @@
			{
			websLsmain.HMainSourceBillType = "çäº§å¤æå";
			}
			else if (lsmain[0].HMainSourceBillType == "3710")
			{
			websLsmain.HMainSourceBillType = "çäº§è®¢å";
			}
			else if (lsmain[0].HMainSourceBillType == "1256")
			{
			websLsmain.HMainSourceBillType = "çäº§é¢æç³è¯·å";
			}
			else
			{
			websLsmain.HMainSourceBillType = "æå·¥å½å¥";
			@@ -2199,6 +3459,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 +3487,62 @@
			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.HMaker = lsmain[0].HMaker;
			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;
			}
			@@ -2315,6 +3636,105 @@

			#endregion

			#region éå®åºåº æ°å¢æ¨¡å¼ï¼æ ·åéå®åºåºï¼

			/// <summary>
			/// éå®åºåºæ°å¢ä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveSellOutBill_Json_YP")]
			[HttpPost]
			public object set_SaveSellOutBill_Json_YP([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			try
			{
			List<Model.ClsKf_SellOutBillMain> lsmain = new List<Model.ClsKf_SellOutBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getSellOutBillMainByJson(msg1);
			WebS.ClsKf_SellOutBillMain websLsmain = new WebS.ClsKf_SellOutBillMain();
			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 == "1402")
			{
			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_SaveSellOutBill_New(websLsmain, sSourceType, ref DBUtility.ClsPub.sErrInfo))
			{
			oCn.BeginTran();
			try
			{
			string sql_reWriteTaxData = "exec h_p_Kf_SellOutBill_withOutSourceBill_ReWriteTax " + lsmain[0].HInterID + "," + lsmain[0].HIsTaxRate + "," + lsmain[0].HIsTaxRate_upper;
			oCn.RunProc(sql_reWriteTaxData);
			oCn.Commit();
			}
			catch (Exception e3)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "éå®åºåºåä¸ä¼ æåï¼ï¼ç¨çè®¡ç®å¤±è´¥ï¼ï¼" + e3.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}

			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

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

			/// <summary>
			@@ -2339,6 +3759,7 @@
			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1205";
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveSellOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			@@ -2423,6 +3844,8 @@
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
			websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;



			if (oWebs.set_SaveEntrustOutBill_New(websLsmain, sSourceType, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			@@ -2476,6 +3899,7 @@
			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1211";
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveEntrustOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			@@ -2590,6 +4014,62 @@

			#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.HMaker = lsmain[0].HMaker;
			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 çäº§è¡¥æ ä¸ä¼ çå
			@@ -2696,6 +4176,7 @@
			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1254";
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveMateReplenishOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			@@ -2755,6 +4236,7 @@
			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = "1255";
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveEntrustReplenishOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			@@ -2800,13 +4282,144 @@
			[HttpPost]
			public object set_SaveMoveStockBill_Json([FromBody] JObject oMain)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			{
			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);
			WebS.ClsKf_MoveStockBillMain websLsmain = new WebS.ClsKf_MoveStockBillMain();
			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;
			if (oSystemParameter.omodel.WMS_CampanyName == "å°å«") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			websLsmain.HSupID = lsmain[0].HCusID;
			}
			else
			{
			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;
			websLsmain.HStockStyle = lsmain[0].HStockStyle;
			websLsmain.HTransferDirect = lsmain[0].HTransferDirect;
			websLsmain.HShipType = lsmain[0].HShipType;
			if (lsmain[0].HMainSourceBillType == "1402")
			{
			websLsmain.HMainSourceBillType = "åè´§éç¥å";
			}
			else if (lsmain[0].HMainSourceBillType == "1243")
			{
			websLsmain.HMainSourceBillType = "è°æ¨ç³è¯·å";
			}
			else if (lsmain[0].HMainSourceBillType == "3720")
			{
			websLsmain.HMainSourceBillType = "çäº§ç¨ææ¸å";
			}
			else if (lsmain[0].HMainSourceBillType == "1604")
			{
			websLsmain.HMainSourceBillType = "å§å¤ç¨ææ¸å";
			}
			else if (lsmain[0].HMainSourceBillType == "1214")
			{
			websLsmain.HMainSourceBillType = "çäº§åæéç¥å";
			}
			else if (lsmain[0].HMainSourceBillType == "3721")
			{
			websLsmain.HMainSourceBillType = "çäº§å¤æå";
			}
			else if (lsmain[0].HMainSourceBillType == "1242")
			{
			websLsmain.HMainSourceBillType = "åºåºç³è¯·å";
			}
			else
			{
			websLsmain.HMainSourceBillType = "æå·¥å½å¥";
			}
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HBillerID = lsmain[0].HBillerID;
			websLsmain.HStockInOrgID = lsmain[0].HStockInOrgID;
			websLsmain.HStockOutOrgID = lsmain[0].HStockOutOrgID;
			websLsmain.HSTOCKORGID = lsmain[0].HStockOutOrgID;
			websLsmain.HOWNERID = lsmain[0].HStockOutOrgID;

			if (oWebs.set_SaveMoveStockBill(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;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region ç´æ¥è°æ¨åæ«ç©ææ¡ç æ°å¢æ¨¡å¼

			/// <summary>
			/// ç´æ¥è°æ¨æ°å¢ä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveMoveStockBill_AutoBarCode_Json")]
			[HttpPost]
			public object set_SaveMoveStockBill_AutoBarCode_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string sMainStr = sArray[0].ToString(); //ä¸»è¡¨æ°æ®
			string sSubStr = sArray[1].ToString(); //åè¡¨æ°æ®
			try
			{
			//ä¸»è¡¨èµå¼
			List<Model.ClsKf_MoveStockBillMain> lsmain = new List<Model.ClsKf_MoveStockBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getMoveStockBillMainByJson(msg1);
			lsmain = oListModels.getMoveStockBillMainByJson(sMainStr);
			WebS.ClsKf_MoveStockBillMain websLsmain = new WebS.ClsKf_MoveStockBillMain();
			string sSourceType = lsmain[0].HMainSourceBillType;
			websLsmain.HInterID = lsmain[0].HInterID;
			@@ -2829,33 +4442,9 @@
			websLsmain.HStockStyle = lsmain[0].HStockStyle;
			websLsmain.HTransferDirect = lsmain[0].HTransferDirect;
			websLsmain.HShipType = lsmain[0].HShipType;
			if (lsmain[0].HMainSourceBillType == "1402")
			{
			websLsmain.HMainSourceBillType = "åè´§éç¥å";
			}
			else if (lsmain[0].HMainSourceBillType == "1243")
			{
			websLsmain.HMainSourceBillType = "è°æ¨ç³è¯·å";
			}
			else if (lsmain[0].HMainSourceBillType == "3720")
			if (lsmain[0].HMainSourceBillType == "3720")
			{
			websLsmain.HMainSourceBillType = "çäº§ç¨ææ¸å";
			}
			else if (lsmain[0].HMainSourceBillType == "1604")
			{
			websLsmain.HMainSourceBillType = "å§å¤ç¨ææ¸å";
			}
			else if (lsmain[0].HMainSourceBillType == "1214")
			{
			websLsmain.HMainSourceBillType = "çäº§åæéç¥å";
			}
			else if (lsmain[0].HMainSourceBillType == "3721")
			{
			websLsmain.HMainSourceBillType = "çäº§å¤æå";
			}
			else if (lsmain[0].HMainSourceBillType == "1242")
			{
			websLsmain.HMainSourceBillType = "åºåºç³è¯·å";
			}
			else
			{
			@@ -2868,7 +4457,97 @@
			websLsmain.HSTOCKORGID = lsmain[0].HStockOutOrgID;
			websLsmain.HOWNERID = lsmain[0].HStockOutOrgID;

			if (oWebs.set_SaveMoveStockBill(websLsmain, sSourceType, ref DBUtility.ClsPub.sErrInfo))
			//åè¡¨èµå¼
			sSubStr = sSubStr.Replace("\\", "");
			sSubStr = sSubStr.Replace("\n", "");
			List<Models.ClsKf_ICStockBillSub> sub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsKf_ICStockBillSub>>(sSubStr);

			foreach (var item in sub)
			{
			//æ°éä¸æºåæ°éä¸ä¸è´æ¶ï¼æ´æ°æ¡ç åºå¥åºä¸´æ¶è¡¨ HQty åæ®µå¼
			if (item.HQty != item.HQtyMust)
			{
			oCn.RunProc("Update KF_PonderationBillMain_Temp set HQty2=" + item.HQty.ToString() + " where HInterID= " + websLsmain.HInterID.ToString() + " and HBillType='" + websLsmain.HBillType + "' and HSourceInterID= " + item.HSourceInterID.ToString() + " and HSourceEntryID= " + item.HSourceEntryID.ToString());
			}
			}

			ds = oCn.RunProcReturn("exec h_p_WMS_AutoBarCode_MoveStockBill " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillType + "'," + websLsmain.HWHID.ToString() + ",0," + websLsmain.HSCWHID.ToString() + ",0", "h_p_WMS_AutoBarCode_MoveStockBill");
			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
			{
			if (oWebs.set_SaveMoveStockBill(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

			#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.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;

			if (oWebs.set_SaveMoveStockBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -2889,7 +4568,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç´æ¥è°æ¨åä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "ç´æ¥è°æ¨æ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -3114,6 +4793,66 @@

			#endregion

			#region çäº§éåº ä¸ä¼ çå

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

			/// <summary>
			/// çäº§éåºæ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveProductInBackBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveProductInBackBill_BillCheck_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);

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

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

			if (oWebs.set_SaveProductInBackBill_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 éè´éæ ä¸ä¼ çå

			#region éè´éæ æ°å¢æ¨¡å¼
			@@ -3160,6 +4899,10 @@
			{
			websLsmain.HMainSourceBillType = "éæéç¥å";
			}
			else if (lsmain[0].HMainSourceBillType == "1201")
			{
			websLsmain.HMainSourceBillType = "éè´å¥åºå";
			}
			else
			{
			websLsmain.HMainSourceBillType = "æå·¥å½å¥";
			@@ -3191,6 +4934,62 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "éè´éæåä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

			/// <summary>
			/// éè´éææ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SavePOStockInBackBill_BillCheck_Json")]
			[HttpPost]
			public object set_SavePOStockInBackBill_BillCheck_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);

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

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

			if (oWebs.set_SavePOStockInBackBill_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;
			}
			@@ -3242,6 +5041,10 @@
			{
			websLsmain.HMainSourceBillType = "çäº§ç¨ææ¸å";
			}
			else if (lsmain[0].HMainSourceBillType == "1204")
			{
			websLsmain.HMainSourceBillType = "çäº§é¢æå";
			}
			else
			{
			websLsmain.HMainSourceBillType = "æå·¥å½å¥";
			@@ -3280,21 +5083,34 @@

			#endregion

			#endregion

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

			/// <summary>
			/// ä¸ä¼ çæçäº§ç»æå
			/// çäº§éææ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SavePackUnionBill_Json")]
			[HttpGet]
			public object set_SavePackUnionBill_Json(Int64 HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, Int64 HStockOrgID)
			[Route("WEBSController/set_SaveMateOutBackBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveMateOutBackBill_BillCheck_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();

			try
			{
			if (oWebs.set_SavePackUnionBill_Add(HInterID, HBillType, HBillNo, HBarCode_Pack, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
			List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getICStockBillMainByJson(msg1);

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

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

			if (oWebs.set_SaveMateOutBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -3315,12 +5131,848 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "çæçäº§ç»æåå¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "çäº§éææ ¡éªå¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#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

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

			/// <summary>
			/// éå®éè´§æ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveSellOutBackBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveSellOutBackBill_BillCheck_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);

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

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

			if (oWebs.set_SaveSellOutBackBill_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 å§å¤éæ ä¸ä¼ çå

			#region å§å¤éæ æ ¡éªæ¨¡å¼

			/// <summary>
			/// å§å¤éææ ¡éªä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveEntrustOutBackBill_BillCheck_Json")]
			[HttpPost]
			public object set_SaveEntrustOutBackBill_BillCheck_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);

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

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

			if (oWebs.set_SaveEntrustOutBackBill_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 æ£éªå ä¸ä¼ çå

			#region æ£éªå åæ ¼å

			/// <summary>
			/// æ£éªåæ°å¢ä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveQCPOStockInCheckBill_Json")]
			[HttpGet]
			public object set_SaveQCPOStockInCheckBill_Json(Int64 HInterID, string HBillNo, string HSourceBillType, string HSourceBillNo, Int64 HSourceInterID, string sHSourceEntryID, Int64 HFirstCheckEmp, string HMaker)
			{
			try
			{
			ClsQC_POStockInCheckBillMain oMain = new ClsQC_POStockInCheckBillMain();
			oMain.HInterID = HInterID;
			oMain.HBillNo = HBillNo;
			oMain.HBillType = "7503";
			oMain.HDate = DateTime.Today;
			oMain.HMainSourceBillType = HSourceBillType;
			oMain.HMainSourceBillNo = HSourceBillNo;
			oMain.HMainSourceInterID = HSourceInterID;
			oMain.HFirstCheckEmp = HFirstCheckEmp;
			oMain.HMaker = HMaker;

			if (set_SaveQCPOStockInCheckBill(oMain, HSourceBillType, sHSourceEntryID, 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;
			}
			}

			//çææ£éªå
			public bool set_SaveQCPOStockInCheckBill(Model.ClsQC_POStockInCheckBillMain oMain, string HSourceBillType, string sHSourceEntryID, ref string sErrMsg)
			{
			string sRemark = "";
			string HReturn;

			//ä¸ä¼ åå¤æ
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet BfDs = oCn.RunProcReturn("exec h_p_QC_BeforeUpload_POStockInCheckBill " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + HSourceBillType + "','" + sHSourceEntryID + "'," + oMain.HFirstCheckEmp.ToString(), "h_p_QC_BeforeUpload_POStockInCheckBill");
			if (BfDs == null \|\| BfDs.Tables[0].Rows.Count == 0)
			{
			sErrMsg = "ä¸ä¼ åå¤ææ°æ®å®æ´æ§å¤±è´¥ï¼";
			return false;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(BfDs.Tables[0].Rows[0][0]) == 1)
			{
			sErrMsg = "åæ®å·ï¼" + oMain.HBillNo + "ï¼åæ®IDï¼" + oMain.HInterID + "ï¼" + DBUtility.ClsPub.isStrNull(BfDs.Tables[0].Rows[0]["HRemark"]);
			return false;
			}
			}
			sRemark = sRemark + " ï¼ä¸ä¼ åå¤æ" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");

			//è¿åæéæ°æ®
			DataSet Ds;
			Ds = oCn.RunProcReturn("exec h_p_QC_POStockInCheckBill_CLD " + oMain.HMainSourceInterID.ToString() + ",'" + sHSourceEntryID + "'," + oMain.HFirstCheckEmp.ToString(), "h_p_QC_POStockInCheckBill_CLD");
			if (Ds == null \|\| Ds.Tables[0].Rows.Count == 0 \|\| Ds.Tables[1].Rows.Count == 0)
			{
			sErrMsg = "æ ¹æ®æ¶æéç¥åï¼" + oMain.HMainSourceBillNo + " è·åæ°æ®å¤±è´¥ï¼";
			return false;
			}
			sRemark = sRemark + " ï¼è·åCLOUDåæ®APIéå¥å¼" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");

			//è·ååæ®ä¸»è¡¨æéæ°æ®
			oMain.HSupID = Pub_Class.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
			oMain.HSTOCKORGID = Pub_Class.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSTOCKORGID"]);

			//è·åç³»ç»åæ°
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
			if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
			{
			sErrMsg = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			return false;
			}

			try
			{
			//å¤æä¼è®¡ææ¯å¦åç
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oMain.HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			sErrMsg = s;
			return false;
			}
			oMain.HYear = sYear;
			oMain.HPeriod = sPeriod;

			oCn.BeginTran();
			//çææ£éªå
			//åå¥ä¸»è¡¨
			oCn.RunProc("Insert Into QC_POStockInCheckBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
			",HYear,HPeriod,HRemark,HSTOCKORGID,HSupID,HMaterID" +
			",HInstockQty,HCheckQty,HRightQty,HBadQty,HFirstCheckEmp" +
			",HCheckerResult,HSteelStoveNo,HSteelCompReport,HAspect,HSize" +
			") " +
			" values('" + oMain.HBillType + "','" + oMain.HBillType + "'," + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HDate.ToShortDateString() + "','" + oMain.HMaker + "',getdate()" +
			", " + oMain.HYear.ToString() + "," + oMain.HPeriod.ToString() + ",'" + oMain.HRemark + "'," + oMain.HSTOCKORGID.ToString() + "," + oMain.HSupID.ToString() + "," + oMain.HMaterID.ToString() +
			", " + oMain.HCheckQty.ToString() + "," + oMain.HCheckQty.ToString() + "," + oMain.HRightQty.ToString() + "," + oMain.HBadQty.ToString() + "," + oMain.HFirstCheckEmp.ToString() +
			",'" + oMain.HCheckerResult + "','" + oMain.HSteelStoveNo + "','" + oMain.HSteelCompReport + "','" + oMain.HAspect + "','" + oMain.HSize + "'" +
			") ");

			//åå¥åè¡¨
			for (int i = 0; i < Ds.Tables[1].Rows.Count; i++)
			{
			Model.ClsQC_POStockInCheckBillSub oSub = new Model.ClsQC_POStockInCheckBillSub();
			oSub.HEntryID = i + 1;
			oSub.HSourceInterID = Pub_Class.ClsPub.isLong(Ds.Tables[1].Rows[i]["HSourceInterID"]);
			oSub.HSourceEntryID = Pub_Class.ClsPub.isLong(Ds.Tables[1].Rows[i]["HSourceEntryID"]);
			oSub.HSourceBillNo = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HSourceBillNo"]);
			oSub.HSourceBillType = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HSourceBillType"]);
			oSub.HResult = "åæ ¼";
			oSub.HProcCheckEmp = oMain.HFirstCheckEmp;
			oSub.HMaterID = Pub_Class.ClsPub.isLong(Ds.Tables[1].Rows[i]["HMaterID"]);
			oSub.HInStockQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HInStockQty"]);
			oSub.HCheckQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HCheckQty"]);
			oSub.HRightQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HRightQty"]);
			oSub.HBadQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HBadQty"]);

			oCn.RunProc("Insert Into QC_POStockInCheckBillSub " +
			"(HInterID,HEntryID,HBillNo_bak,HRemark" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
			",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue" +
			",HResult,HProcCheckEmp,HProcCheckTime" +
			",HMaterID,HInStockQty,HCheckQty,HRightQty,HBadQty" +
			") " +
			" values(" + oMain.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oMain.HBillNo + "','" + oSub.HRemark + "'" +
			", " + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
			", " + oSub.HQCCheckClassID.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCRelValue + "'" +
			",'" + oSub.HResult + "'," + oSub.HProcCheckEmp.ToString() + ",getdate()" +
			", " + oSub.HMaterID.ToString() + "," + oSub.HInStockQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HRightQty.ToString() + "," + oSub.HBadQty.ToString() +
			") ");
			}
			sRemark = sRemark + " ï¼çææ£éªååæ®" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");

			//è·åéè¶äºAPIæééå¥æ°æ®
			string sJson_MainCustom = ""; //ä¸»è¡¨èªå®ä¹åæ®µ
			sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);

			string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"Model\":{\"FBillNo\":\"" + oMain.HBillNo + "\"," +
			//\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FID"]) + "\"," +
			"\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" }," +
			"\"FBusinessType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBusinessType"]) + "\"," +
			"\"FDATE\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDATE"]) + "\"," +
			"\"FSourceOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FSourceOrgId"]) + "\"}," +
			"\"FInspectOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectOrgId"]) + "\"}," +
			"\"FInspectDepId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectDepId"]) + "\"}," +
			//"\"FInspectGroupId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectGroupId"]) + "\"}," +
			"\"FInspectorId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectorId"]) + "\"}," +
			//"\"FDescription\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDescription"]) + "\"," +
			//"\"FUpScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FUpScanBox"]) + "\"," +
			//"\"FDefScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDefScanBox"]) + "\"," +
			//"\"FCheckQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FCheckQty"]) + "\"," +
			//"\"FInspectValScanBox\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInspectValScanBox"]) + "\"," +
			"\"FIsSynced\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FIsSynced"]) + "\"," +
			sJson_MainCustom +
			"\"FEntity\":[";
			string sJson_Entry = "";
			for (int i = 0; i < Ds.Tables[1].Rows.Count; i++)
			{
			if (sJson_Entry != "")
			{
			sJson_Entry = sJson_Entry + " , ";
			}
			string sJson_BatchNo = "";
			string sJson_StockPlace = "";
			string sJson_FProduceDate = ""; //çäº§æ¥æ
			string sJson_FExpiryDate = ""; //æææè³
			string sJson_FAUXPROPID = "";
			string sJson_SubCustom = ""; //åè¡¨èªå®ä¹åæ®µ

			//åè¡¨èªå®ä¹åæ®µ
			sJson_SubCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["SubCustom"]);

			//æ¯å¦å¯ç¨æ¹æ¬¡ç®¡ç
			if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1")
			{
			sJson_BatchNo = " \"FLOT\": {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"}, \"FLOT_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\" , ";
			}
			else
			{
			sJson_BatchNo = "";
			}

			//æ¯å¦å¯ç¨ä¿è´¨ææ§å¶
			if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
			{
			sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
			sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
			}
			else
			{
			sJson_FProduceDate = "";
			sJson_FExpiryDate = "";
			}

			//æ¯å¦å¯ç¨ä»ä½
			if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) == "")
			{
			sJson_StockPlace = "";
			}
			else
			{
			sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
			}

			//è¾å©å±æ§
			sJson_FAUXPROPID = " \"FAUXPROPID\":{\"FAUXPROPID__FF100002\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"}},";

			sJson_Entry = sJson_Entry + "{" +
			//"FEntryID": 0,
			"\"FMaterialId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FMaterialId"]) + "\"}," +
			//"FQCSchemeId": {"FNUMBER": ""},
			"\"FUnitID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUnitID"]) + "\"}," +
			"\"FInspectQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInspectQty"]) + "\"," + //æ£éªæ°é
			"\"FQualifiedQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FQualifiedQty"]) + "\"," + //åæ ¼æ°é
			"\"FUnqualifiedQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUnqualifiedQty"]) + "\"," + //ä¸åæ ¼æ°é
			//"FSampleDamageQty": 0,
			//"FSUnqualifiedQty": 0,
			"\"FInspectResult\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInspectResult"]) + "\"," + //æ£éªç»æ
			"\"FQCStatus\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FQCStatus"]) + "\"," + //è´¨æ£ç¶æ
			//"FBaseSUnqualifiedQty": 0,
			//"FSampleQty": 0,
			//"FMemo": "",
			"\"FIsRelated\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsRelated"]) + "\"," +
			"\"FSrcBillType0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillType0"]) + "\"," +
			"\"FSrcBillNo0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillNo0"]) + "\"," +
			"\"FSrcInterId0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcInterId0"]) + "\"," +
			"\"FSrcEntryId0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntryId0"]) + "\"," +
			"\"FSrcEntrySeq0\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntrySeq0"]) + "\"," +
			"\"FBaseUnitId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseUnitId"]) + "\"}," +
			//"FQCBusinessType": "",
			//"FBFLowId": {"FNAME": ""},
			//"FSampleSchemeId": {"FNUMBER": ""},
			//"FAcceptQty": 0,
			//"FRejectQty": 0,
			//"FInspectEndDate": "1900-01-01",
			"\"FBaseInspectQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseInspectQty"]) + "\"," + //åºæ¬åä½æ£éªæ°é
			"\"FSupplierId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSupplierId"]) + "\"}," +
			//"FCustomerId": {"FNUMBER": ""},
			//"FProductLineId": {"FNUMBER": ""},
			//"FPrdLineLocation": {"FLOCATIONCODE": ""},
			//"FWorkshopId": {"FNUMBER": ""},
			"\"FStockId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockId"]) + "\"}," +
			sJson_BatchNo +
			"\"FInspectTimes\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FInspectTimes"]) + "\"," + //æ£éªæ¬¡æ°
			sJson_StockPlace +
			//"FConsumeTime": 0,
			//"FInspectStartDate": "1900-01-01",
			"\"FTimeUnit\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FTimeUnit"]) + "\"," +
			//"FBaseSampleDamageQty": 0,
			//"FBaseUnqualifiedQty": 0,
			//"FOperNumber": 0,
			"\"FSampleDamageBearer\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSampleDamageBearer"]) + "\"," +
			"\"FIsFirstInspect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsFirstInspect"]) + "\"," +
			"\"FBaseQualifiedQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseQualifiedQty"]) + "\"," + //åºæ¬åä½åæ ¼æ°
			"\"FBaseAcceptQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBaseAcceptQty"]) + "\"," + //åºæ¬åä½æ¥æ¶æ°
			sJson_FAUXPROPID +
			//"FPrdUnitId": {"FNumber": ""},
			//"FBaseReAcceptQty": 0,
			//"FOperDescription": "",
			//"FUnitTransHeadQty": 0,
			//"FUnitTransOperQty": 0,
			//"FSNUnitID": {"FNumber": ""},
			//"FBaseWBInspectQty": 0,
			//"FBaseUnQuaSalQty": 0,
			//"FSupplierLot": "",
			sJson_FProduceDate +
			sJson_FExpiryDate +
			//"FNewExpiryDate": "1900-01-01",
			"\"FCurrency\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCurrency"]) + "\"}," +
			//"FDiscountQty": 0,
			"\"FIsSplitRow\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsSplitRow"]) + "\"," +
			sJson_SubCustom +

			//ä½¿ç¨å³çè¡¨ä½
			"\"FPolicyDetail\": [ { " +
			//"FDetailID": 0,
			"\"FPolicyMaterialId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPolicyMaterialId"]) + "\"}," +
			"\"FPolicyStatus\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPolicyStatus"]) + "\"," +
			"\"FPolicyQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FPolicyQty"]) + "\"," +
			"\"FBasePolicyQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FBasePolicyQty"]) + "\"," +
			"\"FUsePolicy\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FUsePolicy"]) + "\"," +
			//"FSerialId": { "FNUMBER": ""},
			"\"FIsCheck\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsCheck"]) + "\"," +
			"\"FIsDefectProcess\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsDefectProcess"]) + "\"," +
			"\"FCanSale\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FCanSale"]) + "\"," +
			"\"FIsMRBReview\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsMRBReview"]) + "\"," +
			"\"FIsReturn\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsReturn"]) + "\"," +
			"\"FIsRelatedDefect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FIsRelatedDefect"]) + "\"" +
			//"FMRBReviewStatus": "",
			//"FBoxNumber": "",
			//"FMemo1": "",
			//"FPolicyAuxPropId": {"FPOLICYAUXPROPID__FF100005": { "FNumber": ""},"FPOLICYAUXPROPID__FF100002": { "FNumber": ""}}
			" } ]," +

			//ç¼ºé·è®°å½è¡¨ä½
			//"\"FDefectDetail\": [ { " +
			////"FDetailID": 0,
			////"FDSerialId": {"FNUMBER": ""},
			////"FDefectTypeId": {"FNUMBER": ""},
			////"FDefectQty": 0,
			////"FBaseDefectQty1": 0,
			////"FDefectReasonId": {"FNUMBER": ""},
			////"FDefectLevel": "",
			////"FDefectResultId": {"FNUMBER": ""},
			////"FDefectMemo": ""
			//" } ]," +

			//æ£éªé¡¹ç®è¡¨ä½
			//"\"FItemDetail\": [ { " +
			////"FDetailID": 0,
			////"FInspectItemId": { "FNUMBER": ""},
			////"FInspectResult1": "",
			////"FAnalysisMethod": "",
			////"FQualityStdId": { "FNUMBER": ""},
			////"FUnitId2": { "FNUMBER": ""},
			////"FInspectValQ": 0,
			////"FInspectValB": { "FNUMBER": ""},
			////"FInspectValT": "",
			////"FInspectMethodId": { "FNUMBER": ""},
			////"FInspectInstrumentId": { "FNUMBER": ""},
			////"FDefectlevel1": "",
			////"FDestructInspect": "false",
			////"FKeyInspect": "false",
			////"FInspectBasisId": { "FNUMBER": ""},
			////"FSampleSchemeId1": { "FNUMBER": ""},
			////"FItemStatus": "",
			////"FCompareSymbol": "",
			////"FSampleQty1": 0,
			////"FAcceptQty1": 0,
			////"FRejectQty1": 0,
			////"FSampleDamageQty1": 0,
			////"FBaseSampleDamageQty1": 0,
			////"FItemMemo": "",
			////"FSUnqualifiedQty1": 0,
			////"FBaseSUnqualifiedQty1": 0,
			////"FTargetVal": "",
			////"FInspectVal": "",
			////"FUpLimit": "",
			////"FDownLimit": "",
			////"FUpOffset": "",
			////"FDownOffset": "",
			////"FInspectValKey": "",
			////"FTargetValKey": "",
			////"FUpLimitKey": "",
			////"FDownLimitKey": "",
			////"FUpOffsetKey": "",
			////"FDownOffsetKey": "",
			////"FTargetValQ": 0,
			////"FUpLimitQ": 0,
			////"FDownLimitQ": 0,
			////"FUpOffsetQ": 0,
			////"FDownOffsetQ": 0,
			////"FTargetValB": { "FNUMBER": ""},
			////"FUpLimitB": { "FNUMBER": ""},
			////"FDownLimitB": { "FNUMBER": ""},
			////"FUpOffsetB": { "FNUMBER": ""},
			////"FDownOffsetB": { "FNUMBER": ""},
			////"FTargetValT": "",
			////"FUpLimitT": "",
			////"FDownLimitT": "",
			////"FUpOffsetT": "",
			////"FDownOffsetT": "",
			////"FValueGrid": [
			//// {
			//// "FGridId": 0,
			//// "FInspectResult2": "",
			//// "FInspectValueB": { "FNUMBER": ""},
			//// "FInspectValueT": "",
			//// "FInspectValue": 0,
			//// "FVSerialId": { "FNUMBER": ""}
			//// }
			////]
			//" } ]," +

			//åèè¡¨ä½
			"\"FReferDetail\": [ { " +
			//"FDetailID": 0,
			"\"FSrcBillType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillType"]) + "\"," +
			"\"FSrcBillNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcBillNo"]) + "\"," +
			"\"FSrcInterId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcInterId"]) + "\"," +
			"\"FSrcEntryId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntryId"]) + "\"," +
			"\"FSrcEntrySeq\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSrcEntrySeq"]) + "\"," +
			"\"FOrderType\":{\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderType"]) + "\"}," +
			"\"FOrderBillNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderBillNo"]) + "\"," +
			"\"FOrderId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderId"]) + "\"," +
			"\"FOrderEntryId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderEntryId"]) + "\"," +
			"\"FOrderEntrySeq\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FOrderEntrySeq"]) + "\"" +
			" } ]," +

			//å³èå³ç³»è¡¨
			"\"FEntity_Link\": [ { " +
			"\"FEntity_Link_FFlowId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FFlowId"]) + "\"," +
			"\"FEntity_Link_FFlowLineId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FFlowLineId"]) + "\"," +
			"\"FEntity_Link_FRuleId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FRuleId"]) + "\"," +
			"\"FEntity_Link_FSTableName\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FSTableName"]) + "\"," +
			"\"FEntity_Link_FSBillId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FSBillId"]) + "\"," +
			"\"FEntity_Link_FSId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FSId"]) + "\"," +
			"\"FEntity_Link_FBaseAcceptQty\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FBaseAcceptQty"]) + "\"," +
			"\"FEntity_Link_FBaseAcceptQtyOld\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FBaseAcceptQtyOld"]) + "\"," +
			"\"FEntity_Link_FBaseInspectQtyOld\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FBaseInspectQtyOld"]) + "\"," +
			"\"FEntity_Link_FInspectQtyOld\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FEntity_Link_FInspectQtyOld"]) + "\"" +
			" } ] } ";
			}
			string sJson_End = " ] }}";
			string sJson = sJson_Main + sJson_Entry + sJson_End;

			//CLOUDéè¶äºè´¦å·å¯ç ç»å¥
			var loginRet = InvokeHelper.LoginUser(oMain.HMaker);
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			sRemark = sRemark + " ï¼è·åéªè¯CLOUDè´¦å·å¯ç " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");

			//çæéè¶äºåæ®
			if (isSuccess == 1)
			{
			string result = InvokeHelper.Save("QM_InspectBill", sJson); //ä¿å
			sRemark = sRemark + " ï¼çæCLOUDåæ®" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");

			HReturn = result.ToString();

			if (HReturn.Contains("\"IsSuccess\":false") == true)
			{
			//ååºååjsonæ°æ®
			var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
			//æ¥æ¶éè¶æ¥éä¿¡æ¯
			var strErrorMsg = string.Empty;
			//éåè·åæ¥éä¿¡æ¯
			foreach (var item in retModel.Result.ResponseStatus.Errors)
			{
			strErrorMsg += item.Message + "\r\n";
			};
			sErrMsg = "çææ£éªåå¤±è´¥ï¼éè¶äºæç¤ºï¼" + strErrorMsg;
			LogService.Write("çææ£éªåå¤±è´¥ï¼" + HReturn + sJson); //åå¥txtææ¬
			oCn.RollBack();
			return false;
			}
			else
			{
			sRemark = sRemark + sJson;
			// æäº¤åä¿ååæ®
			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,
			};

			result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//æäº¤
			result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//å®¡æ ¸
			if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			oCn.RollBack();
			sErrMsg = $"æ¥ææ£éªåå·ï¼{fBillNo}ï¼æäº¤å¤±è´¥" + result;
			return false;
			}
			oCn.Commit();
			}
			}
			else
			{
			sErrMsg = "çææ£éªåå¤±è´¥ï¼éè¶äºç»å½å¤±è´¥ï¼";
			oCn.RollBack();
			return false;
			}
			}
			catch (Exception e)
			{
			LogService.Write("çæåæ»" + e.Message + sRemark);
			sErrMsg = "çææ£éªåå¤±è´¥ï¼" + e.Message;
			oCn.RollBack();
			return false;
			}

			if (oSystemParameter.omodel.QC_POStockInCheckBill_AutoCheck.ToUpper() == "Y") //ç³»ç»åæ° èªå¨å®¡æ ¸
			{
			try
			{
			oCn.BeginTran();
			//å®¡æ ¸WMSåæ®
			oCn.RunProc("Update QC_POStockInCheckBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());

			//æäº¤ãå®¡æ ¸éè¶äºåæ®
			HReturn = "";
			string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
			var result2 = InvokeHelper.Submit("QM_InspectBill", sJson2); //æäº¤
			sRemark = sRemark + " ï¼æäº¤CLOUDåæ®" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");

			var result3 = InvokeHelper.Audit("QM_InspectBill", sJson2); //å®¡æ ¸
			sRemark = sRemark + " ï¼å®¡æ ¸CLOUDåæ®" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");

			HReturn = result2.ToString() + "," + result3.ToString();

			if (HReturn.Contains("\"IsSuccess\":false") == true)
			{
			//ååºååjsonæ°æ®
			var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(result3);
			//æ¥æ¶éè¶æ¥éä¿¡æ¯
			var strErrorMsg = string.Empty;
			//éåè·åæ¥éä¿¡æ¯
			foreach (var item in retModel.Result.ResponseStatus.Errors)
			{
			strErrorMsg += item.Message + "\r\n";
			};
			sErrMsg = "çææ£éªåæåï¼å®¡æ ¸åæ®å¤±è´¥ï¼éè¶äºæç¤ºï¼" + strErrorMsg;
			LogService.Write("å®¡æ ¸åæ®å¤±è´¥" + sRemark + HReturn);
			oCn.RollBack();
			return true;
			}
			else
			{
			LogService.Write("çæå¹¶å®¡æ ¸æ£éªåæåï¼" + sRemark);
			sErrMsg = "çæå¹¶å®¡æ ¸æ£éªåæåï¼åæ®å·ä¸ºï¼" + oMain.HBillNo;
			oCn.Commit();
			return true;
			}
			}
			catch (Exception e)
			{
			LogService.Write("å®¡æ ¸åæ»" + sRemark + HReturn);
			sErrMsg = "å®¡æ ¸æ£éªåå¤±è´¥ï¼" + e.Message;
			oCn.RollBack();
			return false;
			}
			}
			else
			{
			LogService.Write("çææ£éªåæåï¼" + sRemark);
			sErrMsg = "çææ£éªåæåï¼åæ®å·ä¸ºï¼" + oMain.HBillNo;
			return true;
			}
			}

			#endregion

			#endregion

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

			/// <summary>
			/// ä¸ä¼ çæçäº§ç»æå
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SavePackUnionBill_Json")]
			[HttpGet]
			public object set_SavePackUnionBill_Json(Int64 HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			if (oWebs.set_SavePackUnionBill_Add(HInterID, HBillType, HBillNo, HBarCode_Pack, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åæ®å·ï¼" + HBillNo + " ä¿åæåï¼";
			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

			#region å°å«ç»ææ¡ç å±ç¤º
			[Route("WEBSController/get_SavePackUnion_xiaowei")]
			[HttpGet]
			public object get_SavePackUnion_xiaowei(string HBarCode_Pack)
			{
			try
			{

			DataSet ds = oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where æ æ¿ç ='{HBarCode_Pack}'", "h_v_get_PackUnionBill");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "success";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region ä¸æé²éå ä¸ä¼ çå
			@@ -3387,6 +6039,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")
			{
			@@ -3462,6 +6116,338 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¸æé²éåä¸ä¼ å¤±è´¥ï¼" + e.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region è½¦é´ä¸æ¶å ä¸ä¼ çå

			/// <summary>
			/// è½¦é´ä¸æ¶åæ°å¢ä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveMaterialUpperBill_Json")]
			[HttpPost]
			public object set_SaveMaterialUpperBill_Json([FromBody] JObject oMain)
			{
			BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			try
			{
			string sMainStr = "[" + msg1.ToString() + "]";
			List<Model.ClsKf_WorkShopICStockBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_WorkShopICStockBillMain>>(sMainStr);

			//åæ®å·æ¯å¦éå¤
			if (oBaseBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, mainList[0].HBillNo, BillStatus, mainList[0].HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·éå¤ï¼ä¸åè®¸ä¿åï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//å¤æä¼è®¡ææ¯å¦åç
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(mainList[0].HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s;
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCn.BeginTran();
			//çæåæ®
			//æå¥ä¸»è¡¨
			oCn.RunProc("Insert Into Kf_WorkShopICStockBillMain " +
			"(HInterID,HBillNo,HBillType,HBillSubType,HDate,HRemark" +
			",HYear,HPeriod,HMaker,HMakeDate,HStockOrgID" +
			",HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo" +
			",HMangerID,HSecManagerID,HKeeperID,HDeptID" +
			") " +
			" values(" + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillNo + "','" + mainList[0].HBillType + "','" + mainList[0].HBillSubType + "','" + mainList[0].HDate.ToShortDateString() + "','" + mainList[0].HRemark + "'" +
			", " + sYear.ToString() + "," + sPeriod.ToString() + ",'" + mainList[0].HMaker + "',getdate()," + mainList[0].HSTOCKORGID.ToString() +
			",'" + mainList[0].HMainSourceBillType + "'," + mainList[0].HMainSourceInterID.ToString() + "," + mainList[0].HMainSourceEntryID.ToString() + ",'" + mainList[0].HMainSourceBillNo + "'" +
			", " + mainList[0].HMangerID.ToString() + "," + mainList[0].HSecManagerID.ToString() + "," + mainList[0].HKeeperID.ToString() + "," + mainList[0].HDeptID.ToString() +
			") ");
			//æå¥åè¡¨
			ds = oCn.RunProcReturn("exec h_p_Kf_MaterialUpperBillSub_Insert " + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillNo + "'", "h_p_Kf_MaterialUpperBillSub_Insert");

			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.isStrNull(ds.Tables[0].Rows[0]["s"]) != "OK")
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["s"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{

			//å é¤åæ§å¶=========================================
			DataSet dds = oCn.RunProcReturn("Exec h_p_KF_ICInventory_WorkShop_BeforeDelCtrl " + mainList[0].HInterID.ToString(), "h_p_KF_ICInventory_WorkShop_BeforeDelCtrl");

			if (dds == null)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤åå¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(dds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//æ´æ°è½¦é´ç©æåºå
			oCn.RunProc("EXEC h_p_WMS_UPDateICinventory_WorkShop " + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillType + "'");
			//æ´æ°è½¦é´æ¡ç åºå
			oCn.RunProc("EXEC h_p_WMS_UPDateBarCodeICinventory_WorkShop " + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillType + "',1");
			oCn.Commit();
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åæ®å·ï¼" + mainList[0].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;
			}
			}

			#endregion

			#region è½¦é´ä¸æ¶å ä¸ä¼ çå

			/// <summary>
			/// è½¦é´ä¸æ¶åæ°å¢ä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveMaterialLowerBill_Json")]
			[HttpPost]
			public object set_SaveMaterialLowerBill_Json([FromBody] JObject oMain)
			{
			BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			try
			{
			string sMainStr = "[" + msg1.ToString() + "]";
			List<Model.ClsKf_WorkShopICStockBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_WorkShopICStockBillMain>>(sMainStr);

			//åæ®å·æ¯å¦éå¤
			if (oBaseBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, mainList[0].HBillNo, BillStatus, mainList[0].HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®å·éå¤ï¼ä¸åè®¸ä¿åï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//å¤æä¼è®¡ææ¯å¦åç
			string s = "";
			int sYear = 0;
			int sPeriod = 0;
			if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(mainList[0].HDate, ref sYear, ref sPeriod, ref s) == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s;
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCn.BeginTran();
			//çæåæ®
			//æå¥ä¸»è¡¨
			oCn.RunProc("Insert Into Kf_WorkShopICStockBillMain " +
			"(HInterID,HBillNo,HBillType,HBillSubType,HDate,HRemark" +
			",HYear,HPeriod,HMaker,HMakeDate,HStockOrgID" +
			",HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo" +
			",HMangerID,HSecManagerID,HKeeperID,HDeptID" +
			") " +
			" values(" + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillNo + "','" + mainList[0].HBillType + "','" + mainList[0].HBillSubType + "','" + mainList[0].HDate.ToShortDateString() + "','" + mainList[0].HRemark + "'" +
			", " + sYear.ToString() + "," + sPeriod.ToString() + ",'" + mainList[0].HMaker + "',getdate()," + mainList[0].HSTOCKORGID.ToString() +
			",'" + mainList[0].HMainSourceBillType + "'," + mainList[0].HMainSourceInterID.ToString() + "," + mainList[0].HMainSourceEntryID.ToString() + ",'" + mainList[0].HMainSourceBillNo + "'" +
			", " + mainList[0].HMangerID.ToString() + "," + mainList[0].HSecManagerID.ToString() + "," + mainList[0].HKeeperID.ToString() + "," + mainList[0].HDeptID.ToString() +
			") ");
			//æå¥åè¡¨
			ds = oCn.RunProcReturn("exec h_p_Kf_MaterialLowerBillSub_Insert " + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillNo + "'", "h_p_Kf_MaterialLowerBillSub_Insert");

			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.isStrNull(ds.Tables[0].Rows[0]["s"]) != "OK")
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["s"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			//æ´æ°è½¦é´ç©æåºå
			oCn.RunProc("EXEC h_p_WMS_UPDateICinventory_WorkShop " + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillType + "'");
			//æ´æ°è½¦é´æ¡ç åºå
			oCn.RunProc("EXEC h_p_WMS_UPDateBarCodeICinventory_WorkShop " + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillType + "',-1");
			oCn.Commit();
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åæ®å·ï¼" + mainList[0].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;
			}
			}

			#endregion

			#region å°è½¦éå®å ä¸ä¼ çå

			/// <summary>
			/// å°è½¦éå®åæ°å¢ä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveTrolleyPositionBill_Json")]
			[HttpPost]
			public object set_SaveTrolleyPositionBill_Json([FromBody] JObject msg)
			{
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string UserName = sArray[2].ToString();
			string OperationType = sArray[3].ToString();
			DBUtility.ClsPub.CurUserName = UserName;
			ListModels oListModels = new ListModels();
			try
			{
			DAL.ClsKf_TrolleyPositionBill oBill = new DAL.ClsKf_TrolleyPositionBill();
			List<Model.ClsKf_TrolleyPositionBillMain> lsmain = new List<Model.ClsKf_TrolleyPositionBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Kf_TrolleyPositionBillMain(msg2);

			foreach (Model.ClsKf_TrolleyPositionBillMain oItem in lsmain)
			{
			DBUtility.ClsPub.CurUserName = oItem.HMaker;
			oItem.HBillType = "10004";
			oItem.HBillSubType = "10004";
			oItem.HBillStatus = 1; //åæ®ç¶æï¼1æªå®¡ï¼2å®¡æ ¸éè¿ï¼3å³éï¼4ä½åºï¼5å®¡æ ¸éå,6å®¡æ ¸ä¸,7å·²éï¼8å·²åå¤ï¼9ç»æ¡ï¼10éªè¯,11ä¸è¾¾ï¼12å¼å·¥,13ç³è¯·å®¡æ¹,15ç³è¯·æ£éªï¼16 å¤å®åæ ¼ï¼17å¤å®ä¸åæ ¼ï¼
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
			oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼æ²¡æåæ®æ¥æï¼æ æ³ä¿åï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oBill.omodel = oItem;
			}

			// è¡¨ä½æ°æ®
			//æ },{æ¥æåæ°ç» //å»æãåã
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			List<Model.ClsKf_TrolleyPositionBillSub> ls = new List<Model.ClsKf_TrolleyPositionBillSub>();
			ls = oListModels.getObjectByJson_Kf_TrolleyPositionBillSub(msg3);
			int i = 0;
			foreach (Model.ClsKf_TrolleyPositionBillSub oItemSub in ls)
			{
			i++;
			oItemSub.HEntryID = i;
			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false; //å³éç±»å

			oBill.DetailColl.Add(oItemSub);
			}

			//ä¿å
			//ä¿åå®æ¯åå¤ç
			bool bResult;
			if (OperationType == "1")
			{
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			objJsonResult.Verify = "N";
			}

			if (bResult)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä¿åæåï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å°è½¦éå®åä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -3694,31 +6680,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;
			}
			@@ -3934,6 +6944,90 @@
			}
			}

			/// <summary>
			/// ç´æ¥è°æ¨åæ«ç©ææ¡ç æ¨¡å æ«ææºåæ¡ç 20250818
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_SourceBarCode_MoveStock_AutoBarCode_Json")]
			[HttpGet]
			public object get_SourceBarCode_MoveStock_AutoBarCode_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HOWNERID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddSourceBarCode_MoveStock_AutoBarCode " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "','" + HMaker + "'," + HOWNERID.ToString(), "h_p_WMS_AddSourceBarCode_MoveStock_AutoBarCode");
			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;
			}
			}

			/// <summary>
			/// å¤å®ä¸ç¨è°æ¨ æ«ææºåæ¡ç 20250513
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_SourceBarCode_MoveStock_XiaBao_Json")]
			[HttpGet]
			public object get_SourceBarCode_MoveStock_XiaBao_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HFIFOWhID, Int64 HOWNERID)
			{
			try
			{
			WebSoBar = oWebs.get_SourceBarCode_MoveStock_XiaBao(HInterID, HBillNo, HBillType, HSourceBillNo, HSourceBillType, HMaker, HFIFOWhID, HOWNERID, 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

			#region åæ¥å¼è°åº æ«ææºåæ¡ç
			@@ -4104,6 +7198,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 +7262,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
			{
			@@ -4168,7 +7318,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}

			#endregion

			@@ -4178,9 +7328,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 = "";
			@@ -4248,7 +7398,7 @@
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "å®ç") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOutOrgID, HBillNo, HMaker);
			sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOutOrgID, HBillNo, HMaker);
			SourceFlag = true;
			}
			else
			@@ -4325,6 +7475,44 @@
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			}

			/// <summary>
			/// ç©ææ¡ç ææ¬æ¡ è°æ¨æ«ç è°ç¨ å¤å® æ«æç©ææ¡ç èªå¨å¸¦åºæºåä¿¡æ¯ 20250506
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_BarCode_MoveStock_AddSource_Json")]
			[HttpGet]
			public Object get_BarCode_MoveStock_AddSource_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)
			{
			try
			{
			WebSoBar = oWebs.get_BarCode_MoveStock_AddSource(sBarCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, SourceFlag, HSourceBillNo, HSourceBillType, HStockInOrgID, HStockOutOrgID, HScanStyle, ref DBUtility.ClsPub.sErrInfo, HCustom1, HCustom2);
			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
			@@ -4469,7 +7657,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
			@@ -4608,10 +7804,10 @@

			#endregion

			#region æ«æåæ®æ¡ç åºå¥åºæ¨¡å
			#region æ«æåæ®æ¡ç 20251225

			/// <summary>
			/// æ«æåæ®æ¡ç åºå¥åºæ¨¡å æ ¡éªæ¨¡å¼
			/// æ«æåæ®æ¡ç æ ¡éªæ¨¡å¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_BillBarCode_BillCheck_Json")]
			@@ -4650,7 +7846,49 @@

			#endregion

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

			/// <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 æ«æç©ææ¡ç 20251225

			/// <summary>
			/// ç©ææ¡ç ææ¬æ¡ æ ¡éªæ«ç è°ç¨ æ ¡éªæ¨¡å¼
			@@ -4658,19 +7896,228 @@
			/// <returns></returns>
			[Route("WEBSController/get_CheckTypeByBarCode_BillCheck_Json")]
			[HttpGet]
			public Object get_CheckTypeByBarCode_BillCheck_Json(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, Int64 HStockOrgID)
			public Object get_CheckTypeByBarCode_BillCheck_Json(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			string sJXCode = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sAutoBarCode = "N"; //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			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.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//çäº§å¥åºå
			else if (HBillType == "1202")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å¶ä»å¥åºå
			else if (HBillType == "1203")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//éå®åºåºå
			else if (HBillType == "1205")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å¶ä»åºåºå
			else if (HBillType == "1206")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å§å¤é¢æå
			else if (HBillType == "1211")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//çäº§è¡¥æå
			else if (HBillType == "1254")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å§å¤è¡¥æå
			else if (HBillType == "1255")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//éè´éæå
			else if (HBillType == "1239")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_POStockInBackBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//çäº§éåºå
			else if (HBillType == "1245")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_ProductInBackBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//çäº§éæå
			else if (HBillType == "1244")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MateOutBackBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//éå®éè´§å
			else if (HBillType == "1247")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_SellOutBackBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å§å¤éæå
			else if (HBillType == "1238")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBackBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			#endregion

			if (oSystemParameter.omodel.WMS_CampanyName == "å®ç") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			@@ -4682,8 +8129,17 @@
			}
			try
			{
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (sAutoBarCode == "Y")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ«ç©ææ¡ç æ¨¡å¼ï¼æ éæ«æç©ææ¡ç ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//ååæ®ä¸ºæ«ç çæï¼æ ¡éªæ¶ä¸çææ¡ç è®°å½ï¼åªå¯¹åæ«æçæ¡ç è¿è¡æ ¸å¯¹
			if (sSourceBarCodeCtl == "Y")
			else if (sSourceBarCodeCtl == "Y")
			{
			WebSoBar = oWebs.get_BillBarCode_Verify(HBillID, HBillNo, HBillType, sJXCode, HQty, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			@@ -4706,11 +8162,19 @@
			//ååæ®éæ«ç çæï¼æ ¡éªæ¶çææ¡ç è®°å½
			else
			{
			WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck_New(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, 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 if (WebSoBar.HRemark == "ä»æç¤º")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 2;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			@@ -4732,13 +8196,143 @@
			objJsonResult.Message = "æ ¡éªæ¨¡å¼ï¼æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ«æç©ææ¡ç å¯ç¨åè¿ååºä»æç¤ºæ§å¶ï¼æ¡ç ä¸å¨åè¿ååºåè¡¨ä¸åè®¸æ«æåå¥ 20251225

			/// <summary>
			/// å¯ç¨åè¿ååºä»æç¤ºæ§å¶ï¼æ¡ç ä¸å¨åè¿ååºåè¡¨ä¸ åå¥æ¡ç åºå¥åºä¸´æ¶è¡¨
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json")]
			[HttpGet]
			public Object get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			string sJXCode = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "å®ç") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			{
			sJXCode = POStockInBillController.JX_Json(sBarCode, HBillID, HBillType, HStockOrgID, HBillNo, HMaker);
			}
			else
			{
			sJXCode = sBarCode;
			}
			try
			{
			WebSoBar = oWebs.get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, 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;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

			/// <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], //è¿åå½åææ«ææ¡ç æç»ä¿¡æ¯ï¼1ï¼
			FIFOlist = ds.Tables[2], //è¿ååè¿ååºåè¡¨ä¿¡æ¯ï¼2ï¼
			};
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -4797,6 +8391,50 @@

			#endregion

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

			/// <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;
			}
			}
			}

			#endregion

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

			/// <summary>
			@@ -4809,10 +8447,10 @@
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID,ref sErrMsg) == true)
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			//éå®åºåºå
			sSourceBarCodeCtl = "Y";
			@@ -4861,7 +8499,116 @@

			#endregion

			#region ç¼åæ¨¡å è¿åç¼ååè¡¨ä¿¡æ¯
			#region æ«ç æ¨¡å éåºåè½æé®è°ç¨ æ´æ°åè¿ååºä¸´æ¶è¡¨ç¶æï¼æ´æ° HlineStatus =1ï¼ 20251225

			/// <summary>
			/// æ«ç æ¨¡åï¼éåºæ¶æ´æ°åè¿ååºä¸´æ¶è¡¨ç¶æ HlineStatus
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_UPDateFIFOTmp_BillCheck_Json")]
			[HttpGet]
			public object set_UPDateFIFOTmp_BillCheck_Json(long HInterID, string HBillType, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sFIFOCtl = "N"; //åè¿ååºæ§å¶ï¼1ãä¸æ§å¶ä»æ¾ç¤ºä¸æ¶æ¸å 2ãä¸¥æ ¼æ§å¶åè¿ååº 3ãä»æç¤ºåæ¾ç¤ºä¸æ¶æ¸å 4ãä¸æ¾ç¤ºä¸æ¶æ¸åä¹ä¸æ§å¶ï¼

			#region ç³»ç»åæ°è·å
			//çäº§é¢æå-åè¿ååºæ§å¶
			if (HBillType == "1204"
			&& oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "N" //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			&& oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "N" //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			&& (oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "1" \|\| oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "2" \|\| oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl == "3"))
			{
			sFIFOCtl = "Y";
			}
			//éå®åºåºå-åè¿ååºæ§å¶
			if (HBillType == "1205"
			&& oSystemParameter.omodel.Kf_SellOutBillCheck_AutoBarCode.ToUpper() == "N" //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			&& oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "N" //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			&& (oSystemParameter.omodel.Kf_SellOutBillCheck_FIFOCtl == "1" \|\| oSystemParameter.omodel.Kf_SellOutBillCheck_FIFOCtl == "2" \|\| oSystemParameter.omodel.Kf_SellOutBillCheck_FIFOCtl == "3"))
			{
			sFIFOCtl = "Y";
			}
			//å¶ä»åºåºå-åè¿ååºæ§å¶
			if (HBillType == "1206"
			&& oSystemParameter.omodel.Kf_OtherOutBillCheck_AutoBarCode.ToUpper() == "N" //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			&& oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl.ToUpper() == "N" //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			&& (oSystemParameter.omodel.Kf_OtherOutBillCheck_FIFOCtl == "1" \|\| oSystemParameter.omodel.Kf_OtherOutBillCheck_FIFOCtl == "2" \|\| oSystemParameter.omodel.Kf_OtherOutBillCheck_FIFOCtl == "3"))
			{
			sFIFOCtl = "Y";
			}
			//å§å¤åºåºå-åè¿ååºæ§å¶
			if (HBillType == "1211"
			&& oSystemParameter.omodel.Kf_EntrustOutBillCheck_AutoBarCode.ToUpper() == "N" //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			&& oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl.ToUpper() == "N" //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			&& (oSystemParameter.omodel.Kf_EntrustOutBillCheck_FIFOCtl == "1" \|\| oSystemParameter.omodel.Kf_EntrustOutBillCheck_FIFOCtl == "2" \|\| oSystemParameter.omodel.Kf_EntrustOutBillCheck_FIFOCtl == "3"))
			{
			sFIFOCtl = "Y";
			}
			//çäº§è¡¥æå-åè¿ååºæ§å¶
			if (HBillType == "1254"
			&& oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_AutoBarCode.ToUpper() == "N" //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			&& oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "N" //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			&& (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_FIFOCtl == "1" \|\| oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_FIFOCtl == "2" \|\| oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_FIFOCtl == "3"))
			{
			sFIFOCtl = "Y";
			}
			//å§å¤è¡¥æå-åè¿ååºæ§å¶
			if (HBillType == "1255"
			&& oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode.ToUpper() == "N" //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			&& oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "N" //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			&& (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl == "1" \|\| oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl == "2" \|\| oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl == "3"))
			{
			sFIFOCtl = "Y";
			}
			//ç´æ¥è°æ¨å-åè¿ååºæ§å¶
			if (HBillType == "1207"
			&& oSystemParameter.omodel.Kf_MoveStockBillCheck_AutoBarCode.ToUpper() == "N" //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			&& oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl.ToUpper() == "N" //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			&& (oSystemParameter.omodel.Kf_MoveStockBillCheck_FIFOCtl == "1" \|\| oSystemParameter.omodel.Kf_MoveStockBillCheck_FIFOCtl == "2" \|\| oSystemParameter.omodel.Kf_MoveStockBillCheck_FIFOCtl == "3"))
			{
			sFIFOCtl = "Y";
			}
			#endregion

			try
			{
			if (sFIFOCtl == "Y")
			{
			//æ´æ°åè¿ååºä¸´æ¶è¡¨ç¶æ
			oCn.RunProc("EXEC h_p_WMS_UPDateICInventory_FIFO_Tmp_BillCheck " + HInterID.ToString() + ",'" + HBillType + "'");
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ´æ°åè¿ååºä¸´æ¶è¡¨HlineStatuså¼å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

			/// <summary>
			/// è¿åç¼ååè¡¨ä¿¡æ¯ æ ¡éªæ¨¡å¼
			@@ -4912,6 +8659,252 @@

			#endregion

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

			/// <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'ä¸ºæ ¸å¯¹ï¼
			string sFIFOCtl = "4"; //åè¿ååºæ§å¶ï¼1ãä¸æ§å¶ä»æ¾ç¤ºä¸æ¶æ¸å 2ãä¸¥æ ¼æ§å¶åè¿ååº 3ãä»æç¤ºåæ¾ç¤ºä¸æ¶æ¸å 4ãä¸æ¾ç¤ºä¸æ¶æ¸åä¹ä¸æ§å¶ï¼

			#region ç³»ç»åæ°è·å
			//éè´å¥åºå
			if (HBillType == "1201")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§å¥åºå
			else if (HBillType == "1202")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»å¥åºå
			else if (HBillType == "1203")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl;
			}
			//éå®åºåºå
			else if (HBillType == "1205")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_SellOutBillCheck_FIFOCtl;
			}
			//å¶ä»åºåºå
			else if (HBillType == "1206")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_OtherOutBillCheck_FIFOCtl;
			}
			//å§å¤é¢æå
			else if (HBillType == "1211")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_EntrustOutBillCheck_FIFOCtl;
			}
			//çäº§è¡¥æå
			else if (HBillType == "1254")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_FIFOCtl;
			}
			//å§å¤è¡¥æå
			else if (HBillType == "1255")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl;
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_MoveStockBillCheck_FIFOCtl;
			}
			//éè´éæå
			else if (HBillType == "1239")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§éåºå
			else if (HBillType == "1245")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§éæå
			else if (HBillType == "1244")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//éå®éè´§å
			else if (HBillType == "1247")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤éæå
			else if (HBillType == "1238")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "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();
			//å é¤åè¿ååºä¸´æ¶è¡¨è®°å½
			if (sFIFOCtl == "1" \|\| sFIFOCtl == "2" \|\| sFIFOCtl == "3")
			{
			oCn.RunProc("Delete from Kf_ICInventory_FIFO_Tmp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			//å é¤æ¡ç åºå¥åºä¸´æ¶è¡¨è®°å½
			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;
			}
			}

			#endregion

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

			/// <summary>
			@@ -4927,7 +8920,7 @@
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			//éå®åºåºå
			sSourceBarCodeCtl = "Y";
			@@ -4988,6 +8981,272 @@

			#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.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§å¥åºå
			else if (HBillType == "1202")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»å¥åºå
			else if (HBillType == "1203")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//éå®åºåºå
			else if (HBillType == "1205")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»åºåºå
			else if (HBillType == "1206")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤é¢æå
			else if (HBillType == "1211")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§è¡¥æå
			else if (HBillType == "1254")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤è¡¥æå
			else if (HBillType == "1255")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//éè´éæå
			else if (HBillType == "1239")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§éåºå
			else if (HBillType == "1245")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§éæå
			else if (HBillType == "1244")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//éå®éè´§å
			else if (HBillType == "1247")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤éæå
			else if (HBillType == "1238")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "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
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region ç¼åæ¨¡å å·²ä¸ä¼ åè¡¨çé¢ï¼æ¤éåè½

			/// <summary>
			@@ -5003,7 +9262,7 @@
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			//éå®åºåºå
			sSourceBarCodeCtl = "Y";
			@@ -5051,15 +9310,64 @@
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ ¡éªæ¨¡å è¿åæºååè¡¨ä¿¡æ¯
			/// <summary>
			/// æºååè¡¨ä¿¡æ¯ï¼æ ¹æ®åæ®ç±»åãç»ç»IDè¿åæºååè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetCheckBillList_Json")]
			[HttpGet]
			public object GetCheckBillList_Json(string HBillType, Int64 HStockOrgID, string HBillNo, string HMater, string HCustom)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			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
			@@ -5079,13 +9387,20 @@
			{
			try
			{
			WebS.ClsGy_BarCodeBill_WMS_Model WebSoBarModel = new WebS.ClsGy_BarCodeBill_WMS_Model();
			WebSoBarModel = oWebs.get_PackBarCode_PackUnionBill(HInterID, HBillNo, HBillType, HBarCode_Pack, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBarModel == null)
			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode_Pack + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddPackBarCode_PackUnionBill");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			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;
			}
			@@ -5093,8 +9408,104 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBarModel;
			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 çäº§ç»æåæ¨¡å æ«æç®±ï¼æï¼æ¡ç 20250630

			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æç®±ï¼æï¼æ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json")]
			[HttpGet]
			public object get_PackBarCode_PackUnionBill_New_Json(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill_New " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "'", "h_p_WMS_AddPackBarCode_PackUnionBill_New");
			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 çäº§ç»æåæ¨¡å æ«æå®¢æ·ç®±ï¼æï¼æ¡ç -å¯è´è£ç®±å 20251103

			[Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json_Cus")]
			[HttpGet]
			public object Get_PackBarCode_PackUnionBill_New_Json_Cus(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill_New_Cus " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HSourceBillNo + "'", "h_p_WMS_AddPackBarCode_PackUnionBill_New_Cus");
			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;
			}
			}
			@@ -5144,6 +9555,216 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region çäº§ç»æåæ¨¡å æ«æææ¡ç å¯¹åºæ¡ç 20250630

			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æææ¡ç å¯¹åºæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_BarCode_PackUnionBill_New_Json")]
			[HttpGet]
			public object get_BarCode_PackUnionBill_New_Json(string HBarCode, Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HMaterNumber_Pack, string HMaker, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sMaterialCtl = "Y"; //ç»æç©ææ¯å¦ä¸è´æ§å¶ï¼Yä¸ºæ§å¶ï¼
			string sSourceBillTypeCtl = "Y"; //æªå¥åºæ¡ç è¿è¡ç»ææ¶ï¼è¿è¡åæºåç±»åæ§å¶ï¼Yä¸ºæ§å¶ï¼
			string sSourceBillNoCtl = "Y"; //æªå¥åºæ¡ç è¿è¡ç»ææ¶ï¼è¿è¡åæºåæ§å¶ï¼Yä¸ºæ§å¶ï¼
			sMaterialCtl = oSystemParameter.omodel.Sc_PackUnionBill_MaterialCtl.ToUpper();
			sSourceBillTypeCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillTypeCtl.ToUpper();
			sSourceBillNoCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillNoCtl.ToUpper();

			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New");
			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 = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			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;
			}
			}

			#endregion

			#region çäº§ç»æåæ¨¡å æ«æææ¡ç å¯¹åºæ¡ç --xiaowei 20250630

			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æææ¡ç å¯¹åºæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_BarCode_PackUnionBill_New_Json_xiaowei")]
			[HttpGet]
			public object get_BarCode_PackUnionBill_New_Json_xiaowei(string HBarCode, Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HMaterNumber_Pack, string HMaker, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sMaterialCtl = "Y"; //ç»æç©ææ¯å¦ä¸è´æ§å¶ï¼Yä¸ºæ§å¶ï¼
			string sSourceBillTypeCtl = "Y"; //æªå¥åºæ¡ç è¿è¡ç»ææ¶ï¼è¿è¡åæºåç±»åæ§å¶ï¼Yä¸ºæ§å¶ï¼
			string sSourceBillNoCtl = "Y"; //æªå¥åºæ¡ç è¿è¡ç»ææ¶ï¼è¿è¡åæºåæ§å¶ï¼Yä¸ºæ§å¶ï¼
			sMaterialCtl = oSystemParameter.omodel.Sc_PackUnionBill_MaterialCtl.ToUpper();
			sSourceBillTypeCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillTypeCtl.ToUpper();
			sSourceBillNoCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillNoCtl.ToUpper();

			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New_xiaowei '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New");
			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 = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			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;
			}
			}

			#endregion

			#region çäº§ç»æåæ¨¡å æ«æå®¢æ·ææ¡ç å¯¹åºæ¡ç -å¯è´è£ç®±å 20251103

			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æææ¡ç å¯¹åºæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_BarCode_PackUnionBill_New_Json_Cus")]
			[HttpGet]
			public object Get_BarCode_PackUnionBill_New_Json_Cus(string HBarCode, Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HMaterNumber_Pack, string HMaker, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sMaterialCtl = "Y"; //ç»æç©ææ¯å¦ä¸è´æ§å¶ï¼Yä¸ºæ§å¶ï¼
			string sSourceBillTypeCtl = "Y"; //æªå¥åºæ¡ç è¿è¡ç»ææ¶ï¼è¿è¡åæºåç±»åæ§å¶ï¼Yä¸ºæ§å¶ï¼
			string sSourceBillNoCtl = "Y"; //æªå¥åºæ¡ç è¿è¡ç»ææ¶ï¼è¿è¡åæºåæ§å¶ï¼Yä¸ºæ§å¶ï¼
			sMaterialCtl = oSystemParameter.omodel.Sc_PackUnionBill_MaterialCtl.ToUpper();
			sSourceBillTypeCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillTypeCtl.ToUpper();
			sSourceBillNoCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillNoCtl.ToUpper();

			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New_Cus '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New_Cus");
			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 = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			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;
			}
			@@ -5218,7 +9839,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.Message = "å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -5338,6 +9959,29 @@

			#endregion

			#endregion

			#region æ ¹æ®snç å¯»æ¾å¯¹åºçä¸ç®±ç
			[Route("WEBSController/getMiddleCodeBySn")]
			[HttpGet]
			public object getMiddleCodeBySn(string HBarCode, int HStockOrgID)
			{
			DataSet dss = oCn.RunProcReturn("select * from Gy_CaseCodeRelation where HBarCode='" + HBarCode + "'", "Gy_CaseCodeRelation");

			if (dss.Tables[0].Rows[0]["HCaseCode"].ToString() == "" \|\| dss == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æªæ¾å°snç æå¯¹åºçä¸ç®±ç ";
			objJsonResult.data = null;
			return objJsonResult;
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = dss.Tables[0];
			return objJsonResult;
			}
			#endregion

			#endregion
			@@ -5475,6 +10119,102 @@
			// return objJsonResult;
			// }
			//}

			#endregion

			#region æç®±ï¼ææï¼æ¨¡å æ«æææ¡ç 20250702

			/// <summary>
			///æç®±ï¼ææï¼æ¨¡å æ«æææ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_PackBarCode_UnPackUnionBill_Json")]
			[HttpGet]
			public object Get_PackBarCode_UnPackUnionBill_Json(string HBarCode_Pack, string HBillSubType)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_UnPackUnionBill_New '" + HBarCode_Pack + "','" + HBillSubType + "'", "h_p_WMS_AddPackBarCode_UnPackUnionBill_New");
			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][0]) == 0)
			{
			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;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			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 æç®±ï¼ææï¼æ¨¡å ä¸ä¼ å é¤ç»æåä¿¡æ¯ 20250702

			/// <summary>
			/// ä¸ä¼ å é¤ç»æåä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SaveUnPackUnionBill_Json")]
			[HttpGet]
			public object set_SaveUnPackUnionBill_Json(long HInterID, string HBillNo, string HBarCode_Pack, string HMaker)
			{
			try
			{
			string HIPAddress = ""; //IP
			string HModCaption = "WMS-æç®±ï¼ææï¼æ¨¡å"; //æ¨¡åå
			ds = oCn.RunProcReturn("exec h_p_Sc_PackUnionBill_Delete_New " + HInterID.ToString() + ",'" + HBillNo + "','" + HBarCode_Pack + "','" + HMaker + "','" + ComputerName + "','" + HIPAddress + "','" + HModCaption + "'", "h_p_Sc_PackUnionBill_Delete_New");

			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

			@@ -5969,6 +10709,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>
			/// æ«æç©ææ¡ç
			@@ -5980,6 +10769,179 @@
			{
			try
			{
			ds = oCn.RunProcReturn("select * from Gy_BarCodeBill where HBarcode='" + HBarCode + "'", "Gy_BarCodeBill");
			if (ds.Tables[0].Rows.Count == 0)
			{
			DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
			string sErrMsg = "";
			oSystemParameter.ShowBill(ref sErrMsg);

			if (oSystemParameter.omodel.WMS_CampanyName == "æå·æ¯è«å°")
			{
			if (!dal.GetInfoByNumber(HBarCode))
			{
			//æ¡ç è§£æ
			string[] str = HBarCode.Split('@');

			if (str[0] != "CMR" && str[0] != "SRM")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¡ç è§£æå¤±è´¥,è¯·ç¡®è®¤æ¡ç æ¯å¦æ£ç¡®!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			int HOrgIDs = 0;
			//æ¥è¯¢ç»ç»
			DataSet ds = oCn.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + str[1] + "' ", "Xt_ORGANIZATIONS");
			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¡ç è§£æå¤±è´¥,è¯·ç¡®è®¤æ¡ç ç»ç»æ¯å¦æ£ç¡®!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			HOrgIDs = int.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
			}

			string HMaterNames = "";
			string HMaterModels = "";
			string HMaterIDs = "0";
			//æ¥è¯¢ç©æ
			ds = oCn.RunProcReturn("select * from Gy_Material where HNumber='" + str[4] + "' and HUSEORGID=" + HOrgIDs, "Gy_Material");


			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¡ç è§£æå¤±è´¥,è¯·ç¡®è®¤æ¡ç ç©ææ¯å¦æ£ç¡®!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			HMaterIDs = ds.Tables[0].Rows[0]["HItemID"].ToString();
			HMaterNames = ds.Tables[0].Rows[0]["HName"].ToString();
			HMaterModels = ds.Tables[0].Rows[0]["HModel"].ToString();

			}
			string HSupIDs = "0";
			//æ¥è¯¢ä¾åºå
			ds = oCn.RunProcReturn("select * from Gy_Supplier where HNumber='" + str[2] + "' and HUSEORGID=" + HOrgIDs, "Gy_Supplier");
			if (ds.Tables[0].Rows.Count == 0)
			{
			//sErrMsg = "æ¡ç è§£æå¤±è´¥,è¯·ç¡®è®¤æ¡ç ä¾åºåæ¯å¦æ£ç¡®!";
			//return null;
			}
			else
			{
			HSupIDs = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}

			string HSourceBillNos = "0";
			string HInnerBillNos = "";
			//æ¥è¯¢åé¨éè´è®¢åå·
			ds = oCn.RunProcReturn(@" select * from h_v_IF_POInStockList where éè´è®¢åå·= '" + str[3] + "' ", "h_v_IF_POInStockList");
			if (ds.Tables[0].Rows.Count == 0)
			{
			//sErrMsg = "æ¡ç è§£æå¤±è´¥,è¯·ç¡®è®¤æ¡ç åé¨éè´è®¢åå·æ¯å¦æ£ç¡®!";
			//return null;
			HInnerBillNos = str[3];
			}
			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]);

			//æ¥æè·åæ¹å¼
			string sDate = DateTime.Now.ToString();
			string HWei = "0"; //å°¾æ°
			string HBarCodeType = "æ¹æ¬¡æ¡ç ";
			Int64 HMaterID = int.Parse(HMaterIDs);
			Int64 HAuxPropID = 0;
			Int64 HUnitID = int.Parse(HUnitIDs);
			double HQty2 = HQty;
			string HBatchNo2 = str[5];
			Int64 HSupID = int.Parse(HSupIDs);
			Int64 HGroupID = 0;
			int HPrintQty = 0;
			Int64 HSourceInterID = int.Parse(HSourceInterIDs);
			Int64 HSourceEntryID = int.Parse(HSourceEntryIDs);
			string HSourceBillNo = HSourceBillNos;
			//HSourceBillType = "1102";
			Int64 HBarcodeNo = 0; //æå·
			Int64 HBarcodeQtys = 0; //æ»ææ°
			Int64 HDeptID = 0;
			//Int64 HWhID = 0;
			//Int64 HSPID = 0;
			string HRemark = "æ¡ç è§£æ";
			string HMaterName = HMaterNames;
			string HMaterModel = HMaterModels;
			string HPinfan = "";
			string HMTONo = "";
			Int64 HCusID = 0;
			string HCusType = "";
			DateTime HEndDate = DateTime.Now;
			string HWorkLineName = "";
			string HSeOrderBillNo = "";
			string HInnerBillNo = HInnerBillNos;
			bool HGiveAwayFlag = false;
			Int64 HEntryID = 1;
			Int64 HInterIDs = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
			int HOrgID = HOrgIDs;
			string HSourceBillType = "";


			oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
			",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
			",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
			",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
			",HGiveAwayFlag " +
			",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
			",HProduceDate,HExpiryDate " +
			") values ("
			+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
			+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
			+ ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
			+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + ",0,0,'" + HRemark + "'"
			+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
			+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterIDs.ToString() + "," + HEntryID.ToString() + ""
			+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
			+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','','')");


			}
			}
			}

			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_MaterToSource " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode + "','" + HMaker + "'", "h_p_WMS_AddBarCode_MaterToSource");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			@@ -6240,6 +11202,611 @@
			#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

			#endregion


			#region ä¸æ¶ãä¸æ¶åãå°è½¦éå®æ¨¡åè°ç¨æ¹æ³ 20250520

			#region ä¸æ¶åæ«ç æ¨¡å æ«ææºåæ¡ç è°ç¨æ¹æ³
			/// <summary>
			/// æ«ææºåæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_SourceBarCode_MaterialLower_Json")]
			[HttpGet]
			public object get_SourceBarCode_MaterialLower_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddSourceBarCode_MaterialLower " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddSourceBarCode_MaterialLower");
			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
			{
			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/Get_BarCode_WorkShop_Json")]
			[HttpGet]
			public object Get_BarCode_WorkShop_Json(string HBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool SourceFlag, string HSourceBillType, string HCarBarCode, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sBatchNoCtl = "N"; //æ¯å¦è¿è¡æ¹å·æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹æ¹å·ï¼
			string sMustQtyCtl = "å°äºçäºåºæ¶"; //åºæ¶æ°éæ§å¶ï¼å°äºçäºåºæ¶ãå®å¨çäºåºæ¶ãä¸æ§å¶ï¼

			//ä¸æ¶å
			if (HBillType == "1252")
			{
			//æ¯å¦è¿è¡æ¹å·æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹æ¹å·ï¼
			if (oSystemParameter.omodel.Kf_MaterialLowerBill_BatchNoCtl.ToUpper() == "Y")
			{
			sBatchNoCtl = "Y";
			}
			//æ«ç æ°éè½å¦å¯è¶åæ®æ°éæ§å¶ï¼å°äºçäºåºæ¶ãå®å¨çäºåºæ¶ãä¸æ§å¶ï¼
			if (oSystemParameter.omodel.Kf_MaterialLowerBill_MustQtyCtl == "å°äºçäºåºæ¶")
			{
			sMustQtyCtl = "å°äºçäºåºæ¶";
			}
			else if (oSystemParameter.omodel.Kf_MaterialLowerBill_MustQtyCtl == "å®å¨çäºåºæ¶")
			{
			sMustQtyCtl = "å®å¨çäºåºæ¶";
			}
			else
			{
			sMustQtyCtl = "ä¸æ§å¶";
			}
			}

			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_WorkShop_TestByLLJ " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode + "'," + HQty.ToString() + ",'" + HSourceBillType + "'," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "'," + HStockOrgID.ToString() + ",'" + HMaker + "'," + DBUtility.ClsPub.BoolToString(SourceFlag) + ",'" + sBatchNoCtl + "','" + sMustQtyCtl + "'", "h_p_WMS_AddBarCode_WorkShop");
			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;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region è½¦é´ç©æåºåæ¥è¯¢è°ç¨æ¹æ³
			/// <summary>
			/// è·åè½¦é´ç©ææå¨ä½ç½®
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetICInventory_WorkShop_Json")]
			[HttpGet]
			public object GetICInventory_WorkShop_Json(string HBillType, Int64 HMaterID, Int64 HAuxPropID, string HBatchNo, Int64 HProcessExchangeInterID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_KF_ICInventory_WorkShop '" + HBillType + "'," + HMaterID.ToString() + "," + HAuxPropID.ToString() + ",'" + HBatchNo + "'," + HProcessExchangeInterID.ToString(), "h_p_KF_ICInventory_WorkShop");
			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/MaterialLowerBill_MaterInv")]
			[HttpGet]
			public object MaterialLowerBill_MaterInv(long HInterID, string HBillNo, string HBillType, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_Kf_MaterialInventory " + HInterID + "," + HBillType + "," + HStockOrgID, "h_p_Kf_MaterialInventory");
			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 å°è½¦æ«ç ç»å®æ¶ï¼å¤æå¶æ¯å¦å·²ç»å®åºä½ä¿¡æ¯
			[Route("WEBSController/CarIsused")]
			[HttpGet]
			public object CarIsused(string HCarBarCode)
			{
			try
			{
			ds = oCn.RunProcReturn("select * from h_v_Gy_MouldIsUsed where å°è½¦æ¡ç ='" + HCarBarCode + "'", "h_v_Gy_MouldIsUsed");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å°è½¦æ¡ç ï¼" + HCarBarCode + "ï¼ä¸å¨ç³»ç»ä¸ï¼è¯·æ ¸å¯¹ï¼";
			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 = "æ¥è¯¢å°è½¦å¨åºç¶æå¤±è´¥errï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region å°è½¦ç»å®æºå°æ¶ï¼å¤æææ«æºå°ï¼è®¾å¤ï¼æ¡ç æ¯å¦åå¨äºè®¾å¤æ¡£æ¡
			[Route("WEBSController/IsExistEquip")]
			[HttpGet]
			public object IsExistEquip(string HEquipBarCode)
			{
			try
			{
			ds = oCn.RunProcReturn("select * from h_v_Gy_EquipIsExist where æºå°æ¡ç ='" + HEquipBarCode + "'", "h_v_Gy_EquipIsExist");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºå°æ¡ç ï¼" + HEquipBarCode + "ï¼ä¸å¨ç³»ç»ä¸ï¼è¯·æ ¸å¯¹ï¼";
			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 = "æ¥è¯¢æºå°ä¿¡æ¯å¤±è´¥errï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#endregion



			#region ç©ææ¡ç æ¥è¯¢è°ç¨æ¹æ³
			/// <summary>
			/// è·åæ¡ç ä¿¡æ¯
			@@ -6247,11 +11814,12 @@
			/// <returns></returns>
			[Route("WEBSController/GetGy_BarCodeBill_QiaoYi_PDA_Json")]
			[HttpGet]
			public object GetGy_BarCodeBill_QiaoYi_PDA_Json(string sWhere)
			public object GetGy_BarCodeBill_QiaoYi_PDA_Json(string sBarCode)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBillList_QiaoYi '" + sWhere+ "'", "h_p_Gy_BarCodeBillList_QiaoYi");
			ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBillList_QiaoYi '" + sBarCode + "'", "h_p_Gy_BarCodeBillList_QiaoYi");
			//ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBillList_QiaoYi2 '" + sBarCode + "','" + sBarCodeOutDate + "','" + sCustomerName + "','" + sSellOutBillNo + "'", "h_p_Gy_BarCodeBillList_QiaoYi2");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -6439,6 +12007,70 @@
			}
			#endregion

			#region [æ ¹æ®åæ®å· ç©æç¼ç ç©æåç§° çäº§è®¢å å·¥åº é¨é¨è·å å·¥åºæµè½¬å¡]
			/// <summary>
			/// è·åæ¡ç ä¿¡æ¯ æ·»å å·¥åº é¨é¨æ¥è¯¢æ¡ä»¶
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetMES_ProcessExchangeBillList_APP_HaiCheng")]
			[HttpGet]
			public object GetMES_ProcessExchangeBillList_APP_HaiCheng(string HBillNo, string HNumber, string HName, string HICMOBillNo, string user, string HProcID, string HDeptID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_MES_ProcessExchangeBillList_APP_HaiCheng " +
			"@HBillNo = N'" + HBillNo + "', " +
			"@HNumber = N'" + HNumber + "', " +
			"@HName = N'" + HName + "', " +
			"@HICMOBillNo = N'" + HICMOBillNo + "'," +
			"@HProcID = N'" + HProcID + "', " +
			"@HDeptID = N'" + HDeptID + "'"
			, "h_p_MES_ProcessExchangeBillList_PDA_QiaoYi");
			if ((bool)ds.Tables[1].Rows[0]["returntype"] == false)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = ds.Tables[1].Rows[0]["mesg"].ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (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>
			/// æ¥çæç»
			@@ -6450,7 +12082,7 @@
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_MES_ProcessExchangeSubBillList_PDA_QiaoYi '" + HInterID+ "'", "h_p_MES_ProcessExchangeSubBillList_PDA_QiaoYi");
			ds = oCn.RunProcReturn("exec h_p_MES_ProcessExchangeSubBillList_PDA_QiaoYi '" + HInterID + "'", "h_p_MES_ProcessExchangeSubBillList_PDA_QiaoYi");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -6572,7 +12204,7 @@
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //è·åå°DataColumnåå¯¹è±¡çåå
			}
			if (HDATA=="HSPE")
			if (HDATA == "HSPE")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -6581,7 +12213,7 @@
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else if (HDATA == "HICM")
			else if (HDATA == "HICM")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -6590,7 +12222,7 @@
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -7087,13 +12719,13 @@
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}



			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -7113,7 +12745,7 @@
			/// <returns></returns>
			[Route("WEBSController/UpdateKf_ICInvBal")]
			[HttpGet]
			public object UpdateKf_ICInvBal( )
			public object UpdateKf_ICInvBal()
			{
			try
			{
			@@ -7136,8 +12768,2429 @@
			}
			}
			#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>
			/// çäº§ç»æåæ¨¡å æ«æææ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Gy_getCusBarCodeBill_rushBarCode")]
			[HttpGet]
			public object Gy_getCusBarCodeBill_rushBarCode(Int64 HInterID, string HBillNo, string HBillType, string HBarCode, string HMaker, Int64 HStockOrgID, string HBarCode_Pre)
			{
			DataSet ds;
			try
			{
			//æ«æåæ§å¶============================================================================================================================
			string sql_beforeRushBarCode = "exec h_p_Gy_getCusBarCodeBill_beforeRushBarCode " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode + "'," + HStockOrgID;
			ds = oCn.RunProcReturn(sql_beforeRushBarCode, "h_p_Gy_getCusBarCodeBill_beforeRushBarCode");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æå¤±è´¥ï¼åå ï¼æ«æåæ§å¶å¤±è´¥ï¼è¯·å¯»æ¾ç½ç»ç®¡çäººå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string HBack = ds.Tables[0].Rows[0]["HBack"].ToString();
			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 = "insert into Gy_getCusBarCodeBill_Temp" +
			"(HInterID,HBillNo,HBillType,HDate,HBarCode,HQty,HOrgID,HMaker,HBarCode_Pre) " +
			"values(" +
			"" + HInterID + "" +
			",'" + HBillNo + "'" +
			",'" + HBillType + "'" +
			"," + "getdate()" + "" +
			",'" + HBarCode + "'" +
			"," + 0 + "" +
			"," + HStockOrgID + "" +
			",'" + HMaker + "'" +
			",'" + HBarCode_Pre + "'" +
			")";
			oCn.RunProc(sql);


			//æ«æåæ§å¶============================================================================================================================
			string sql_afterRushBarCode = "exec h_p_Gy_getCusBarCodeBill_afterRushBarCode " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode + "'," + HStockOrgID;
			ds = oCn.RunProcReturn(sql_afterRushBarCode, "h_p_Gy_getCusBarCodeBill_afterRushBarCode");

			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_getCusBarCodeBill_rushedBarCodeList")]
			[HttpGet]
			public object Gy_getCusBarCodeBill_rushedBarCodeList(long HInterID, string HBillNo, string HBillType, long HOrgID)
			{
			try
			{
			string sql = "select * from Gy_getCusBarCodeBill_Temp where HInterID = " + HInterID + " and 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

			#region å®¢æ·æ¡ç æ«æè®°å½å å é¤æ«ç è®°å½

			/// <summary>
			/// å é¤æç»è¡¨ä½éä¸è¡è®°å½
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Gy_getCusBarCodeBill_DeleteRushedBarCodeList")]
			[HttpGet]
			public object Gy_getCusBarCodeBill_DeleteRushedBarCodeList(Int64 HInterID, string HBillNo, string HBillType, string HBarCode, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			string sql = "delete from Gy_getCusBarCodeBill_Temp " +
			"where HInterID = " + HInterID + "" +
			" and HBillNo = '" + HBillNo + "'" +
			" and HBillType = '" + HBillType + "'" +
			" and HOrgID = " + 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_getCusBarCodeBill_submitRushedBarCodeList")]
			[HttpGet]
			public object Gy_getCusBarCodeBill_submitRushedBarCodeList(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
			{

			DataSet ds;
			try
			{
			//ä¸ä¼ åæ§å¶============================================================================================================================
			string sql_beforeSubmitRushedBarCodeList = "exec h_p_Gy_getCusBarCodeBill_beforeSubmitRushedBarCodeList " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID;
			ds = oCn.RunProcReturn(sql_beforeSubmitRushedBarCodeList, "h_p_Gy_getCusBarCodeBill_beforeSubmitRushedBarCodeList");

			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 = "insert into Gy_getCusBarCodeBillMain" +
			"(HYear,HPeriod,HBillType,HInterID,HDate,HBillNo,HBillStatus,HMaker,HMakeDate,HOrgID) " +
			"values(" +
			"Year(getdate())" +
			",Month(getdate())" +
			",'" + HBillType + "'" +
			"," + HInterID + "" +
			"," + "getdate()" + "" +
			",'" + HBillNo + "'" +
			"," + 1 + "" +
			",'" + HMaker + "'" +
			"," + "getdate()" + "" +
			"," + HStockOrgID + "" +
			")";

			oCn.RunProc(sql);


			//ä¸ä¼ åæ§å¶============================================================================================================================
			string sql_afterSubmitRushedBarCodeList = "exec h_p_Gy_getCusBarCodeBill_afterSubmitRushedBarCodeList " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID;
			ds = oCn.RunProcReturn(sql_afterSubmitRushedBarCodeList, "h_p_Gy_getCusBarCodeBill_afterSubmitRushedBarCodeList");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æäº¤å¤±è´¥ï¼åå ï¼æäº¤åæ§å¶å¤±è´¥ï¼è¯·å¯»æ¾ç½ç»ç®¡çäººå";
			objJsonResult.data = null;
			oCn.RollBack();
			return objJsonResult;
			}
			string HBack = ds.Tables[0].Rows[0]["HBack"].ToString();
			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 = "æäº¤æåï¼å·²çæåæ®ãHInterIDï¼" + HInterID + "ï¼åæ®å·ï¼" + 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;
			}
			}
			#endregion

			#region å®¢æ·æ¡ç æ«æè®°å½å è¿åç¼ååè¡¨ä¿¡æ¯

			/// <summary>
			/// è¿åç»æç¼ååè¡¨ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Gy_getCusBarCodeBill_TempList")]
			[HttpGet]
			public object Gy_getCusBarCodeBill_TempList(string HBillType, string HMaker, long HStockOrgID)
			{
			DataSet ds;
			try
			{
			string sql = "exec h_p_Gy_getCusBarCodeBill_TempList '" + HBillType + "','" + HMaker + "'," + HStockOrgID;
			ds = oCn.RunProcReturn(sql, "h_p_Gy_getCusBarCodeBill_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_getCusBarCodeBill_DeleteTempListNote")]
			[HttpGet]
			public object Gy_getCusBarCodeBill_DeleteTempListNote(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
			{
			DataSet ds;
			try
			{
			//å é¤åæ§å¶============================================================================================================================
			string sql_beforeDeleteTempListNote = "exec h_p_Gy_getCusBarCodeBill_beforeDeleteTempListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
			ds = oCn.RunProcReturn(sql_beforeDeleteTempListNote, "h_p_Gy_getCusBarCodeBill_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_getCusBarCodeBill_Temp where " +
			" HInterID = " + HInterID + "" +
			" and HBillNo = '" + HBillNo + "'" +
			" and HBillType = '" + HBillType + "'" +
			" and HOrgID = " + HStockOrgID + "" +
			" and HRelationInterID = " + 0 + "";
			oCn.RunProc(sql);

			//å é¤åæ§å¶============================================================================================================================
			string sql_afterDeleteTempListNote = "exec h_p_Gy_getCusBarCodeBill_afterDeleteTempListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
			ds = oCn.RunProcReturn(sql_afterDeleteTempListNote, "h_p_Gy_getCusBarCodeBill_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_getCusBarCodeBill_List")]
			[HttpGet]
			public object Gy_getCusBarCodeBill_List(string sWhere, string HMaker)
			{
			DataSet ds;
			try
			{
			string sql = "";

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

			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_getCusBarCodeBill_DeleteListNote")]
			[HttpGet]
			public object Gy_getCusBarCodeBill_DeleteListNote(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
			{
			DataSet ds;
			try
			{
			//æ¤éåæ§å¶============================================================================================================================
			string sql_beforeDeleteListNote = "exec h_p_Gy_getCusBarCodeBill_beforeDeleteListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
			ds = oCn.RunProcReturn(sql_beforeDeleteListNote, "h_p_Gy_getCusBarCodeBill_beforeDeleteListNote");

			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_getCusBarCodeBillMain where " +
			" HInterID = " + HInterID + "" +
			" and HBillNo = '" + HBillNo + "'" +
			" and HBillType = '" + HBillType + "'" +
			" and HOrgID = " + HStockOrgID + "";
			oCn.RunProc(sql);

			sql = "update Gy_getCusBarCodeBill_Temp set " +
			" HRelationInterID = 0 " +
			" where " +
			" HInterID = " + HInterID + "" +
			" and HBillNo = '" + HBillNo + "'" +
			" and HBillType = '" + HBillType + "'" +
			" and HOrgID = " + HStockOrgID + "";
			oCn.RunProc(sql);


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

			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_getCusBarCodeBillList")]
			[HttpGet]
			public object Gy_getCusBarCodeBillList(string sWhere, string user)
			{
			DataSet ds;
			try
			{
			string sql = "";

			if (sWhere == null \|\| sWhere == "")
			{
			sql = "select * from h_v_Gy_getCusBarCodeBillList_Query order by å¶åæ¥æ desc";
			ds = oCn.RunProcReturn(sql, "h_v_Gy_getCusBarCodeBillList_Query");
			}
			else
			{
			sql = "select * from h_v_Gy_getCusBarCodeBillList_Query where 1=1 " + sWhere + " order by å¶åæ¥æ desc";
			ds = oCn.RunProcReturn(sql, "h_v_Gy_getCusBarCodeBillList_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_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,FDOCUMENTSTATUS 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 "åçå¼å¸¸ï¼å¥åºç³è¯·ååæ¥è·åç»å½è´¦å·å¯ç å¤±è´¥ï¼";
			}
			var loginRet = InvokeHelper.Login();

			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.ToUpper() == "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 with(nolock) left join AIS20220609121235..TFKO_t_Cust100009 b with(nolock) on a.HSourceBillNo = b.FBillNo left join AIS20220609121235..TFKO_t_Cust_Entry100065 c with(nolock) on b.FID = C.FID and a.HBarcodeNo = c.FSEQ where HSourceBillNo = '{HSourceBillNo_TB}'");
			//æ§è¡æ´æ°è¯å¥
			oCn.RunProc(sql);

			}
			//å¤æçäº§å¥åºç³è¯·åæ¯å¦æ¯å®¡æ ¸ç¶æï¼è¥æªå®¡æ ¸åæ§è¡æäº¤å®¡æ ¸æ¹æ³
			else
			{
			//--Z æåï¼A åå»ºï¼B å®¡æ ¸ä¸ï¼C å·²å®¡æ ¸ï¼D éæ°å®¡æ ¸

			//è·åå¥åºç³è¯·ååæ®å·
			string HBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FBILLNO"]);
			//åè£çº¿çæççäº§å¥åºç³è¯·ååä¸èªå¨å®¡æ ¸
			if (HBillNo.Substring(0, 2) == "RK")
			{
			//è·åå¥åºç³è¯·ååæ®ç¶æ
			string HBillStatus = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FDOCUMENTSTATUS"]);
			//è·åå¥åºç³è¯·åID
			var json = new
			{
			Ids = ds.Tables[0].Rows[0]["FID"].ToString(),
			};
			LogService.Write("æäº¤å®¡æ ¸IDï¼" + DBUtility.ClsPub.isInt(ds.Tables[0].Rows[0]["FID"]));

			//ä»éç½®æä»¶è·å CLOUDç½åãè´¦å¥ä¿¡æ¯ãç»å½ç¨æ·ãç»å½å¯ç
			if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
			{
			LogService.Write("åçå¼å¸¸ï¼å¥åºç³è¯·ååæ¥è·åç»å½è´¦å·å¯ç å¤±è´¥ï¼ï¼" + sBarCode + "," + HSourceBillNo_TB + "," + HSourceInterID);
			return "åçå¼å¸¸ï¼å¥åºç³è¯·ååæ¥è·åç»å½è´¦å·å¯ç å¤±è´¥ï¼";
			}

			//ç»å½éè¶
			var loginRet = InvokeHelper.Login();
			//å¤ææ¯å¦ç»å½æå
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess == 0)
			{
			LogService.Write("å¶ä»å¥åº,ç»å½éè¶å¤±è´¥ï¼" + sBarCode + "," + HSourceBillNo_TB + "," + HSourceInterID);
			return "åçå¼å¸¸ï¼ç»å½éè¶å¤±è´¥ï¼";
			}

			//æäº¤å®¡æ ¸
			string result1 = string.Empty;
			string result2 = string.Empty;
			//åå»ºï¼éæ°å®¡æ ¸ç¶æè°ç¨æäº¤ï¼å®¡æ ¸æé®
			if (HBillStatus == "A" \|\| HBillStatus == "D")
			{
			LogService.Write("çäº§å¥åºç³è¯·åå·ï¼" + HBillNo + ",éæ°è¿è¡æäº¤å®¡æ ¸");
			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;
			}
			}
			//å®¡æ ¸ä¸ç¶æè°ç¨å®¡æ ¸æé®
			else if (HBillStatus == "B")
			{
			LogService.Write("çäº§å¥åºç³è¯·åå·ï¼" + HBillNo + ",éæ°è¿è¡å®¡æ ¸");
			result2 = InvokeHelper.Audit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//å®¡æ ¸
			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 with(nolock) left join AIS20220609121235..TFKO_t_Cust100009 b with(nolock) on a.HSourceBillNo = b.FBillNo left join AIS20220609121235..TFKO_t_Cust_Entry100065 c with(nolock) 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


			#region ç»å®å°è½¦ä»åºä»ä½
			/// <summary>
			/// ç»å®å°è½¦ä»åºä»ä½
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/BindCarAndWH")]
			[HttpGet]
			public object BindCarAndWH(string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID, int bindsignal)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker + "'," + HStockOrgID.ToString() + "," + bindsignal, "h_p_bindingCarintoWh");
			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 è½¬ç§»æ¨¡å
			// è½¬ç§»æ¨¡å
			[Route("WEBSController/CheckHW")]
			[HttpGet]
			public object CheckHW(int HWhID, int HSPID, int HWhID2, int HSPID2, string HBarCode, string HCarBarCode1, string HCarBarCode2, string UserID)
			{
			try
			{
			if (HCarBarCode1 == null) HCarBarCode1 = "";
			if (HCarBarCode2 == null) HCarBarCode2 = "";
			string sql = $"exec Transfer_Operation {HWhID},{HSPID},{HWhID2},{HSPID2},'{HBarCode}','{HCarBarCode1}','{HCarBarCode2}','{UserID}'";
			ds = oCn.RunProcReturn(sql, "Transfer_Operation");
			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 æ åº· çäº§é¢æåæ ¡éª æ«ææºå è·åçäº§é¢æååä¸æ¸¸é¢æåæªå®¡æ ¸ åæ®
			[Route("WEBSController/get_BillBarCode_BillCheck_Json_MateOut_HuiKang")]
			[HttpGet]
			public Object get_BillBarCode_BillCheck_Json_MateOut_HuiKang(string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
			{

			try
			{
			WebSoBar = null;
			// 1. æ¥è¯¢éè¶äºä¸ ææç¬¦åççäº§é¢æååä¸æ¸¸é¢æå
			ds = oCn.RunProcReturn($@"
			select HBillNo, HChecker,HMaker from h_v_Kf_MateOutBillList_K3 where HBillNo like '%{HBillNo}%'
			", "h_v_Kf_MateOutBillList_K3");

			List<string> HBillNoList = new List<string>();
			foreach (DataRow row in ds.Tables[0].Rows)
			{
			if (string.IsNullOrWhiteSpace(row["HChecker"].ToString())) {
			// 2. å¤æåæ®å®¡æ ¸ç¶æï¼æ¥æ¾æªè¢«å®¡æ ¸çåæ®
			WebSoBar = oWebs.get_BillBarCode_BillCheck(row["HBillNo"].ToString(), HBillType, row["HMaker"].ToString(), HStockOrgID, ref DBUtility.ClsPub.sErrInfo);

			if (WebSoBar != null)
			{
			// 3. è·åå°ç¬¦åæ¡ä»¶çè¿åå¼ï¼ç«å³è¿å
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}
			}
			}


			// 3. ææåæ®é½è¢«å®¡æ ¸ï¼æèæ²¡æç¬¦åè¦æ±çåæ®ï¼è¿åéè¯¯ä¿¡æ¯
			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


			#region å¯è´ è£ç®±åä¿åå èªå¨çæäº§éæ±æ¥å

			[Route("WEBSController/Sc_ICMOBillWorkQtyStatus_Tmp_Save")]
			[HttpGet]
			public object Sc_ICMOBillWorkQtyStatus_Tmp_Save(string HInterID)
			{
			try
			{

			string sql = $"exec [h_p_Sc_ICMOBillWorkQtyStatus_Save] {HInterID}";
			ds = oCn.RunProcReturn(sql, "[h_p_Sc_ICMOBillWorkQtyStatus_Save]");
			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 æ£éªå æ«ææºå æ ¹æ®åæ®ç±»å æºåç±»å æºåå· è§£æå¹¶è¿åæ£éªé¡¹ç®
			[Route("WEBSController/get_CheckBillBarCode_Json_CheckItem")]
			[HttpGet]
			public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode, string user)
			{
			try
			{
			string sErrMsg = "";
			oSystemParameter.ShowBill(ref sErrMsg);
			// åèå®¢æ·
			if (oSystemParameter.omodel.WMS_CampanyName == "åè")
			{
			if (!string.IsNullOrWhiteSpace(HBarCode))
			{
			HBarCode = HBarCode.Split('-')[0];
			}
			}

			// Mode = 1 è¡¨ç¤º æ«ç æ¨¡å¼ Mode = 2 è¡¨ç¤º éåæ¨¡å¼
			if (Mode == 1)
			{
			//æ«ç æ¨¡å¼éè¦è§£ææ¡ç è·åHInterIDåHEntryID
			ds = oCn.RunProcReturn($@"
			exec h_p_CheckBillBarCode_AnalysisBarcode
			@HBillType='{HBillType}',
			@HSourceBillType='{HSourceBillType}',
			@HBarCode='{HBarCode}',
			@user = '{user}'
			", "h_p_CheckBillBarCode_AnalysisBarcode");

			if (ds is null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æåæ®æ¡ç å¤±è´¥ï¼æ¡ç è§£æå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			HInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
			HEntryID = ds.Tables[0].Rows[0]["HEntryID"].ToString();
			}
			// éåæ¨¡å¼ç´æ¥éå¥HInterID å HEntryID æ ¹æ® åè´¨æ£æ¹æ¡æ¥æº è·å æ£éªé¡¹ç®
			if (oSystemParameter.omodel.WMS_CampanyName == "åè")
			{
			//åèåæ«ä»¶çæ¶å è¦ç¥éæè¿ä¸ªæ¡ç å¯¹åºçæ°éæ¯å¤å°ï¼åªè½ææ¡ç ä¼ å¥è¿å»è¿è¡æ¥æ¾
			ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType='{HBillType}',@HSourceBillType='{HSourceBillType}',
			@HInterID='{HInterID}',@HEntryID='{HEntryID}',@HBarCode='{HBarCode}'", "h_p_CheckBillBarCode_CheckItem");
			}
			else
			{
			ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType='{HBillType}',@HSourceBillType='{HSourceBillType}',
			@HInterID='{HInterID}',@HEntryID='{HEntryID}'", "h_p_CheckBillBarCode_CheckItem");
			}


			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æåæ®æ¡ç å¤±è´¥ï¼æ ç»å®è´¨æ£æ¹æ¡ä¿¡æ¯";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (oSystemParameter.omodel.WMS_CampanyName == "åè")
			{
			if (HBillType == 7507) // åæ®ç±»åæ¯æ«ä»¶æ£éªå æ¥æ¾åæ®æ¯å¦éå¤ï¼æ£éªæ¯å¦åæ ¼ï¼åæ®éå¤éè¦è¿åä¸åçç¶æ
			{
			var ds2 = oCn.RunProcReturn($"select top 1 * from QC_ProcessCheckBillMain where HMainSourceBillNo = '{HBarCode}' order by HDate desc", "QC_ProcessCheckBillMain");
			if (ds2.Tables[0].Rows.Count > 0)
			{
			if (ds2.Tables[0].Rows[0]["HCheckerResult"].ToString() == "true") // æ£éªåæ ¼æç¤ºæ¯å¦éè¦æ°å¢
			{
			objJsonResult.code = "2"; // è¿åCodeä¸º2è¡¨ç¤ºåæ®éå¤ï¼éè¦æç¤ºæ¯å¦éè¦æ°å¢åæ®
			objJsonResult.count = 1;
			objJsonResult.Message = "successï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			}
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "successï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;

			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æåæ®æ¡ç å¤±è´¥ï¼" + e.Message.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region å¯è´ è£ç®±åæ«æç®±æ¡ç æ¥è¯¢æ¯å¦å¨å®¢æ·æ¡ç æ¡£æ¡ï¼ä¸å¨å°±è§£æä¿åå®¢æ·æ¡ç æ¡£æ¡è¡¨

			[Route("WEBSController/GetHBarCode_CusJX")]
			[HttpGet]
			public object GetHBarCode_CusJX(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
			{
			try
			{

			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill_New_CusJX " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HSourceBillNo + "'", "h_p_WMS_AddPackBarCode_PackUnionBill_New_CusJX");
			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 æ·»åº·æ ¹æ®å°è½¦æ¡ç æ¾åºç¸åºç©æ

			[Route("WEBSController/GetMaterIDByCarBarCode")]
			[HttpGet]
			public object GetMaterIDByCarBarCode(string CarBarCode)
			{
			try
			{
			ds = oCn.RunProcReturn("select * from GetMaterMesByCarBarCode where HQty>=0 and å°è½¦='" + CarBarCode.ToString() + "'", "GetMaterMesByCarBarCode");
			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 [åæ ·å] è·åæªä¸æ¨ææ£éªåçåæ ·ååè¡¨
			[Route("WEBSController/AwaitCheckSampleBillList")]
			[HttpGet]
			public Object AwaitCheckSampleBillList(string user)
			{
			List<object> columnNameList = new List<object>();
			try
			{
			ds = oCn.RunProcReturn($@"
			exec h_p_AwaitCheckSampleBillList @user={user}
			", "h_p_CheckBillBarCode_CheckItem");

			//æ·»å åå
			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 = "successï¼";
			objJsonResult.data = ds.Tables;
			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 [è£ç®±è¿½æº¯] æ«æSNæ¡ç
			[Route("WEBSController/get_SNBarCode_PackUnionCarryUp")]
			[HttpGet]
			public object get_SNBarCode_PackUnionCarryUp(string sHBarCode, int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
			{
			if (oWebs.get_SNBarCode_PackUnionCarryUp(sHBarCode, sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, 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;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] æ«æç®±æ¡ç
			[Route("WEBSController/get_BarCode_PackUnionCarryUp")]
			[HttpGet]
			public object get_BarCode_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
			{
			var oBar = oWebs.get_BarCode_PackUnionCarryUp(sInterID, sBillNo, HBillType, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (oBar == 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 = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = oBar;
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] è·åè¡¨ä½ç©æä¿¡æ¯
			[Route("WEBSController/GetBillEntry_TmpList_PackUnionCarryUp")]
			[HttpGet]
			public object GetBillEntry_TmpList_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, int HStockOrgID)
			{
			DataSet oDs = oWebs.GetBillEntry_TmpList_PackUnionCarryUp(sInterID, sBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo);
			if (oDs == null \|\| oDs.Tables[0].Rows.Count == 0)
			{
			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 = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = oDs.Tables[0];
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] å é¤
			[Route("WEBSController/set_DelPackUnionBill_Temp_Pack")]
			[HttpGet]
			public object set_DelPackUnionBill_Temp_Pack(int HInterID)
			{
			if (oWebs.DeleteTemp_PackUnionBill(HInterID, 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;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] ä¸ä¼ çå
			[Route("WEBSController/set_SavePackUnionCarryUpBill")]
			[HttpPost]
			public object set_SavePackUnionCarryUpBill(string ModRightNamePackUnionCarryUp, int sInterID,
			string HBillType, string sBillNo, string sHBarCode_Pack,
			string sMaker, int HStockOrgID)
			{
			if (!oWebs.CheckModRight(ModRightNamePackUnionCarryUp, DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sErrInfo))
			{
			// é´æ
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "é´æå¤±è´¥ï¼è¯¥ç¨æ·æ æéä¸ä¼ åæ®! "; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if(oWebs.set_SavePackUnionCarryUpBill_New(sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "çæçäº§è£ç®±è¿½æº¯åæåï¼åæ®å·ä¸ºï¼" + sBillNo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "çæå¤±è´¥ï¼åå :" + DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] ç¼è¾ç¼ååè¡¨åæ®
			[Route("WEBSController/TempList_Modify_Pack")]
			[HttpGet]
			public object TempList_Modify_Pack(Int64 HInterID, string HBillNo, string HBillType)
			{
			if(oWebs.TempList_Modify_Pack(HInterID, HBillNo, 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;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] è·åç¼ååè¡¨
			[Route("WEBSController/GetSc_PackUnionBill_TempList_Pack")]
			[HttpGet]
			public object GetSc_PackUnionBill_TempList(string HBillType, string HMaker, Int64 HStockOrgID)
			{
			DataSet oDs = oWebs.GetSc_PackUnionBill_TempList(HBillType, HMaker, HStockOrgID);
			if(oDs == 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 = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = oDs.Tables[0];
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] å é¤ç¼ååè¡¨åæ®
			[Route("WEBSController/DeleteTemp_PackUnionBill_Pack")]
			[HttpGet]
			public object DeleteTemp_PackUnionBill_Pack(Int64 HInterID)
			{
			if(oWebs.DeleteTemp_PackUnionBill(HInterID, 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;
			}
			}
			#endregion

			#endregion
			}
			}