MES-WEB-API.git

			@@ -207,11 +207,11 @@
			if (oSystemParameter.omodel.WMS_CampanyName == "çä¸ç¥º")
			{
			count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select * from(select top 1000 row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			sql = string.Format(@"select * from(select top 1000 row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			}
			else
			{
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by åæ®å· desc,hsubid ", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			}
			break;
			@@ -303,6 +303,148 @@
			return objJsonResult;
			}
			#endregion

			#region [éè¿æºåç±»åæ¥æ¾ä¸ååæ®ä¿¡æ¯] ä½¿ç¨æ°çåé¡µæ¹å¼
			[Route("Sc_BarCode/ReportFromBillList_New")]
			[HttpGet]
			public object ReportFromBillList_New(int page, int limit, string sWhere, string HSouceBillType, string HOrgID)
			{
			oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
			List<object> columnNameList = new List<object>();
			try
			{
			int count = 0;
			int pageNum = page;
			int pageSize = limit;
			string sql = "";
			string tabname = "";
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			sWhere = " where 1=1 and HOrgID='" + HOrgID + "' ";
			}
			else
			{
			sWhere = " where 1=1 and HOrgID='" + HOrgID + "' " + sWhere;
			}
			switch (HSouceBillType)
			{
			case "çäº§è®¢å":
			tabname = "h_v_IFCLD_ICMOBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and ä»»å¡æ°é>isnull(å¥åºæ°é,0) and ç¶æ<>'ç»æ¡' order by åæ®å·", tabname).Tables[0].Rows.Count;
			sql = string.Format($@"select * from h_v_IFCLD_ICMOBillList_Source {sWhere} and ä»»å¡æ°é>isnull(å¥åºæ°é,0) and ç¶æ<>'ç»æ¡' order by åæ®å· offset {(pageNum - 1)*pageSize} rows fetch next {pageSize} rows only;");
			break;
			case "çäº§æ±æ¥å":
			tabname = "h_v_IF_ICMOReportBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ICMOReportBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			break;
			case "éè´è®¢å":
			tabname = "h_v_IF_POOrderBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POOrderBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format($@"select * from h_v_IF_POOrderBillList_Source {sWhere} order by åæ®å· offset {(pageNum - 1)*pageSize} rows fetch next {pageSize} rows only;");
			break;
			case "æ¶æéç¥å":
			tabname = "h_v_IF_POInStockBillList_Source";
			if (oSystemParameter.omodel.WMS_CampanyName == "çä¸ç¥º")
			{
			count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select * from(select top 1000 row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			}
			else
			{
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by åæ®å· desc,hsubid ", tabname).Tables[0].Rows.Count;
			sql = string.Format($@"select * from h_v_IF_POInStockBillList_Source {sWhere} order by åæ®å· offset {(pageNum - 1) * pageSize} rows fetch next {pageSize} rows only; ");
			}
			break;
			case "å§å¤è®¢å":
			tabname = "h_v_IF_EntrustOrderBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_EntrustOrderBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			break;
			case "çäº§å¥åºå":
			tabname = "h_v_IF_ProductInBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_ProductInBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			break;
			case "éè´å¥åºå":
			tabname = "h_v_IF_POStockInBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POStockInBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POStockInBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			break;
			case "éå®éè´§å":
			tabname = "h_v_IF_SellOutBackBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBackBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_SellOutBackBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			break;
			case "çäº§éæå":
			tabname = "h_v_IF_MateOutBackBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBackBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_MateOutBackBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			break;
			case "å·¥åºæµè½¬å¡":
			tabname = "h_v_IF_ProcessExchangeBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProcessExchangeBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_ProcessExchangeBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			break;
			case "éå®åºåºå":
			tabname = "h_v_IF_SellOutBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_SellOutBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			break;
			case "é¢æåºåºå":
			tabname = "h_v_IF_MateOutBillList_Source";
			count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList_Source " + sWhere + " order by åæ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
			sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_MateOutBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			break;
			default:
			break;
			}
			ds = new SQLHelper.ClsCN().RunProcReturn(sql, tabname);
			string aa = ds.Tables[0].Columns[0].ToString();
			//ds.Tables[0].Columns["hmainid"].ColumnName.ToUpper();
			//ds.Tables[0].Columns["hsubid"].ColumnName.ToUpper();
			ds.Tables[0].Columns["hmainid"].ColumnName = "HMainID";
			ds.Tables[0].Columns["hsubid"].ColumnName = "HSubID";
			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åå¯¹è±¡çåå
			}

			if (ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "1";
			objJsonResult.count = count;
			objJsonResult.Message = "è·åèµæºç»å®æ°æ®æåï¼";
			objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //åºååDataSetä¸çæ¶é´æ ¼å¼ï¼ç¶ååååºåååæ¥
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "ææ èµæºç»å®ï¼";
			objJsonResult.data = null;
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = e.Message.ToString();
			objJsonResult.data = null;
			objJsonResult.list = columnNameList;
			}
			return objJsonResult;
			}
			#endregion


			#region [éè¿æ¡ç ç¼å·è·åHItemId]
			[Route("Sc_BarCode/Get_HItemId")]
			@@ -916,7 +1058,6 @@
			string HPOInStockBillNo = ""; // æ¶æéç¥åå·

			string HPOOrderBillNo = ""; // éè´è®¢åå·

			DataSet Ds;
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			@@ -927,6 +1068,7 @@
			if (ClsPub.isLong(ordrlist[j].HMaterID) != 0)
			{
			HNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterID);
			HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber);//ä¾åºå
			HMaterNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterNumber);
			HBatchNo = ClsPub.isStrNull(ordrlist[j].HBatchNo);

			@@ -1082,11 +1224,24 @@
			}
			else if (CampanyName.Contains("å°å«"))
			{
			// å°å«çµå¨
			// æ¡ç åç¼ = åæ®å· + ç©æç¼ç + æ¹æ¬¡å·
			sTMNumber = HPOOrderBillNo + "@" + HMaterNumber + "@" + HBatchNo;
			Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			if(HSourceBillTypeName== "éè´è®¢å")
			{

			//æ¡ç è§åä¸ºï¼ç©æç¼ç -ä¾åºåç¼ç -æ¥ææ¹å·-æ¥ææ°é-éè´è®¢åç¼ç
			sTMNumber = HMaterNumber + "-" + HSupNumber + "-" + HBatchNo + "-" + HBQty + "-" + HPOInStockBillNo;

			Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}
			else
			{
			// å°å«çµå¨
			// æ¡ç åç¼ = åæ®å· + ç©æç¼ç + æ¹æ¬¡å·
			sTMNumber = HPOOrderBillNo + "@" + HMaterNumber + "@" + HBatchNo;
			Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
			}

			}
			else //éç¨æ¹æ³
			{
			@@ -1285,7 +1440,7 @@
			TM = HNumber + "@" + sHMTONo.Replace(" ","") + "@" + HBatchNo.Replace(" ","") + "@" + sHQty;
			}
			}


			barcode.HBarCode2 = TM;
			barcode.HEntryID2 = ClsPub.isStrNull(j + 1);
			barcode.HMaterID2 = ordrlist[j].HMaterID;
			@@ -1426,6 +1581,7 @@
			{
			HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
			}

			//
			HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
			HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
			@@ -2818,35 +2974,35 @@
			{
			try
			{
			if(oWebs.GetWebAPIToLocal_ICMO(HBillNo, "3710", "admin", ref DBUtility.ClsPub.sErrInfo)==false)
			//if(oWebs.GetWebAPIToLocal_ICMO(HBillNo, "3710", "admin", ref DBUtility.ClsPub.sErrInfo)==false)
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "[0000-2-020]åæ®åæ¥å¤±è´¥è¯·èç³»ç®¡çå,"+ DBUtility.ClsPub.sErrInfo;
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//else
			//{
			ds = oCN.RunProcReturn("exec h_p_WMS_SaveSNByICMO_XW '" + @HBillNo + "','" + HSN +"',"+HBeginNo+","+HEndNo+","+HCount+",'"+HMachineCode+"'", "h_p_WMS_SaveSNByICMO_XW");

			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-2-020]åæ®åæ¥å¤±è´¥è¯·èç³»ç®¡çå,"+ DBUtility.ClsPub.sErrInfo;
			objJsonResult.Message = "[0000-2-020]æ²¡æè¿åä»»ä½ç»æ,æ¡ç ä¿åå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			ds = oCN.RunProcReturn("exec h_p_WMS_SaveSNByICMO_XW '" + @HBillNo + "','" + HSN +"',"+HBeginNo+","+HEndNo+","+HCount+",'"+HMachineCode+"'", "h_p_WMS_SaveSNByICMO_XW");

			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-2-020]æ²¡æè¿åä»»ä½ç»æ,æ¡ç ä¿åå¤±è´¥ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-2-020]æ¡ç ç»å®å¤±è´¥ï¼"+ ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "[0000-2-020]æ¡ç ç»å®å¤±è´¥ï¼"+ ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			//}