MES-WEB-API.git

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

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

			}
			catch (Exception e)
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ«ææºåæ¡ç å¤±è´¥ï¼" + e.ToString();
			objJsonResult.Message = "è·åç³»ç»åæ°å¤±è´¥ï¼ " + sErrMsg;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -6186,26 +6210,7 @@
			HSupIDs = ds.Tables[0].Rows[0]["HItemID"].ToString();
			}

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

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

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

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

			//æ¥æè·åæ¹å¼
			@@ -6538,6 +6563,269 @@
			}

			#endregion

			#endregion

			#endregion


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

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

			#endregion

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

			#endregion

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

			#endregion

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

			/// <summary>
			/// å é¤éä¸è¡ä¸´æ¶è¡¨è®°å½
			/// </summary>
			/// <returns></returns>
			[Route("WEBSController/set_DelCusBarCodeCheckBill_temp_Json")]
			[HttpGet]
			public object set_DelCusBarCodeCheckBill_temp_Json(Int64 HInterID, string HBillType, Int64 HItemID)
			{
			try
			{
			oCn.RunProc("Delete from WMS_CusBarCodeCheckBill_temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + " and HItemID=" + HItemID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å é¤æ«ç è®°å½å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			#endregion

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

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

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

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

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

			#endregion

			@@ -7476,20 +7764,20 @@
			DataSet ds1 = oCn.RunProcReturn(sql1, "Gy_getCusBarCodeBill_Temp");
			if (ds1 != null && ds1.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ä¿®æ¹å¤±è´¥ï¼åå ï¼ä¿®æ¹åçåæ®å·å¨æªæäº¤çç¼ååè¡¨ä¸ä¸åå¨ï¼";
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = null;
			return objJsonResult;
			}



			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = ds1.Tables[0];
			return objJsonResult;
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æå";
			objJsonResult.data = ds1.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			@@ -8308,6 +8596,53 @@

			#endregion

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

			#endregion

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

			/// <summary>