MES-WEB-API.git

			@@ -46,7 +46,8 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 组织名称='" + Organization + "'");
			//string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 组织名称='" + Organization + "'");
			string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 1=1 ");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql1 + sWhere + "order by 部门代码", "h_v_IF_DepartmentList");
			@@ -65,24 +66,24 @@
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			if (ds.Tables[0].Rows.Count > 0 && ds != null)
			{
			//if (ds.Tables[0].Rows.Count > 0 && ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有查询到部门数据，请联系系统管理员进行核对";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			//}
			//else
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "没有查询到部门数据，请联系系统管理员进行核对";
			// objJsonResult.data = ds.Tables[0];
			// objJsonResult.list = columnNameList;
			// return objJsonResult;
			//}


			}
			@@ -177,37 +178,7 @@
			}

			}
			#endregion


			#region 设备分布生产资源对应的订单

			[Route("Sc_OrderStateDistribution/Sc_OrderStateDistribution_Souce")]
			[HttpGet]
			public object Sc_OrderStateDistribution_Souce(string sWhere,string user,int OrganizationID)
			{
			try
			{
			string sql1 = string.Format("exec h_p_sc_HDeptSouceMOList {0},{1}", sWhere, OrganizationID);

			ds = oCN.RunProcReturn(sql1, "h_p_sc_HDeptSouceMOList");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion

			/// <summary>
			/// 根据基础资料ID 查找记录
			@@ -552,6 +523,8 @@
			//DateTime HCheckDate = list[0].HCheckDate;
			string HDeleteMan = list[0].HDeleteMan;
			//DateTime HDeleteDate = list[0].HDeleteDate;
			bool HWorkShopFlag = list[0].HWorkShopFlag;
			long HEmpQtys = list[0].HEmpQtys;
			//末级标志
			bool HEndFlag = true;
			long HEntityID = 1;
			@@ -592,7 +565,7 @@
			return objJsonResult;
			}
			}


			//判断权限
			//if (!ClsPub.Security_Log(msg5, 1, false, msg4))
			//{
			@@ -621,7 +594,17 @@
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//查询数据中是否存在重复代码
			ds = oCN.RunProcReturn("Select HItemID from Gy_Department Where HItemID<>" + HItemID + " and HNumber='" + HNumber + "' and HUSEORGID=" + HUseOrgID, "Gy_Warehouse");

			if (ds.Tables[0].Rows.Count > 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！代码重复！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			//保存
			//保存完毕后处理
			if (HItemID == 0)
			@@ -630,10 +613,10 @@
			oCN.BeginTran();
			oCN.RunProc("Insert into Gy_Department " +
			" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID,HCREATEORGID,HMaker,HMakeTime) " +
			",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID,HCREATEORGID,HMaker,HMakeTime,HWorkShopFlag,HEmpQtys) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
			"," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" +
			"," + HEntityID.ToString() + "," + HUseOrgID + ","+ HCreateOrgID + ",'"+ msg3 + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
			"," + HEntityID.ToString() + "," + HUseOrgID + ","+ HCreateOrgID + ",'"+ msg3 + "',getdate(),"+ Convert.ToString(HWorkShopFlag ? 1 : 0) + ","+ HEmpQtys + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();
			@@ -641,6 +624,19 @@
			else
			{
			oCN.BeginTran();
			//已审核不允许修改
			DataSet dss;
			dss = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HItemID, "Gy_Warehouse");
			//判断是否可编辑
			if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "此单据状态已经审核，不允许修改！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//主表
			oCN.RunProc("Update Gy_Department set " +
			" HNumber='" + HNumber + "'" +
			@@ -656,6 +652,8 @@
			",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
			",HUpDater='" + HUpDater + "'" +
			",HUpDateDate= getdate()" +
			",HWorkShopFlag=" + Convert.ToString(HWorkShopFlag ? 1 : 0) +
			",HEmpQtys=" + HEmpQtys.ToString() +
			",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改子项目代码
			//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
			@@ -816,7 +814,7 @@
			#region [同步基础资料]
			[Route("Gy_Department/Gy_DepartmentViewApi")]
			[HttpGet]
			public json Gy_DepartmentViewApi(string Number, string Type)
			public json Gy_DepartmentViewApi(string Number, string Type,string HUseOrgID)
			{
			string sql = string.Empty;
			string sReturn = "";
			@@ -874,14 +872,23 @@
			{
			#region [公有云模式，调用WEBAPI的方式进行更新]
			var json = new
			//{
			// CreateOrgId = 0,
			// Number = Number,
			// Id = ""
			//};
			{
			CreateOrgId = 0,
			Number = Number,
			Id = ""
			FormId = "BD_Department",
			FieldKeys= "FMASTERID, FNUMBER, FNAME, FFORBIDSTATUS, FCREATEDATE, FCREATEORGID, FUSEORGID",
			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)
			@@ -893,14 +900,22 @@
			return objJsonResult;
			}
			//查看获取数据
			var _result = InvokeHelper.View("BD_Department", JsonConvert.SerializeObject(json));
			var _saveObj = JObject.Parse(_result);
			var _result = InvokeHelper.Query("BD_Department", 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;
			}
			@@ -916,21 +931,37 @@

			#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导入",
			// HUseFlag = "已使用",
			// HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
			// HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
			// HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_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导入",
			HUseFlag = "已使用",
			HMakeTime = _saveObj["Result"]["Result"]["CreateDate"],
			HCREATEORGID = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
			HUSEORGID = _saveObj["Result"]["Result"]["UseOrgId_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导入",
			HUseFlag = "已使用",
			HMakeTime = _saveObj[0][4],
			HCREATEORGID = _saveObj[0][5],
			HUSEORGID = _saveObj[0][6],
			};
			#endregion
			// 删除主表对应数据