MES-WEB-API.git

			@@ -46,6 +46,7 @@
			/// <returns></returns>
			[Route("WEBSController/GetUser_Json")]
			[HttpGet]
			[AllowAnonymous]
			public object GetUser_Json(string HUserNumber, string HPassWord, Int64 HStockOrgID, string HStockOrgName)
			{
			try
			@@ -91,11 +92,23 @@
			return objJsonResult;
			}

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

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


			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ç»å½æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			JObject jobjJsonResult = JObject.FromObject(objJsonResult);
			jobjJsonResult["token"] = tokenStr;
			return jobjJsonResult;
			}
			}
			catch (Exception e)
			@@ -505,42 +518,22 @@
			{
			try
			{
			Int64 sHSPID = 0;
			Int64 sHWhID = 0;
			if (HBarCode.Contains(";"))
			//æ¡ç æ ¼å¼='HSP'+ä»åºåç +';'+ä»ä½åç
			if (HBarCode.Contains("HSP") && HBarCode.Contains(";"))
			{
			string[] sArray = HBarCode.Replace("HSP", "").Split(';');
			sHSPID = DBUtility.ClsPub.isLong(sArray[1]);
			sHWhID = DBUtility.ClsPub.isLong(sArray[0]);
			}
			Int64 sHSPID = 0;
			Int64 sHWhID = 0;
			if (HBarCode.Contains(";"))
			{
			string[] sArray = HBarCode.Replace("HSP", "").Split(';');
			sHSPID = DBUtility.ClsPub.isLong(sArray[1]);
			sHWhID = DBUtility.ClsPub.isLong(sArray[0]);
			}

			if (HWhID == 0)
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			if (HWhID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼è¯·ç¡®è®¤ææ«ä»ä½æ¡ç æ¯å¦å±äºè¯¥ç»ç»ï¼ä¸ä¸ºéç¦ç¨ç¶æï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			else
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + HWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			DataSet ds2 = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds2 == null \|\| ds2.Tables[0].Rows.Count == 0)
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -553,9 +546,53 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds2.Tables[0];
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			else
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + HWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			DataSet ds2 = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds2 == null \|\| ds2.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼è¯·ç¡®è®¤ææ«ä»ä½æ¡ç æ¯å¦å±äºè¯¥ç»ç»ï¼ä¸ä¸ºéç¦ç¨ç¶æï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds2.Tables[0];
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			}
			else
			{
			ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HBarCode='" + HBarCode + "' and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ²¡æè¿åä»»ä½è®°å½ï¼è¯·ç¡®è®¤ææ«ä»ä½æ¡ç æ¯å¦å±äºè¯¥ç»ç»ï¼ä¸ä¸ºéç¦ç¨ç¶æï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			@@ -1094,7 +1131,7 @@
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			@@ -1430,7 +1467,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			if(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -1532,6 +1569,84 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤æ¡ç åºå¥åºç¼ååè¡¨æ¡ç è®°å½å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion


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

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

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

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

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

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

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

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

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

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

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

			try
			{
			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)
			@@ -2375,6 +2521,8 @@
			}
			else
			{
			string WorkList = "å é¤ç¼ååæ®ï¼åæ®å·ï¼" + HBillNo;
			string SystemName = "WMS-" + MvarReportTitle + "æ¨¡å";
			//åå¥æ¥å¿
			oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			"(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','å é¤')"
			@@ -2444,6 +2592,210 @@
			}
			}

			#endregion

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

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

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

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

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

			#endregion
			@@ -3092,6 +3444,10 @@
			else if (lsmain[0].HMainSourceBillType == "3710")
			{
			websLsmain.HMainSourceBillType = "çäº§è®¢å";
			}
			else if (lsmain[0].HMainSourceBillType == "1256")
			{
			websLsmain.HMainSourceBillType = "çäº§é¢æç³è¯·å";
			}
			else
			{
			@@ -4435,6 +4791,66 @@

			#endregion

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

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

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

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

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

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

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

			#endregion

			#endregion

			#region éè´éæ ä¸ä¼ çå

			#region éè´éæ æ°å¢æ¨¡å¼
			@@ -4516,6 +4932,62 @@
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "éè´éæåä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

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

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

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

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

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

			#endregion

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

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

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

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

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

			if (oWebs.set_SaveMateOutBackBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			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 éå®éè´§ ä¸ä¼ çå
			@@ -4695,6 +5223,686 @@

			#endregion

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

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

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

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

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

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

			#endregion

			#endregion

			#region å§å¤éæ ä¸ä¼ çå

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

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

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

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

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

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

			#endregion

			#endregion

			#region æ£éªå ä¸ä¼ çå

			#region æ£éªå åæ ¼å

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

			if (set_SaveQCPOStockInCheckBill(oMain, HSourceBillType, sHSourceEntryID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ£éªåä¸ä¼ å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

			HReturn = result.ToString();

			if (HReturn.Contains("\"IsSuccess\":false") == true)
			{
			//ååºååjsonæ°æ®
			var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
			//æ¥æ¶éè¶æ¥éä¿¡æ¯
			var strErrorMsg = string.Empty;
			//éåè·åæ¥éä¿¡æ¯
			foreach (var item in retModel.Result.ResponseStatus.Errors)
			{
			strErrorMsg += item.Message + "\r\n";
			};
			sErrMsg = "çææ£éªåå¤±è´¥ï¼éè¶äºæç¤ºï¼" + strErrorMsg;
			LogService.Write("çææ£éªåå¤±è´¥ï¼" + HReturn + sJson); //åå¥txtææ¬
			oCn.RollBack();
			return false;
			}
			else
			{
			sRemark = sRemark + sJson;
			// æäº¤åä¿ååæ®
			string result1 = string.Empty;
			string result2 = string.Empty;
			var fID = JObject.Parse(result)["Result"]["Id"].ToString();
			var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
			var json = new
			{
			Ids = fID,
			};

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

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

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

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

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

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

			#endregion

			#endregion

			#region çäº§ç»æå ä¸ä¼ çå
			@@ -4736,6 +5944,33 @@
			}
			}

			#endregion

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

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

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

			#region ä¸æé²éå ä¸ä¼ çå
			@@ -4962,6 +6197,28 @@
			}
			else
			{

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

			if (dds == null)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤åå¤æå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(dds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			//æ´æ°è½¦é´ç©æåºå
			oCn.RunProc("EXEC h_p_WMS_UPDateICinventory_WorkShop " + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillType + "'");
			//æ´æ°è½¦é´æ¡ç åºå
			@@ -6545,10 +7802,10 @@

			#endregion

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

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

			#endregion

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

			/// <summary>
			/// å·²åå¨æ«ç è®°å½ä¸åæ®åçåæ´åä¸¤è¾¹æ°æ®ä¸ä¸è´æ¶ï¼æ¸ç©ºåæ«ç æ°æ®
			@@ -6629,7 +7886,7 @@

			#endregion

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

			/// <summary>
			/// ç©ææ¡ç ææ¬æ¡ æ ¡éªæ«ç è°ç¨ æ ¡éªæ¨¡å¼
			@@ -6637,7 +7894,7 @@
			/// <returns></returns>
			[Route("WEBSController/get_CheckTypeByBarCode_BillCheck_Json")]
			[HttpGet]
			public Object get_CheckTypeByBarCode_BillCheck_Json(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, Int64 HStockOrgID)
			public Object get_CheckTypeByBarCode_BillCheck_Json(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, Int64 HStockOrgID)
			{
			//è·åç³»ç»åæ°
			string sErrMsg = "";
			@@ -6788,6 +8045,76 @@
			sAutoBarCode = "Y";
			}
			}
			//éè´éæå
			else if (HBillType == "1239")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_POStockInBackBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//çäº§éåºå
			else if (HBillType == "1245")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_ProductInBackBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//çäº§éæå
			else if (HBillType == "1244")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_MateOutBackBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//éå®éè´§å
			else if (HBillType == "1247")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_SellOutBackBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			//å§å¤éæå
			else if (HBillType == "1238")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åæ«ç©ææ¡ç æ¨¡å¼ï¼'Y'ä¸ºä¸æ«ç©ææ¡ç ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBackBillCheck_AutoBarCode.ToUpper() == "Y")
			{
			sAutoBarCode = "Y";
			}
			}
			#endregion

			if (oSystemParameter.omodel.WMS_CampanyName == "å®ç") //ç³»ç»åæ° å®¢æ·å®å¶ååç§° ç©ºç½ä¸ºéç¨
			@@ -6833,11 +8160,19 @@
			//ååæ®éæ«ç çæï¼æ ¡éªæ¶çææ¡ç è®°å½
			else
			{
			WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck_New(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HSCWHID, HSCSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (WebSoBar.HRemark == "ä»æç¤º")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 2;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			@@ -6873,7 +8208,71 @@

			#endregion

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

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

			#endregion

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

			/// <summary>
			/// è¿ååæ®åè¡¨ä¿¡æ¯ æ ¡éªæ¨¡å¼
			@@ -6920,7 +8319,8 @@
			objJsonResult.data = new
			{
			Materlist = ds.Tables[0], //è¿åç©ææç»åè¡¨ä¿¡æ¯ï¼0ï¼
			BarCodeDetailslist = ds.Tables[1], //è¿åå½åææ«ææ¡ç æç»ä¿¡æ¯ï¼5ï¼
			BarCodeDetailslist = ds.Tables[1], //è¿åå½åææ«ææ¡ç æç»ä¿¡æ¯ï¼1ï¼
			FIFOlist = ds.Tables[2], //è¿ååè¿ååºåè¡¨ä¿¡æ¯ï¼2ï¼
			};
			objJsonResult.list = columnNameList;
			return objJsonResult;
			@@ -6989,7 +8389,7 @@

			#endregion

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

			/// <summary>
			/// æ«ç æ¨¡åï¼å é¤éä¸è¡æ¡ç åºå¥åºä¸´æ¶è¡¨è®°å½
			@@ -7097,6 +8497,115 @@

			#endregion

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

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

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

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

			#endregion

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

			/// <summary>
			@@ -7148,7 +8657,7 @@

			#endregion

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

			/// <summary>
			/// æ ¹æ®åæ®ID,å é¤ä¸´æ¶è¡¨è®°å½
			@@ -7165,6 +8674,7 @@
			if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
			{
			string sSourceBarCodeCtl = "N"; //æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			string sFIFOCtl = "4"; //åè¿ååºæ§å¶ï¼1ãä¸æ§å¶ä»æ¾ç¤ºä¸æ¶æ¸å 2ãä¸¥æ ¼æ§å¶åè¿ååº 3ãä»æç¤ºåæ¾ç¤ºä¸æ¶æ¸å 4ãä¸æ¾ç¤ºä¸æ¶æ¸åä¹ä¸æ§å¶ï¼

			#region ç³»ç»åæ°è·å
			//éè´å¥åºå
			@@ -7202,6 +8712,8 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_MateOutBillCheck_FIFOCtl;
			}
			//éå®åºåºå
			else if (HBillType == "1205")
			@@ -7211,6 +8723,8 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_SellOutBillCheck_FIFOCtl;
			}
			//å¶ä»åºåºå
			else if (HBillType == "1206")
			@@ -7220,6 +8734,8 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_OtherOutBillCheck_FIFOCtl;
			}
			//å§å¤é¢æå
			else if (HBillType == "1211")
			@@ -7229,6 +8745,8 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_EntrustOutBillCheck_FIFOCtl;
			}
			//çäº§è¡¥æå
			else if (HBillType == "1254")
			@@ -7238,6 +8756,8 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_MateReplenishOutBillCheck_FIFOCtl;
			}
			//å§å¤è¡¥æå
			else if (HBillType == "1255")
			@@ -7247,12 +8767,61 @@
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_EntrustReplenishOutBillCheck_FIFOCtl;
			}
			//ç´æ¥è°æ¨å
			else if (HBillType == "1207")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			//åè¿ååºæ§å¶
			sFIFOCtl = oSystemParameter.omodel.Kf_MoveStockBillCheck_FIFOCtl;
			}
			//éè´éæå
			else if (HBillType == "1239")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§éåºå
			else if (HBillType == "1245")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§éæå
			else if (HBillType == "1244")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//éå®éè´§å
			else if (HBillType == "1247")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤éæå
			else if (HBillType == "1238")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			@@ -7293,6 +8862,12 @@
			try
			{
			oCn.BeginTran();
			//å é¤åè¿ååºä¸´æ¶è¡¨è®°å½
			if (sFIFOCtl == "1" \|\| sFIFOCtl == "2" \|\| sFIFOCtl == "3")
			{
			oCn.RunProc("Delete from Kf_ICInventory_FIFO_Tmp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "'", ref DBUtility.ClsPub.sExeReturnInfo);
			}
			//å é¤æ¡ç åºå¥åºä¸´æ¶è¡¨è®°å½
			oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + "' and HSubBillType=1", ref DBUtility.ClsPub.sExeReturnInfo);
			//åå¥æ¥å¿
			oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			@@ -7565,6 +9140,51 @@
			sSourceBarCodeCtl = "Y";
			}
			}
			//éè´éæå
			else if (HBillType == "1239")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_POStockInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§éåºå
			else if (HBillType == "1245")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_ProductInBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//çäº§éæå
			else if (HBillType == "1244")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_MateOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//éå®éè´§å
			else if (HBillType == "1247")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_SellOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			//å§å¤éæå
			else if (HBillType == "1238")
			{
			//æ ¡éª-æ¯å¦è¿è¡æºåå¯¹åºæ¡ç æ ¸å¯¹ï¼'Y'ä¸ºæ ¸å¯¹ï¼
			if (oSystemParameter.omodel.Kf_EntrustOutBackBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
			{
			sSourceBarCodeCtl = "Y";
			}
			}
			#endregion

			try
			@@ -7710,7 +9330,7 @@
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
			ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -7855,10 +9475,6 @@

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

			/// <summary>
			/// çäº§ç»æåæ¨¡å æ«æç®±ï¼æï¼æ¡ç
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json_Cus")]
			[HttpGet]
			public object Get_PackBarCode_PackUnionBill_New_Json_Cus(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
			@@ -7968,6 +9584,76 @@
			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç åçéè¯¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

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

			try
			{
			ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New_xiaowei '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -8271,6 +9957,29 @@

			#endregion

			#endregion

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

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

			#endregion
			@@ -12824,11 +14533,11 @@
			/// <returns></returns>
			[Route("WEBSController/BindCarAndWH")]
			[HttpGet]
			public object BindCarAndWH( string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID)
			public object BindCarAndWH(string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID, int bindsignal)
			{
			try
			{
			ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker+ "'," + HStockOrgID.ToString(), "h_p_bindingCarintoWh");
			ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker + "'," + HStockOrgID.ToString() + "," + bindsignal, "h_p_bindingCarintoWh");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			@@ -12868,10 +14577,11 @@
			}
			#endregion

			//è½¬ç§»æ¨¡å
			#region è½¬ç§»æ¨¡å
			// è½¬ç§»æ¨¡å
			[Route("WEBSController/CheckHW")]
			[HttpGet]
			public object CheckHW(int HWhID,int HSPID,int HWhID2,int HSPID2,string HBarCode,string HCarBarCode1,string HCarBarCode2,string UserID)
			public object CheckHW(int HWhID, int HSPID, int HWhID2, int HSPID2, string HBarCode, string HCarBarCode1, string HCarBarCode2, string UserID)
			{
			try
			{
			@@ -12913,13 +14623,14 @@
			return objJsonResult;
			}
			}
			#endregion

			#region æ åº· çäº§é¢æåæ ¡éª æ«ææºå è·åçäº§é¢æååä¸æ¸¸é¢æåæªå®¡æ ¸ åæ®
			#region æ åº· çäº§é¢æåæ ¡éª æ«ææºå è·åçäº§é¢æååä¸æ¸¸é¢æåæªå®¡æ ¸ åæ®
			[Route("WEBSController/get_BillBarCode_BillCheck_Json_MateOut_HuiKang")]
			[HttpGet]
			public Object get_BillBarCode_BillCheck_Json_MateOut_HuiKang(string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
			{


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

			@@ -12986,7 +14697,7 @@
			{
			try
			{


			string sql = $"exec [h_p_Sc_ICMOBillWorkQtyStatus_Save] {HInterID}";
			ds = oCn.RunProcReturn(sql, "[h_p_Sc_ICMOBillWorkQtyStatus_Save]");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			@@ -13026,5 +14737,458 @@

			#endregion

			#region æ£éªå æ«ææºå æ ¹æ®åæ®ç±»å æºåç±»å æºåå· è§£æå¹¶è¿åæ£éªé¡¹ç®
			[Route("WEBSController/get_CheckBillBarCode_Json_CheckItem")]
			[HttpGet]
			public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode, string user)
			{
			try
			{
			string sErrMsg = "";
			oSystemParameter.ShowBill(ref sErrMsg);
			// åèå®¢æ·
			if (oSystemParameter.omodel.WMS_CampanyName == "åè")
			{
			if (!string.IsNullOrWhiteSpace(HBarCode))
			{
			HBarCode = HBarCode.Split('-')[0];
			}
			}

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

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

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


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

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

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

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

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

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

			ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill_New_CusJX " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HSourceBillNo + "'", "h_p_WMS_AddPackBarCode_PackUnionBill_New_CusJX");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«æç®±ãææ¡ç åçéè¯¯ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æå¥å®¢æ·æ¡ç æ¡£æ¡è¡¨å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

			#region æ·»åº·æ ¹æ®å°è½¦æ¡ç æ¾åºç¸åºç©æ

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

			#region [åæ ·å] è·åæªä¸æ¨ææ£éªåçåæ ·ååè¡¨
			[Route("WEBSController/AwaitCheckSampleBillList")]
			[HttpGet]
			public Object AwaitCheckSampleBillList(string user)
			{
			List<object> columnNameList = new List<object>();
			try
			{
			ds = oCn.RunProcReturn($@"
			exec h_p_AwaitCheckSampleBillList @user={user}
			", "h_p_CheckBillBarCode_CheckItem");

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

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "successï¼";
			objJsonResult.data = ds.Tables;
			objJsonResult.list = columnNameList;

			return objJsonResult;

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

			#region è£ç®±è¿½æº¯

			#region [è£ç®±è¿½æº¯] æ«æSNæ¡ç
			[Route("WEBSController/get_SNBarCode_PackUnionCarryUp")]
			[HttpGet]
			public object get_SNBarCode_PackUnionCarryUp(string sHBarCode, int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
			{
			if (oWebs.get_SNBarCode_PackUnionCarryUp(sHBarCode, sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] æ«æç®±æ¡ç
			[Route("WEBSController/get_BarCode_PackUnionCarryUp")]
			[HttpGet]
			public object get_BarCode_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
			{
			var oBar = oWebs.get_BarCode_PackUnionCarryUp(sInterID, sBillNo, HBillType, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
			if (oBar == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = oBar;
			return objJsonResult;
			}
			}
			#endregion

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

			#region [è£ç®±è¿½æº¯] å é¤
			[Route("WEBSController/set_DelPackUnionBill_Temp_Pack")]
			[HttpGet]
			public object set_DelPackUnionBill_Temp_Pack(int HInterID)
			{
			if (oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

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

			#region [è£ç®±è¿½æº¯] ç¼è¾ç¼ååè¡¨åæ®
			[Route("WEBSController/TempList_Modify_Pack")]
			[HttpGet]
			public object TempList_Modify_Pack(Int64 HInterID, string HBillNo, string HBillType)
			{
			if(oWebs.TempList_Modify_Pack(HInterID, HBillNo, HBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			// æå (æ å·²ä¸ä¼ è®°å½)
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;

			}
			else
			{
			// å¤±è´¥
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] è·åç¼ååè¡¨
			[Route("WEBSController/GetSc_PackUnionBill_TempList_Pack")]
			[HttpGet]
			public object GetSc_PackUnionBill_TempList(string HBillType, string HMaker, Int64 HStockOrgID)
			{
			DataSet oDs = oWebs.GetSc_PackUnionBill_TempList(HBillType, HMaker, HStockOrgID);
			if(oDs == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //å¤±è´¥ï¼
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //æåï¼
			objJsonResult.data = oDs.Tables[0];
			return objJsonResult;
			}
			}
			#endregion

			#region [è£ç®±è¿½æº¯] å é¤ç¼ååè¡¨åæ®
			[Route("WEBSController/DeleteTemp_PackUnionBill_Pack")]
			[HttpGet]
			public object DeleteTemp_PackUnionBill_Pack(Int64 HInterID)
			{
			if(oWebs.DeleteTemp_PackUnionBill(HInterID, ref DBUtility.ClsPub.sErrInfo))
			{
			// å é¤æå
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;

			}
			else
			{
			// å é¤å¤±è´¥
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#endregion
			}
			}