MES-WEB-API.git

			@@ -32,6 +32,7 @@
			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; //è®¾å¤åç§°


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

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

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

			try
			{
			if(sFIFOCtl == "Y")
			{
			//æ´æ°åè¿ååºä¸´æ¶è¡¨ç¶æ
			oCn.RunProc("EXEC h_p_WMS_UPDateICInventory_FIFO_Tmp " + HInterID.ToString() + ",'" + HBillType + "'");
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ´æ°åè¿ååºä¸´æ¶è¡¨HlineStatuså¼å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -1536,6 +1623,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";
			@@ -1901,27 +2035,114 @@
			}

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

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

			try
			{
			string WorkList = "å é¤ç¼ååæ®ï¼åæ®å·ï¼" + HBillNo;
			string SystemName = "WMS-" + MvarReportTitle + "æ¨¡å";
			oCn.BeginTran();
			ds = oCn.RunProcReturn("exec h_p_WMS_PonderationBillMain_Temp_Delete " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + sFIFOCtl + "','" + sERPMode + "'", "h_p_WMS_PonderationBillMain_Temp_Delete");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤ç¼ååæ®å¤±è´¥ï¼å é¤ç¼ååæ®å¤æéè¯¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0; //å¤±è´¥ï¼
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			//åå¥æ¥å¿
			oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			"(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','å é¤')"
			);
			oCn.Commit();
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åæ®å·ï¼" + HBillNo + " å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤æ¡ç åºå¥åºç¼ååè¡¨åæ®å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤æ¡ç åºå¥åºç¼ååè¡¨åæ®å¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -3871,19 +4092,62 @@

			#endregion

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

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

			/// <summary>
			/// ä¸ä¼ çæçäº§ç»æå
			/// éå®éè´§æ°å¢ä¸ä¼
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SavePackUnionBill_Json")]
			[HttpGet]
			public object set_SavePackUnionBill_Json(Int64 HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, Int64 HStockOrgID)
			[Route("WEBSController/set_SaveSellOutBackBill_Json")]
			[HttpPost]
			public object set_SaveSellOutBackBill_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			try
			{
			if (oWebs.set_SavePackUnionBill_Add(HInterID, HBillType, HBillNo, HBarCode_Pack, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
			List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getICStockBillMainByJson(msg1);
			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;
			@@ -3904,7 +4168,50 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "çæçäº§ç»æåå¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "éå®éè´§åä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#endregion

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

			/// <summary>
			/// ä¸ä¼ çæçäº§ç»æå
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_SavePackUnionBill_Json")]
			[HttpGet]
			public object set_SavePackUnionBill_Json(Int64 HInterID, string HBillType, string HBillNo, string HBarCode_Pack, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			if (oWebs.set_SavePackUnionBill_Add(HInterID, HBillType, HBillNo, HBarCode_Pack, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åæ®å·ï¼" + HBillNo + " ä¿åæåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "çæåæ®å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -4053,6 +4360,316 @@
			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;
			}
			}

			#endregion

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

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

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

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

			oBill.DetailColl.Add(oItemSub);
			}

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

			if (bResult)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä¿åæåï¼";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿åå¤±è´¥ï¼" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å°è½¦éå®åä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -4549,6 +5166,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 åæ¥å¼è°åº æ«ææºåæ¡ç
			@@ -4690,6 +5345,48 @@
			try
			{
			WebSoBar = oWebs.get_SourceBarCode_MateOutBack(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

			#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";
			@@ -4954,6 +5651,44 @@
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			}

			/// <summary>
			/// ç©ææ¡ç ææ¬æ¡ è°æ¨æ«ç è°ç¨ å¤å® æ«æç©ææ¡ç èªå¨å¸¦åºæºåä¿¡æ¯ 20250506
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/get_BarCode_MoveStock_AddSource_Json")]
			[HttpGet]
			public Object get_BarCode_MoveStock_AddSource_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle, string HCustom1, string HCustom2)
			{
			try
			{
			WebSoBar = oWebs.get_BarCode_MoveStock_AddSource(sBarCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, SourceFlag, HSourceBillNo, HSourceBillType, HStockInOrgID, HStockOutOrgID, HScanStyle, ref DBUtility.ClsPub.sErrInfo, HCustom1, HCustom2);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = WebSoBar;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion
			@@ -5344,6 +6079,7 @@
			string sJXCode = "";
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sAutoBarCode = "N"; //åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼

			#region ç³»ç»åæ°è·å
			@@ -5351,90 +6087,140 @@
			if (HBillType == "1201")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//çäº§å¥åºå
			if (HBillType == "1202")
			else if (HBillType == "1202")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å¶ä»å¥åºå
			if (HBillType == "1203")
			else if (HBillType == "1203")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//é¢æåºåºå
			else if (HBillType == "1204")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//éå®åºåºå
			else if (HBillType == "1205")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å¶ä»åºåºå
			else if (HBillType == "1206")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å§å¤é¢æå
			else if (HBillType == "1211")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//çäº§è¡¥æå
			else if (HBillType == "1254")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å§å¤è¡¥æå
			else if (HBillType == "1255")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			#endregion
			@@ -5449,8 +6235,17 @@
			}
			try
			{
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (sAutoBarCode == "Y")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ«ç©ææ¡ç æ¨¡å¼ï¼æ éæ«æç©ææ¡ç ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//ååæ®ä¸ºæ«ç çæï¼æ ¡éªæ¶ä¸çææ¡ç è®°å½ï¼åªå¯¹åæ«æçæ¡ç è¿è¡æ ¸å¯¹
			if (sSourceBarCodeCtl == "Y")
			else if (sSourceBarCodeCtl == "Y")
			{
			WebSoBar = oWebs.get_BillBarCode_Verify(HBillID, HBillNo, HBillType, sJXCode, HQty, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			@@ -5688,7 +6483,7 @@
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID,ref sErrMsg) == true)
			{
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			//éå®åºåºå
			sSourceBarCodeCtl = "Y";
			@@ -5811,25 +6606,25 @@
			if (HBillType == "1201")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§å¥åºå
			if (HBillType == "1202")
			else if (HBillType == "1202")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»å¥åºå
			if (HBillType == "1203")
			else if (HBillType == "1203")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -5838,7 +6633,7 @@
			else if (HBillType == "1204")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -5847,7 +6642,7 @@
			else if (HBillType == "1205")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -5856,7 +6651,7 @@
			else if (HBillType == "1206")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -5865,7 +6660,7 @@
			else if (HBillType == "1211")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -5874,7 +6669,7 @@
			else if (HBillType == "1254")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -5883,7 +6678,7 @@
			else if (HBillType == "1255")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -5892,7 +6687,7 @@
			else if (HBillType == "1207")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -5983,7 +6778,7 @@
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			//éå®åºåºå
			sSourceBarCodeCtl = "Y";
			@@ -6119,25 +6914,25 @@
			if (HBillType == "1201")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_POStockInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§å¥åºå
			if (HBillType == "1202")
			else if (HBillType == "1202")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_ProductInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å¶ä»å¥åºå
			if (HBillType == "1203")
			else if (HBillType == "1203")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_OtherInBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -6146,7 +6941,7 @@
			else if (HBillType == "1204")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_MateOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -6155,7 +6950,7 @@
			else if (HBillType == "1205")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -6164,7 +6959,7 @@
			else if (HBillType == "1206")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_OtherOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -6173,7 +6968,7 @@
			else if (HBillType == "1211")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_EntrustOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -6182,7 +6977,7 @@
			else if (HBillType == "1254")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -6191,7 +6986,7 @@
			else if (HBillType == "1255")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -6200,7 +6995,7 @@
			else if (HBillType == "1207")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -6280,7 +7075,7 @@
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl == "Y")
			if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			//éå®åºåºå
			sSourceBarCodeCtl = "Y";
			@@ -6387,6 +7182,56 @@

			#endregion

			#region çäº§ç»æåæ¨¡å æ«æç®±ï¼æï¼æ¡ç 20250630

			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æç®±ï¼æï¼æ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json")]
			[HttpGet]
			public object get_PackBarCode_PackUnionBill_New_Json(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill_New " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "'", "h_p_WMS_AddPackBarCode_PackUnionBill_New");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æææ¡ç åçéè¯¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

			/// <summary>
			@@ -6421,6 +7266,76 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

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

			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç åçéè¯¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -6495,7 +7410,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.Message = "å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -6752,6 +7667,102 @@
			// return objJsonResult;
			// }
			//}

			#endregion

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

			/// <summary>
			///æç®±ï¼ææï¼æ¨¡å æ«æææ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_PackBarCode_UnPackUnionBill_Json")]
			[HttpGet]
			public object Get_PackBarCode_UnPackUnionBill_Json(string HBarCode_Pack, string HBillSubType)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_UnPackUnionBill_New '" + HBarCode_Pack + "','" + HBillSubType + "'", "h_p_WMS_AddPackBarCode_UnPackUnionBill_New");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æææ¡ç å¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 0)
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //è·åå°DataColumnåå¯¹è±¡çåå
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æç®±ï¼ææï¼æ¨¡åï¼è·åç®±ï¼æï¼æ¡ç ä¿¡æ¯å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æç®±ï¼ææï¼æ¨¡å ä¸ä¼ å é¤ç»æåä¿¡æ¯ 20250702

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

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

			#endregion

			@@ -7999,6 +9010,348 @@
			#endregion

			#endregion


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

			#region ä¸æ¶åæ«ç æ¨¡å æ«ææºåæ¡ç è°ç¨æ¹æ³
			/// <summary>
			/// æ«ææºåæ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_SourceBarCode_MaterialLower_Json")]
			[HttpGet]
			public object get_SourceBarCode_MaterialLower_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HStockOrgID)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddSourceBarCode_MaterialLower " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddSourceBarCode_MaterialLower");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææºåæ¡ç ï¼åå¥æºåä¸´æ¶è¡¨å¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //è·åå°DataColumnåå¯¹è±¡çåå
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææºåæ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

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

			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_WorkShop " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode + "'," + HQty.ToString() + ",'" + HSourceBillType + "'," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "'," + HStockOrgID.ToString() + ",'" + HMaker + "'," + DBUtility.ClsPub.BoolToString(SourceFlag) + ",'" + sBatchNoCtl + "','" + sMustQtyCtl + "'", "h_p_WMS_AddBarCode_WorkShop");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æç©ææ¡ç ï¼åå¥ä¸´æ¶è¡¨å¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æç©ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

			#region ä¸æ¶åæ¨¡åï¼æ«æºåæ¡ç æ¥è¯¢ç©æåºåä¿¡æ¯

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

			#endregion

			#region å°è½¦æ«ç ç»å®æ¶ï¼å¤æå¶æ¯å¦å·²ç»å®åºä½ä¿¡æ¯
			[Route("WEBSController/CarIsused")]
			[HttpGet]
			public object CarIsused(string HCarBarCode)
			{
			try
			{
			ds = oCn.RunProcReturn("select * from h_v_Gy_MouldIsUsed where å°è½¦æ¡ç ='" + HCarBarCode + "'" , "h_v_Gy_MouldIsUsed");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å°è½¦æ¡ç ï¼" + HCarBarCode + "ï¼ä¸å¨ç³»ç»ä¸ï¼è¯·æ ¸å¯¹ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //è·åå°DataColumnåå¯¹è±¡çåå
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢å°è½¦å¨åºç¶æå¤±è´¥errï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region å°è½¦ç»å®æºå°æ¶ï¼å¤æææ«æºå°ï¼è®¾å¤ï¼æ¡ç æ¯å¦åå¨äºè®¾å¤æ¡£æ¡
			[Route("WEBSController/IsExistEquip")]
			[HttpGet]
			public object IsExistEquip(string HEquipBarCode)
			{
			try
			{
			ds = oCn.RunProcReturn("select * from h_v_Gy_EquipIsExist where æºå°æ¡ç ='" + HEquipBarCode + "'", "h_v_Gy_EquipIsExist");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºå°æ¡ç ï¼" + HEquipBarCode + "ï¼ä¸å¨ç³»ç»ä¸ï¼è¯·æ ¸å¯¹ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			List<object> columnNameList = new List<object>();
			//æ·»å åå
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //è·åå°DataColumnåå¯¹è±¡çåå
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢æºå°ä¿¡æ¯å¤±è´¥errï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#endregion



			#region ç©ææ¡ç æ¥è¯¢è°ç¨æ¹æ³
			@@ -10360,7 +11713,7 @@
			HSourceBillNo_TB = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillNo"]);
			HSourceInterID = DBUtility.ClsPub.isInt(ds.Tables[0].Rows[0]["HSourceInterID"]);
			//æ ¹æ®å¥åºç³è¯·ååå·å¤æåæ®ä¿¡æ¯æ¯å¦å·²ç»åæ¥å°éè¶
			sql = string.Format(@"select FID,FBILLNO from {0}..TFKO_t_Cust100009 with(nolock) where FBILLNO = '" + HSourceBillNo_TB + "'", HDataBaseName);
			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");
			//å¥åºç³è¯·åæ²¡æåæ¥å°éè¶åè¿è¡åæ¥
			@@ -10506,10 +11859,7 @@
			LogService.Write("åçå¼å¸¸ï¼å¥åºç³è¯·ååæ¥è·åç»å½è´¦å·å¯ç å¤±è´¥ï¼ï¼" + sBarCode + "," + HSourceBillNo_TB + "," + HSourceInterID);
			return "åçå¼å¸¸ï¼å¥åºç³è¯·ååæ¥è·åç»å½è´¦å·å¯ç å¤±è´¥ï¼";
			}
			LogService.Write("å¶ä»å¥åº,å³å°ç»å½éè¶");
			var loginRet = InvokeHelper.Login();
			LogService.Write("å¶ä»å¥åº,ç»å½éè¶ç»æ1ï¼" + loginRet);
			LogService.Write("å¶ä»å¥åº,ç»å½éè¶ç»æ2ï¼" + JObject.Parse(loginRet)["LoginResultType"].Value<int>());

			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess == 0)
			@@ -10541,7 +11891,7 @@
			string sJXCode = "";
			if (oSystemParameter.ShowBill(ref sErrMsg) == true)
			{
			if (oSystemParameter.omodel.Kf_StockInRequestBill_AutoCheck == "Y") //ç³»ç»åæ° èªå¨å®¡æ ¸
			if (oSystemParameter.omodel.Kf_StockInRequestBill_AutoCheck.ToUpper() == "Y") //ç³»ç»åæ° èªå¨å®¡æ ¸
			{
			result1 = InvokeHelper.Submit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//æäº¤
			result2 = InvokeHelper.Audit("k18d2ab4f14034c569576ec8e0835a80c", JsonConvert.SerializeObject(json));//å®¡æ ¸
			@@ -10563,11 +11913,88 @@
			}

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