MES-WEB-API.git

			@@ -1013,8 +1013,8 @@

			oItemSub.HCloseType = false; //关闭类型

			oItemSub.HSourceInterID = 0; // 源单主内码
			oItemSub.HSourceEntryID = 0; //源单子内码
			//oItemSub.HSourceInterID = 0; // 源单主内码
			//oItemSub.HSourceEntryID = 0; //源单子内码


			oBill.DetailColl.Add(oItemSub);
			@@ -1065,7 +1065,7 @@
			}
			#endregion

			#region 其他入库单编辑页面初始化
			#region 直接调拨单编辑页面初始化
			[Route("Kf_MoveStockBill/Kf_MoveStockBillEdit")]
			[HttpGet]
			public object Kf_MoveStockBillEdit(long HInterID)
			@@ -1105,7 +1105,7 @@
			}
			#endregion

			#region 其它入库单审核/反审核功能
			#region 直接调拨单审核/反审核功能
			[Route("Kf_MoveStockBill/CheckKf_MoveStockBill")]
			[HttpGet]
			public object CheckKf_MoveStockBill(string HInterID, int Type, string user)
			@@ -1303,7 +1303,7 @@
			}
			#endregion

			#region 其它入库单关闭/反关闭功能
			#region 直接调拨单关闭/反关闭功能
			[Route("Kf_MoveStockBill/CloseKf_MoveStockBill")]
			[HttpGet]
			public object CloseKf_MoveStockBill(string HInterID, int Type, string user)
			@@ -1409,7 +1409,7 @@
			}
			#endregion

			#region 其他入库单作废/反作废功能
			#region 直接调拨单作废/反作废功能
			[Route("Kf_MoveStockBill/DropKf_MoveStockBill")]
			[HttpGet]
			public object DropKf_MoveStockBill(string HInterID, int Type, string user)
			@@ -1539,8 +1539,7 @@
			}
			#endregion


			#region 调拨单列表
			#region 直接调拨单列表
			/// <summary>
			/// 调拨单列表
			/// </summary>
			@@ -1589,7 +1588,7 @@
			}
			#endregion

			#region 调拨单删除
			#region 直接调拨单删除
			[Route("Kf_MoveStockBill/DelteteGetMoveStockBill")]
			[HttpGet]
			public object DelteteGetMoveStockBill(string HInterID, string user)
			@@ -1632,6 +1631,10 @@
			//==================================================================================

			oCN.BeginTran();

			//直接调拨单删除撤销回填调拨申请单关联数量
			oCN.RunProc("exec h_p_Kf_UpDateRelation_MoveStockRequestToPOStockIn_Del " + HInterID);

			oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
			oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);

			@@ -1670,6 +1673,43 @@
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 直接调拨单根据主内码与子内码获取调拨申请单数据
			[Route("Kf_MoveStockBill/loadKf_MoveStockBillMain_Push")]
			[HttpGet]
			public object loadKf_MoveStockBillMain_Push(long HInterID, long HSubID)
			{
			try
			{

			ds = oCN.RunProcReturn("select * from h_v_IF_MoveStockRequestBillList_Litee where hmainid =" + HInterID + " and hsubid = " + HSubID, "h_v_IF_MoveStockRequestBillList_Litee");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "未查询到源单信息！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			@@ -1796,7 +1836,11 @@

			oCN.BeginTran();
			//销售出库删除回填销售订单关联数量
			//oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + HInterID);
			oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + HInterID);

			//销售出库删除回填收货通知单关联数量
			oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Del " + HInterID);


			//oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
			//oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
			@@ -6089,8 +6133,7 @@
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取点检项目编辑数据
			ds = oCN.RunProcReturn(@"select a.HDotCheckItemID,HDotCheckItem, HDotCheckPart , HClaim, a.HRemark,a.HManagerID,e.HNumber HManagerCode,e.HName HManagerName from Sc_MouldDotCheckPlanBillSub a
			left join Gy_Employee e on a.HManagerID=e.HItemID
			ds = oCN.RunProcReturn(@"select * from h_v_Sc_MouldDotCheckPlanBill_Edit
			where 1=1 " + sqlWhere, "Sc_MouldDotCheckPlanBillSub");
			////获取配件项目编辑数据
			//ds1 = oCN.RunProcReturn(@"select b.HMaterID, mt.Hnumber HMaterNumber ,mt.HName HMaterName, b.HUnitID
			@@ -6103,7 +6146,7 @@
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = null;
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = list;
			}
			catch (Exception e)