~yxj/MES-WEB-API.git

			@@ -132,7 +132,7 @@
			list.Add("å¯ä¸æ¡ç ");
			list.Add("åç§æ¡ç ");
			list.Add("æ¹æ¬¡æ¡ç ");
			//list.Add("æçæ¡ç ");
			list.Add("æçæ¡ç ");
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			@@ -177,27 +177,27 @@
			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 top " + pageSize + " * from(select row_number() over (order by åæ®å·) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and ä»»å¡æ°é>isnull(å¥åºæ°é,0) and ç¶æ<>'ç»æ¡') as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			sql = string.Format(@"select * from(select row_number() over (order by åæ®å·) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and ä»»å¡æ°é>isnull(å¥åºæ°é,0) and ç¶æ<>'ç»æ¡') as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			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 top " + pageSize + " * 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)");
			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 top " + pageSize + " * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			sql = string.Format(@"select * from(select row_number() over (order by åæ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
			break;
			case "æ¶æéç¥å":
			tabname = "h_v_IF_POInStockBillList_Source";
			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 top " + pageSize + " * 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)");
			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;
			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 top " + pageSize + " * 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)");
			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";
			@@ -670,6 +670,7 @@
			string HSelectBarCodeType = sArray[3].ToString();
			string CampanyName = sArray[4].ToString()=="xxx"?"": sArray[4].ToString();
			string UserName = sArray[5].ToString();
			ClsPub.CurUserName = UserName;

			//è·ååç
			HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -959,10 +960,14 @@
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			LSHlen = 5;
			}
			//else if (cmbHBarCodeType.Text == "æçæ¡ç ")
			//{
			// TM = HOrgNumber + HNumber + LSH2;
			//}
			else if (HSelectBarCodeType == "æçæ¡ç ")
			{
			LSHlen = 4; //æµæ°´å·é¿åº¦
			//æ¡ç åç¼ = ç©æåç + å¹´ + æ + æ¥
			sTMNumber = HNumber + sYear + sPeriod + sDay;
			Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //è·åæå¤§æµæ°´å·
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			}
			else
			{
			objJsonResult.code = "0";
			@@ -1002,7 +1007,7 @@
			{
			LSH2 = "0" + LSH2;
			}
			if (HSelectBarCodeType == "å¯ä¸æ¡ç ")
			if (HSelectBarCodeType == "å¯ä¸æ¡ç " \|\| HSelectBarCodeType == "æçæ¡ç ")
			{
			//æ¡ç ç¼å· = æ¡ç åç¼ + æµæ°´å·
			TM = sTMNumber + LSH2;