MES-WEB-API.git

			@@ -252,6 +252,46 @@
			}
			#endregion

			#region 客户列表修改按钮方法添加审核人
			/// <summary>
			/// 客户列表修改按钮方法
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Gy_Customer/xg_extendCheckEmp")]
			[HttpGet]
			public object xg_extendCheckEmp(long HInterID)
			{
			try
			{
			string sql = string.Format(@"select c.HItemID,c.HNumber 客户代码,c.HName 客户名称,c.HHelpCode 助记码,c.HShortName 简称,c.HAddress 地址,c.HLinkMan 联系人,c.HLinkPhone 联系电话
			,c.HMobilePhone 手机,c.HFax 传真,c.HPostalCode 邮编,c.HEmail 电子邮件,c.HCorMan 法人代表,c.HBank 开户银行,c.HBankAccount 银行账号,c.HMateOutEmp 领用人,
			c.HTaxNum 税务登记号,c.HTaxRate 增值税率,c.HEnglishName 英文名称,c.HEngLishAddress 英文地址,c.HCountry 国家,c.HCusStatus 客户状态
			,c.HStopflag 禁用标志,c.HRemark 备注,c.HAreaID 地区ID,a.HName 地区名称,c.HCurID 默认货币ID,r.HName 默认货币,
			c.HSSID 结算方式ID,s.HName 结算方式,c.HCusTypeID 客户分类ID,t.HName 客户分类, c.HCheckEmp 审核人 from Gy_Customer c
			left join Gy_AreaSet a on c.HAreaID=a.HItemID
			left join Gy_Currency r on c.HCurID=r.HItemID
			left join Gy_SettleStyle s on c.HSSID=s.HItemID
			left join Gy_CusType t on c.HCusTypeID=t.HItemID
			where c.HItemID='" + HInterID + "'");
			ds = oCN.RunProcReturn(sql, "Gy_Customer");
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 获取当前最大的客户代码
			[Route("Gy_Customer/getMaxCusNumber")]
			[HttpGet]
			@@ -626,7 +666,7 @@
			",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
			",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
			",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
			",HCusTypeID) " +
			",HCusTypeID,HERPItemID,HUseOrgID,HCreateOrgID) " +
			" Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID +
			", " + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopFlag + "','" + lsmain[0].HRemark + "'" +
			",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
			@@ -636,7 +676,7 @@
			"," + lsmain[0].HEmpID + "," + lsmain[0].HCreditDate + "," + lsmain[0].HCreditRatingDate + "," + lsmain[0].HMaxCreditRatingDate +
			"," + lsmain[0].HMonthUseQty + "," + lsmain[0].HForecastCreditRating + "," + lsmain[0].HCreditLevelID + "," + lsmain[0].HCountAccrualRating +
			"," + lsmain[0].HSubsidyAccrualRating + "," + lsmain[0].HCreditRating + "," + lsmain[0].HMaxCreditRating +
			", " + lsmain[0].HCusTypeID + ")");
			", " + lsmain[0].HCusTypeID + "," + lsmain[0].HItemID + ",'" + lsmain[0].HUSEORGID + "','" + lsmain[0].HCREATEORGID + "')");
			//主表_客户
			oCN.RunProc("Insert into Gy_Customer " +
			" (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
			@@ -648,7 +688,7 @@
			",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
			",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
			",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
			",HCusTypeID,HERPItemID) " +
			",HCusTypeID,HERPItemID,HUseOrgID,HCreateOrgID) " +
			" Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID +
			", " + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopFlag + "','" + lsmain[0].HRemark + "'" +
			",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
			@@ -658,7 +698,7 @@
			"," + lsmain[0].HEmpID + "," + lsmain[0].HCreditDate + "," + lsmain[0].HCreditRatingDate + "," + lsmain[0].HMaxCreditRatingDate +
			"," + lsmain[0].HMonthUseQty + "," + lsmain[0].HForecastCreditRating + "," + lsmain[0].HCreditLevelID + "," + lsmain[0].HCountAccrualRating +
			"," + lsmain[0].HSubsidyAccrualRating + "," + lsmain[0].HCreditRating + "," + lsmain[0].HMaxCreditRating +
			", " + lsmain[0].HCusTypeID + "," + lsmain[0].HItemID + ")");
			", " + lsmain[0].HCusTypeID + "," + lsmain[0].HItemID + ",'" + lsmain[0].HUSEORGID + "','" + lsmain[0].HCREATEORGID + "')");
			sql = "set identity_insert gy_Customer off";
			oCN.RunProc(sql);
			//客户_交货地点
			@@ -1178,7 +1218,7 @@
			#region [同步基础资料]
			[Route("Gy_Customer/Gy_CustomerViewApi")]
			[HttpGet]
			public json Gy_CustomerViewApi(string Number, string Type)
			public json Gy_CustomerViewApi(string Number, string Type, string HUseOrgID)
			{
			string sql = string.Empty;
			string sReturn = "";
			@@ -1235,15 +1275,26 @@
			else
			{
			#region [公有云模式，调用WEBAPI的方式进行更新]
			// 使用查询的WEBAPI 无法满足按照使用组织更新数据的要求，改为使用单据查询
			var json = new
			// {
			// CreateOrgId = HUseOrgID,
			// Number = Number,
			// Id = ""
			// };
			{
			CreateOrgId = 0,
			Number = Number,
			Id = ""
			FormId = "BD_Customer",
			FieldKeys = "FMASTERID,FNUMBER,FNAME,FFORBIDDERID,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)
			@@ -1255,14 +1306,23 @@
			return objJsonResult;
			}
			//查看获取数据
			var _result = InvokeHelper.View("BD_Customer", JsonConvert.SerializeObject(json));
			var _saveObj = JObject.Parse(_result);
			// var _result = InvokeHelper.View("BD_Customer", JsonConvert.SerializeObject(json));
			var _result = InvokeHelper.Query("BD_Customer", 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;
			}
			@@ -1278,23 +1338,41 @@

			#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"],
			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["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
			HStopflag = _saveObj[0][3].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"],
			HMakeTime = _saveObj[0][4],
			HCREATEORGID = _saveObj[0][5],
			HUSEORGID = _saveObj[0][6],
			};
			#endregion

			LogService.Write("jsonData: " + jsonData);
			// 删除主表对应数据
			sql = $"delete from Gy_Customer where HItemID = " + jsonData.HItemID + " and HNumber = '" + Number + "'";
			oCN.RunProc(sql);