MES-WEB-API.git

			@@ -32,10 +32,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 å¬ç¨æ¹æ³
			@@ -954,11 +952,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";
			@@ -1074,6 +1079,90 @@


			#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 ç´æ¥è°æ¨ è·åè°æ¨åºè´§ç±»å

			@@ -1264,6 +1353,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;
			@@ -1328,22 +1420,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)
			{
			@@ -1400,6 +1482,50 @@

			#endregion


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

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

			#endregion


			#endregion


			@@ -1418,6 +1544,53 @@
			try
			{
			ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, HMaker, HStockOrgID);
			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;
			}
			}

			/// <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";
			@@ -2015,6 +2188,61 @@

			#endregion

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

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

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

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

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

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

			#endregion

			#endregion

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

			#endregion

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

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

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

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

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

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

			#endregion

			#endregion

			@@ -2272,6 +2554,61 @@

			#endregion

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

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

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

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

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

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

			#endregion

			#endregion

			#region é¢æåºåº ä¸ä¼ çå
			@@ -2364,6 +2701,61 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "é¢æåºåºåä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

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

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

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

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

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

			#endregion

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

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

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

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

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

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

			#endregion

			#endregion

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

			#endregion

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

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

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

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

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

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

			#endregion

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

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

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

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

			#endregion

			#endregion

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

			/// <summary>
			@@ -3606,6 +4194,208 @@
			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
			{
			//æ´æ°è½¦é´ç©æåºå
			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;
			}
			@@ -4102,6 +4892,44 @@
			}
			}

			/// <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 åæ¥å¼è°åº æ«ææºåæ¡ç
			@@ -4272,6 +5100,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


			@@ -4295,237 +5165,18 @@
			sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo, HMaker);
			SourceFlag = true;
			}
			else if(oSystemParameter.omodel.WMS_CampanyName == "æ·»åº·" && HSourceBillType == "1241")
			else if(oSystemParameter.omodel.WMS_CampanyName == "æ£®æ¥·" && HSourceBillType == "1241")
			{
			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)
			//èªå¨åè£çº¿åæ¥éè¶çäº§å¥åºç³è¯·å
			sJXCode = Kf_OtherInBill_SK(sBarCode, HCustom1);
			//åæ¥è¿ç¨ä¸åçå¼å¸¸ï¼ç´æ¥è¿åæ¥éä¿¡æ¯
			if (sJXCode.Contains("åçå¼å¸¸"))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¡ç æ¡£æ¡ä¸ä¸åå¨æ¤æ¡ç ç¼å·ï¼" + sBarCode;
			objJsonResult.Message = sJXCode;
			objJsonResult.data = null;
			return objJsonResult;
			}
			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 * from FROM {0}..TFKO_t_Cust100009 with(nolock) where FBILLNO = '" + HSourceBillNo_TB + "'", HDataBaseName);

			LogService.Write("å¶ä»å¥åºæ¥è¯¢å¥åºç³è¯·åæ¯å¦åå¨ï¼" + sql);

			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 + "'";
			ds = oCn.RunProcReturn(sql, "h_p_Kf_StockInRequestBillToErp");

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "webapiå¥åºç³è¯·ååæ¥ï¼è·åä¿¡æ¯å¤±è´¥";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			JObject model = new JObject();
			//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", Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["å·¥å·"])); //å·¥å·
			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", 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", 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", 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()); //æ¯é
			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()); //ç®±å·


			//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))
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¥åºç³è¯·ååæ¥è·åç»å½è´¦å·å¯ç å¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			var loginRet = InvokeHelper.Login();
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess == 0)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ç»å½éè¶å¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			string result = InvokeHelper.Save("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(jsonRoot));//ä¿å

			if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			LogService.Write(JsonConvert.SerializeObject(jsonRoot));
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¥åºç³è¯·ååæ¥éè¶äºå¤±è´¥ï¼åå·:" + HSourceBillNo_TB + result + jsonRoot;
			objJsonResult.data = null;
			return objJsonResult;
			}

			//æäº¤å®¡æ ¸
			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,
			};
			if (oSystemParameter.omodel.Kf_StockInRequestBill_AutoCheck == "Y") //ç³»ç»åæ° èªå¨å®¡æ ¸
			{
			result1 = InvokeHelper.Submit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//æäº¤
			result2 = InvokeHelper.Audit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//å®¡æ ¸

			if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¥åºç³è¯·ååå·:" + ",æäº¤å¤±è´¥" + result1;
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å¥åºç³è¯·ååå·:" + ",å®¡æ ¸å¤±è´¥" + result2;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			}
			}
			}
			}
			else
			@@ -4728,6 +5379,44 @@
			//}
			}

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


			@@ -4870,7 +5559,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
			@@ -5051,6 +5748,48 @@

			#endregion

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

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

			#endregion

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

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

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

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

			#endregion

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

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

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //è·åå°DataColumnåå¯¹è±¡çåå
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = new
			{
			Materlist = ds.Tables[0], //è¿åç©ææç»åè¡¨ä¿¡æ¯ï¼0ï¼
			BarCodeDetailslist = ds.Tables[1], //è¿åå½åææ«ææ¡ç æç»ä¿¡æ¯ï¼5ï¼
			};
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·ååè¡¨ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

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

			#endregion

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

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

			@@ -5262,7 +6198,7 @@

			#endregion

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

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

			#endregion

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

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

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

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

			#endregion

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

			/// <summary>
			/// å·²ä¸ä¼ æ¥è¯¢çé¢ï¼æ ¹æ®åæ®ç±»åãåæ®å·ãç¨æ·æ¥è¯¢å·²ä¸ä¼ åæ®ä¿¡æ¯
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/GetKf_ICStockBillQueryList_User_BillCheck_Json")]
			[HttpGet]
			public object GetKf_ICStockBillQueryList_User_BillCheck_Json(string HBillType, string HBillNo, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillQueryByUserList_BillCheck '" + HBillType + "','" + HBillNo + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_Kf_ICStockBillQueryByUserList_BillCheck");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢ä¸å°è¯¥åæ®è®°å½ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //è·åå°DataColumnåå¯¹è±¡çåå
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·ååæ®ä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åå·²ä¸ä¼ åæ®ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

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

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

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

			#endregion



			#region ç©ææ¡ç æ¥è¯¢è°ç¨æ¹æ³
			/// <summary>
			/// è·åæ¡ç ä¿¡æ¯
			@@ -8021,6 +9559,179 @@
			}
			}
			#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 å®¢æ·æ¡ç æ«æè®°å½å
			@@ -9280,5 +10991,330 @@

			#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 == "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
			}
			}