MES-WEB-API.git

			@@ -251,6 +251,21 @@
			//åå®¡æ ¸æ´æ° åæ¶åºåè¡¨ åå°åºå 1204 1202 1203 1247 1244 1251 1210
			ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory '" + lngBillKey.ToString() + "','" + HBillType + "','2'", "h_KF_UPDateICinventory");
			}
			//=========================å®¡æ ¸åå®¡æ ¸åè´åºåæ§å¶
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_KF_ICinventoryStockCtrl '" + lngBillKey.ToString() + "', '" + HBillType + "'", "h_p_KF_ICinventoryStockCtrl");
			if (ds2 == null)
			{
			sReturn = "åºåæ´æ°åæ§å¶å¤æå¤±è´¥ï¼";
			oCn.RollBack();
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
			{
			sReturn = "åºåæ´æ°å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//============================
			}

			sReturn = "";
			@@ -317,13 +332,192 @@
			//åå®¡æ ¸æ´æ° åæ¶åºåè¡¨ å¢å åºå 1201 1202 1203 1247 1244 1251 1210
			//åå®¡æ ¸æ´æ° åæ¶åºåè¡¨ åå°åºå 1205 1250 1206 1245 1239
			ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory '" + lngBillKey.ToString() + "','" + HBillType + "','2'", "h_KF_UPDateICinventory");
			}else if (HBillType == "1207")
			{
			//æ´æ°åæ¶åºåè¡¨ å¢å è°å¥åºå,åå°è°åºåºå
			ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory_Move '" + lngBillKey.ToString() + "','" + HBillType + "','2'", "h_KF_UPDateICinventory_Move");
			}
			//=========================å®¡æ ¸åå®¡æ ¸åè´åºåæ§å¶
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_KF_ICinventoryStockCtrl '" + lngBillKey.ToString() + "', '" + HBillType + "'", "h_p_KF_ICinventoryStockCtrl");
			if (ds2 == null)
			{
			sReturn = "åºåæ´æ°å¤±è´¥åæ§å¶å¤æå¤±è´¥ï¼";
			oCn.RollBack();
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
			{
			sReturn = "åºåæ´æ°å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//============================
			}
			//åå¥æ¥å¿
			string WorkList = "åå®¡æ ¸åæ®ï¼åæ®å·ï¼" + HBillNo;
			string SystemName = "LMES-" + MvarReportTitle + "æ¨¡å";
			oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			"(getdate(),'" + sUser + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','åå®¡æ ¸')"
			);

			sReturn = "åå®¡æ ¸åæ®æåï¼";
			oCn.Commit();
			return true;
			}
			catch (Exception e)
			{
			oCn.RollBack();
			sReturn = e.Message;
			throw (e);
			}
			}

			//åèµ·å¤çº§å®¡æ¹
			public bool startCheckFlow(Int64 lngBillKey,ref string sReturn)
			{
			try
			{
			string HBillNo = ""; //åæ®å·
			string HCheckFlowID = ""; //å®¡æ¹æµID
			string HCheckItemNowID = ""; //å½åå®¡æ ¸é¡¹ç®ID
			string HCheckItemNextID = ""; //å¾å®¡æ ¸é¡¹ç®ID

			//å¤ææ¯å¦å·²ç»åèµ·å®¡æ¹
			string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + this.BillType + "'";
			DataSet ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
			if (ds0 != null && ds0.Tables[0].Rows.Count > 0)
			{
			sReturn = "åæ®å·²åèµ·å®¡æ¹ï¼ä¸å¯éå¤å®¡æ¹ï¼";
			return false;
			}

			//è·ååæ®æ°æ®
			string sql = "select * from " + this.MvarItemKey + " where HInterID = " + lngBillKey;
			DataSet ds = oCn.RunProcReturn(sql, this.MvarItemKey);
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			sReturn = "åæ®ä¸åå¨ï¼";
			return false;
			}
			HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
			string HCheckFlowID_select = ds.Tables[0].Rows[0]["HCheckFlowID"].ToString();
			//è·ååæ®ç±»åå¯¹åºçé»è®¤å®¡æ¹æµ
			string sql1 = "select b.HInterID,b.HCheckItemID from Xt_CheckFlowMain as a " +
			"inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
			"where a.HBillTypeID = '" + this.BillType + "' " +
			"and a.HInterID = " + HCheckFlowID_select + " " +
			"order by b.HFlowNo asc";
			DataSet ds1 = oCn.RunProcReturn(sql1, "Xt_CheckFlowMain");
			if (ds1 == null \|\| ds1.Tables[0].Rows.Count == 0)
			{
			sReturn = "é»è®¤å®¡æ¹æµä¸åå¨ï¼";
			return false;
			}

			HCheckFlowID = ds1.Tables[0].Rows[0]["HInterID"].ToString();
			HCheckItemNowID = ds1.Tables[0].Rows[0]["HCheckItemID"].ToString();
			if (ds1.Tables[0].Rows.Count >= 2)
			{
			HCheckItemNextID = ds1.Tables[0].Rows[1]["HCheckItemID"].ToString();
			}
			else
			{
			HCheckItemNextID = "0";
			}

			oCn.BeginTran();
			//å¢å åæ®å®¡æ¹ç¶æè¡¨ æ°æ®
			for (int i = 0; i < ds1.Tables[0].Rows.Count; i++)
			{
			string sql2 = "insert into Xt_BillCheckFlowStatus" +
			"(HBillTypeID,HBillInterID,HBillNo,HCheckFlowID,HCheckItemID,HChecker,HCheckDate,HCheckNote) " +
			"values(" +
			"'" + this.BillType + "'," +
			"" + lngBillKey + "," +
			"'" + HBillNo + "'," +
			"" + ds1.Tables[0].Rows[i]["HInterID"].ToString() + "," +
			"" + ds1.Tables[0].Rows[i]["HCheckItemID"].ToString() + "," +
			"" + "''" + "," +
			"" + "''" + "," +
			"" + "''" + "" +
			")";

			oCn.RunProc(sql2);
			}

			//æ´æ°ä¸»è¡¨ å®¡æ¹æµ æ°æ®
			string sql3 = "update " + this.MvarItemKey + " set HCheckFlowID = " + HCheckFlowID + ",HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + ",HBillStatus=" + 6 + " where HInterID = " + lngBillKey;
			oCn.RunProc(sql3);


			oCn.Commit();

			return true;
			}
			catch (Exception e)
			{
			sReturn += e.Message;
			return false;
			}
			}

			//é©³å
			public bool RejectCheckFlowProgress(Int64 lngBillKey, string HBillNo,string sUser, ref string sReturn)
			{

			if (isUse(lngBillKey, ref sReturn))
			{
			return false;
			}
			try
			{
			//å¼å¯äºå¡
			oCn.BeginTran();

			//å¤ææ¯å¦åå¨å®¡æ ¸è¿çé¡¹ç®
			//string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + this.BillType + "' and ISNULL(HChecker,'') <> ''";
			//DataSet ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
			//if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
			//{
			// sReturn = "åæ®ä¸åå¨å·²ç»å®¡æ ¸çé¡¹ç®ï¼";
			// return false;
			//}

			//è·åéè¦é©³åçå®¡æ ¸é¡¹ç®
			string sql0 = "select c.* from Xt_CheckFlowMain as a " +
			"inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
			"inner join Xt_BillCheckFlowStatus as c on a.HBillTypeID = c.HBillTypeID and b.HCheckItemID = c.HCheckItemID " +
			"where c.HBillTypeID = '" + this.BillType + "' and c.HBillInterID = " + lngBillKey + " " +
			"order by b.HFlowNo asc";
			DataSet ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
			if (ds0 == null \|\| ds0.Tables[0].Rows.Count == 0)
			{
			sReturn = "é©³åå¤±è´¥!åå :æªåèµ·å®¡æ¹ï¼ï¼";
			return false;
			}
			//è·åå½åå®¡æ ¸é¡¹ç®
			string HCheckFlowID = ds0.Tables[0].Rows[0]["HCheckFlowID"].ToString(); //å®¡æ¹æµåç
			sql0 = "select * from " + MvarItemKey + " where HInterID = " + lngBillKey;
			ds0 = oCn.RunProcReturn(sql0, MvarItemKey);
			string HCheckItemNowID = ds0.Tables[0].Rows[0]["HCheckItemNowID"].ToString(); //å½åå®¡æ¹é¡¹ç®åç
			//æ¥æ¾æ¯å¦ææé
			string sql01 = "select * from Xt_CheckUserRight where HUserID = '" + sUser + "' and HCheckFlowInterID = " + HCheckFlowID + " and HCheckItemID = " + HCheckItemNowID + "";
			DataSet ds01 = oCn.RunProcReturn(sql01, "Xt_CheckUserRight");
			if (ds01.Tables[0].Rows.Count == 0)
			{
			sReturn = "æ æéï¼";
			return false;
			}
			//æ´æ° é©³åå é¤å®¡æ ¸æµç¶æè¡¨
			string sql02 = "Delete Xt_BillCheckFlowStatus where HBillTypeID = '" + this.BillType + "' and HBillInterID=" + lngBillKey + " and HCheckFlowID=" + HCheckFlowID;
			oCn.RunProc(sql02);
			oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=5,HCheckItemNowID = 0,HCheckItemNextID = 0 Where HInterID=" + lngBillKey.ToString());

			//åå¥æ¥å¿
			string WorkList = "é©³ååæ®ï¼åæ®å·ï¼" + HBillNo;
			string SystemName = "LMES-" + MvarReportTitle + "æ¨¡å";
			oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
			"(getdate(),'" + sUser + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','" + IPAddress + "','é©³å')"
			);

			sReturn = "åå®¡æ ¸åæ®æåï¼";
			@@ -429,6 +623,21 @@
			//å®¡æ ¸æ´æ° åæ¶åºåè¡¨ åå°åºå 1204
			ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory '" + lngBillKey.ToString() + "','" + HBillType + "','1'", "h_KF_UPDateICinventory");
			}
			//=========================å®¡æ ¸åå®¡æ ¸åè´åºåæ§å¶
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_KF_ICinventoryStockCtrl '" + lngBillKey.ToString() + "', '" + HBillType + "'", "h_p_KF_ICinventoryStockCtrl");
			if (ds2 == null)
			{
			sReturn = "åºåæ´æ°åæ§å¶å¤æå¤±è´¥ï¼";
			oCn.RollBack();
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
			{
			sReturn = "åºåæ´æ°å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//============================
			}
			sReturn = "";
			return true;
			@@ -499,7 +708,27 @@
			//å®¡æ ¸æ´æ° åæ¶åºåè¡¨ å¢å åºå 1201 1202 1203 1247 1244 1251 1210
			//å®¡æ ¸æ´æ° åæ¶åºåè¡¨ åå°åºå 1204 1250 1206 1245 1239
			ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory '" + lngBillKey.ToString() + "','" + HBillType + "','1'", "h_KF_UPDateICinventory");
			}
			}//ç´æ¥è°æ¨åå®¡æ ¸æ´æ°
			else if (HBillType == "1207")
			{
			//æ´æ°åæ¶åºåè¡¨ åå°è°å¥åºå,å¢å è°åºåºå
			ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory_Move '" + lngBillKey.ToString() + "','" + HBillType + "','1'", "h_KF_UPDateICinventory_Move");
			}
			//=========================å®¡æ ¸åå®¡æ ¸åè´åºåæ§å¶
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_KF_ICinventoryStockCtrl '" + lngBillKey.ToString() + "', '" + HBillType +"'", "h_p_KF_ICinventoryStockCtrl");
			if (ds2 == null)
			{
			sReturn = "åºåæ´æ°åæ§å¶å¤æå¤±è´¥ï¼";
			oCn.RollBack();
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
			{
			sReturn = "åºåæ´æ°å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//============================
			}
			//åå¥æ¥å¿
			string WorkList = "å®¡æ ¸åæ®ï¼åæ®å·ï¼" + HBillNo;