MES-WEB-API.git

			@@ -445,6 +445,9 @@
			{
			Main.HBillNo = ListHbillNo[i].HBillNo;
			Main.HQty = ListHbillNo[i].HQty;
			Main.HSplitNo = ListHbillNo[i].HSplitNo;
			Main.HAuxQty = 0;
			Main.HAuxUnit = 0;
			oBill.omodel = Main;

			int j = 0;
			@@ -900,12 +903,26 @@
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

			var ds1= oCN.RunProcReturn("select isnull(max(流水号),0) from h_v_Sc_ProcessExchangeBillQuerySub where hmainid=" + HInterID + " and 出站关联数量>0 ", "h_v_Sc_ProcessExchangeBillQuerySub");

			string sql = string.Format(@"select * from h_v_Sc_ProcessExchangeBillQuerySub");
			ds = oCN.RunProcReturn(sql + " where hmainid=" + HInterID, "h_v_Sc_ProcessExchangeBillQuerySub");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];

			ds = oCN.RunProcReturn(sql + " where hmainid=" + HInterID + " and 出站关联数量=0 and cast(流水号 as int)>" + ds1 .Tables[0].Rows[0][0].ToString(), "h_v_Sc_ProcessExchangeBillQuerySub");

			if (float.Parse(ds.Tables[0].Rows[0]["进站关联数量"].ToString()) > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前单据:"+ ds.Tables[0].Rows[0]["工序名称"].ToString() + "未出站不能拆分!";
			objJsonResult.data = ds.Tables[0];
			}
			else {
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			}
			}
			catch (Exception e)
			{
			@@ -987,24 +1004,52 @@
			//msg2 = msg2.Replace("'", "’");
			List<Model.ClsSc_ProcessExchangeBillSub> ls = new List<Model.ClsSc_ProcessExchangeBillSub>();
			ls = oListModels.getObjectByJson_Sc_ProcessExchangeBillSub(msg3);
			int i = 0;
			foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in ls)
			{

			string HEntryID = "";

			if (oItemSub.HSplitQty > oItemSub.HLeftQty)
			for (int i = 0; i < oBill.DetailColl.Count; i++)
			{
			if (oBill.DetailColl[i].HRelationQty_Out > 0 \|\| oBill.DetailColl[i].HRelationQty_In > 0)
			{
			HEntryID += i + ",";
			}
			}
			if (HEntryID != "")
			{
			HEntryID = HEntryID.Substring(0, HEntryID.Length - 1);
			var num = HEntryID.Split(',');

			for (int k = 0; k < num.Length; k++)
			{
			oBill.DetailColl.RemoveAt(int.Parse(num[k]) - k);
			}
			}

			int j = 0 ;
			foreach (Model.ClsSc_ProcessExchangeBillSub oItemSub in oBill.DetailColl)
			{
			if (ls[j].HSplitQty > ls[j].HLeftQty)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "第" + (i + 1) + "行，拆分数量不能大于可拆分数量！";
			objJsonResult.Message = "第" + (j + 1) + "行，拆分数量不能大于可拆分数量！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oBill.DetailColl[i].HQty = oItemSub.HQty;
			oBill.DetailColl[i].HBackProc = oItemSub.HBackProc;
			oBill.DetailColl[i].HPrevSourceInterID = oItemSub.HPrevSourceInterID;
			oBill.DetailColl[i].HPrevSourceEntryID = oItemSub.HPrevSourceEntryID;
			i++;

			if (oBill.DetailColl[j].HProcNo == ls[j].HProcNo)
			{
			oBill.DetailColl[j].HEntryID = j+1;
			oBill.DetailColl[j].HQty = ls[j].HQty;
			oBill.DetailColl[j].HBackProc = ls[j].HBackProc;
			oBill.DetailColl[j].HPrevSourceInterID = ls[j].HPrevSourceInterID;
			oBill.DetailColl[j].HPrevSourceEntryID = ls[j].HPrevSourceEntryID;
			oBill.DetailColl[j].HRemark = ls[j].HRemark;
			oBill.DetailColl[j].HTechnologyParameter = ls[j].HTechnologyParameter;
			j++;
			}
			}


			//保存
			//保存完毕后处理
			@@ -1017,6 +1062,13 @@
			//{
			// bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//}

			oCN.BeginTran();

			oCN.RunProc("update Sc_ProcessExchangeBillSub set HQty=(select HQty from Sc_ProcessExchangeBillMain where HInterID="+ oBill.DetailColl[0].HPrevSourceInterID + ") where HInterID=" + oBill.DetailColl[0].HPrevSourceInterID );

			oCN.Commit();

			if (bResult)
			{
			objJsonResult.code = "0";