MES-WEB-API.git

			@@ -84,6 +84,65 @@
			}
			}

			#region 返回仓库列表分页
			/// <summary>
			/// 返回仓库列表分页
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_Warehouse/listPage")]
			[HttpGet]
			public object listPage(string sWhere, string user, string Organization, int page, int size)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn($@"exec h_p_Gy_WareHouse_ListPage {page}, {size}, ''", "h_p_Gy_WareHouse_ListPage");
			}
			else
			{
			sWhere = sWhere.Replace("'", "''");

			ds = oCN.RunProcReturn($@"exec h_p_Gy_WareHouse_ListPage {page}, {size}, '{sWhere}'", "h_p_Gy_WareHouse_ListPage");
			}


			//添加列名
			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列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			public class TreeModel
			{
			@@ -211,7 +270,126 @@
			}
			}


			#region 返回仓库列表分页
			/// <summary>
			/// 返回仓库列表分页
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_StockPlace/list1Page")]
			[HttpGet]
			public object list1Page(string sWhere, string user, string Organization, int page, int size)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn($@"exec h_p_IF_StockPlaceListPage {page}, {size}, ''", "h_p_IF_StockPlaceListPage");
			}
			else
			{
			sWhere = sWhere.Replace("'", "''");

			ds = oCN.RunProcReturn($@"exec h_p_IF_StockPlaceListPage {page}, {size}, '{sWhere}'", "h_p_IF_StockPlaceListPage");
			}


			//添加列名
			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列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 返回仓库列表分页含组织筛选
			/// <summary>
			/// 返回仓库列表分页
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_StockPlace/list2Page")]
			[HttpGet]
			public object list2Page(string sWhere, string user, int page, int size)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn($@"exec h_p_IF_StockPlaceListPage {page}, {size}, ''", "h_p_IF_StockPlaceListPage");
			}
			else
			{
			sWhere = sWhere.Replace("'", "''");

			ds = oCN.RunProcReturn($@"exec h_p_IF_StockPlaceListPage {page}, {size}, '{sWhere}'", "h_p_IF_StockPlaceListPage");
			}


			//添加列名
			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列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion


			/// <summary>
			/// 返回仓位列表
			@@ -731,7 +909,7 @@
			#region [同步基础资料]
			[Route("Gy_Warehouse/Gy_WarehouseViewApi")]
			[HttpGet]
			public json Gy_WarehouseViewApi(string Number, string Type)
			public json Gy_WarehouseViewApi(string Number, string Type, string HUseOrgID)
			{
			string sql = string.Empty;
			string sReturn = "";
			@@ -789,14 +967,23 @@
			{
			#region [公有云模式，调用WEBAPI的方式进行更新]
			var json = new
			//{
			// CreateOrgId = 0,
			// Number = Number,
			// Id = ""
			//};
			{
			CreateOrgId = 0,
			Number = Number,
			Id = ""
			FormId = "BD_STOCK",
			FieldKeys = "FMASTERID,FNUMBER,FNAME,FFORBIDSTATUS,FISOPENLOCATION,FAllowMinusQty,FCREATEDATE,FCREATEORGID,FUSEORGID,FSTOCKPROPERTY,FDefStockStatusId",
			FilterString = $@"FNUMBER='{Number}' AND FUSEORGID={HUseOrgID}",
			OrderString = "",
			TopRowCount = 0,
			StartRow = 0,
			Limit = 0
			};
			#region [金蝶部分]
			//登录金蝶
			var loginRet = InvokeHelper.Login();
			#region [金蝶部分]
			//登录金蝶
			var loginRet = InvokeHelper.Login();
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			//判断是否登录成功
			if (isSuccess < 0)
			@@ -808,14 +995,22 @@
			return objJsonResult;
			}
			//查看获取数据
			var _result = InvokeHelper.View("BD_STOCK", JsonConvert.SerializeObject(json));
			var _saveObj = JObject.Parse(_result);
			var _result = InvokeHelper.Query("BD_STOCK", JsonConvert.SerializeObject(json));
			var _saveObj = JArray.Parse(_result);
			//判断数据是否获取成功
			if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			// if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "金蝶仓库仓位同步失败jsonRoot：" + _result;
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			if (_saveObj.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "金蝶仓库仓位同步失败jsonRoot：" + _result;
			objJsonResult.Message = "金蝶客户同步失败，使用组织对应的仓库代码无对应的仓库";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -831,26 +1026,47 @@

			#region [表数据赋值]
			var jsonData = new
			//{
			// HItemID = _saveObj["Result"]["Result"]["Id"],
			// HERPItemID = _saveObj["Result"]["Result"]["Id"],
			// HNumber = _saveObj["Result"]["Result"]["Number"],
			// HName = _saveObj["Result"]["Result"]["Name"][0]["Value"],
			// HShortNumber = _saveObj["Result"]["Result"]["Number"],
			// HParentID = 0,
			// HLevel = 1,
			// HEndFlag = 1,
			// HStopflag = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
			// HRemark = "CLD-ERP导入",
			// HSPFlag = _saveObj["Result"]["Result"]["IsOpenLocation"].ToString() == "false" ? 0 : 1,
			// HSPGroupID = 0,
			// HUnderStock = _saveObj["Result"]["Result"]["AllowMinusQty"].ToString() == "false" ? 0 : 1,
			// HUseFlag = "已使用",
			// HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
			// HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
			// HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
			// HSTOCKPROPERTY = _saveObj["Result"]["Result"]["StockProperty"],
			// HDEFSTOCKSTATUSID = _saveObj["Result"]["Result"]["DefStockStatusId_Id"],
			//};
			{
			HItemID = _saveObj["Result"]["Result"]["Id"],
			HERPItemID = _saveObj["Result"]["Result"]["Id"],
			HNumber = _saveObj["Result"]["Result"]["Number"],
			HName = _saveObj["Result"]["Result"]["Name"][0]["Value"],
			HShortNumber = _saveObj["Result"]["Result"]["Number"],
			HParentID = 0,
			HLevel = 1,
			HEndFlag = 1,
			HStopflag = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
			HRemark = "CLD-ERP导入",
			HSPFlag = _saveObj["Result"]["Result"]["IsOpenLocation"].ToString() == "false" ? 0 : 1,
			HSPGroupID = 0,
			HUnderStock = _saveObj["Result"]["Result"]["AllowMinusQty"].ToString() == "false" ? 0 : 1,
			HUseFlag = "已使用",
			HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
			HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
			HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_Id"],
			HSTOCKPROPERTY = _saveObj["Result"]["Result"]["StockProperty"],
			HDEFSTOCKSTATUSID = _saveObj["Result"]["Result"]["DefStockStatusId_Id"],
			HItemID = _saveObj[0][0],
			HERPItemID = _saveObj[0][0],
			HNumber = _saveObj[0][1],
			HName = _saveObj[0][2],
			HShortNumber = _saveObj[0][1],
			HParentID = 0,
			HLevel = 1,
			HEndFlag = 1,
			HStopflag = _saveObj[0][3].ToString() == "A" ? 0 : 1,
			HRemark = "CLD-ERP导入",
			HSPFlag = _saveObj[0][4].ToString() == "false" ? 0 : 1,
			HSPGroupID = 0,
			HUnderStock = _saveObj[0][5].ToString() == "false" ? 0 : 1,
			HUseFlag = "已使用",
			HMakeTime = _saveObj[0][6],
			HCREATEORGID = _saveObj[0][7],
			HUSEORGID = _saveObj[0][8],
			HSTOCKPROPERTY = _saveObj[0][9],
			HDEFSTOCKSTATUSID = _saveObj[0][10],
			};
			#endregion
			// 删除主表对应数据