MES-WEB-API.git

			@@ -206,14 +206,14 @@
			",HWhID,HWHName,HSupID,HSupName " +
			",HSCWHID,HSCWHName " +
			",HCloudUserName,HCloudUserPsd,HUSEORGID,HProcID" +
			",HGroupID,HSourceID) " +
			",HGroupID,HSourceID,HCheckEmpID,HWorkCenterID,HICNumber) " +
			"values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString() + "','" + lsmain[0].HEmpID.ToString() + "',"+ lsmain[0].HK3UserID.ToString() + "" +
			","+ lsmain[0].HKeeperID.ToString() + ",'"+ lsmain[0].HKeeper.ToString() + "',"+ lsmain[0].HSecManagerID.ToString() + ",'"+ lsmain[0].HSecManager.ToString() + "'" +
			"," + lsmain[0].HSellManID.ToString() + ",'" + lsmain[0].HSellMan.ToString() + "'," + lsmain[0].HDeptID.ToString() + ",'" + lsmain[0].HDept.ToString() + "'" +
			"," + lsmain[0].HWhID.ToString() + ",'" + lsmain[0].HWHName.ToString() + "'," + lsmain[0].HSupID.ToString() + ",'" + lsmain[0].HSupName.ToString() + "'" +
			"," + lsmain[0].HSCWHID.ToString() + ",'" + lsmain[0].HSCWHName.ToString() + "'" +
			",'" + lsmain[0].HCloudUserName.ToString() + "','" + lsmain[0].HCloudUserPsd.ToString() + "',"+ lsmain[0].HOrgID.ToString() + "," + lsmain[0].HProcID.ToString() + "" +
			","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + ")");
			","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + "," + lsmain[0].HCheckEmpID.ToString() + "," + lsmain[0].HWorkCenterID.ToString() + ",'" + lsmain[0].HICNumber + "'" + ")");

			//新增后查询确保数据添加成功
			ds = oCN.RunProcReturn("Select * from Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
			@@ -256,6 +256,7 @@
			",HDeptID=" + lsmain[0].HDeptID.ToString() +
			",HDept='" + lsmain[0].HDept.ToString() + "'" +
			",HWhID=" + lsmain[0].HWhID.ToString() +
			",HCheckEmpID=" + lsmain[0].HCheckEmpID.ToString() +
			",HWHName='" + lsmain[0].HWHName.ToString() + "'" +
			",HSCWHID=" + lsmain[0].HSCWHID.ToString() +
			",HSCWHName='" + lsmain[0].HSCWHName.ToString() + "'" +
			@@ -263,10 +264,12 @@
			",HProcID=" + lsmain[0].HProcID.ToString() +
			",HSourceID=" + lsmain[0].HSourceID.ToString() +
			",HGroupID=" + lsmain[0].HGroupID.ToString() +
			",HWorkCenterID=" + lsmain[0].HWorkCenterID.ToString() +
			",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
			",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
			",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
			",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
			",HICNumber='" + lsmain[0].HICNumber + "'" +
			" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
			}
			else
			@@ -283,6 +286,7 @@
			",HSellMan='" + lsmain[0].HSellMan.ToString() + "'" +
			",HDeptID=" + lsmain[0].HDeptID.ToString() +
			",HDept='" + lsmain[0].HDept.ToString() + "'" +
			",HCheckEmpID=" + lsmain[0].HCheckEmpID.ToString() +
			",HWhID=" + lsmain[0].HWhID.ToString() +
			",HWHName='" + lsmain[0].HWHName.ToString() + "'" +
			",HSCWHID=" + lsmain[0].HSCWHID.ToString() +
			@@ -291,10 +295,12 @@
			",HProcID=" + lsmain[0].HProcID.ToString() +
			",HSourceID=" + lsmain[0].HSourceID.ToString() +
			",HGroupID=" + lsmain[0].HGroupID.ToString() +
			",HWorkCenterID=" + lsmain[0].HWorkCenterID.ToString() +
			",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
			",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
			",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
			",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
			",HICNumber='" + lsmain[0].HICNumber + "'" +
			" where Czybm='" + lsmain[0].Czybm.ToString() + "'");
			}

			@@ -3218,12 +3224,26 @@
			}
			}

			//判定该用户与客户是否已经关联
			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
			//判定客户是否已经关联用户
			sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
			" from Gy_UserCustomerRelation as a" +
			" left join Gy_Czygl as b on a.HUserID = b.Czybm " +
			" left join Gy_Customer as c on a.HCusID = c.HItemID " +
			" where a.HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count > 0)
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HUserID"].ToString()!= HUserID)
			{
			err += "用户已经关联该客户；";
			err += "用户【" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "】已经关联客户【" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "】；";
			}
			else
			{
			//判定该用户与客户是否已经关联
			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count > 0)
			{
			err += "用户已经关联该客户；";
			}
			}

			tb2.Rows[i - 1]["判定结果"] = err;
			@@ -3305,12 +3325,26 @@
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
			sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
			" from Gy_UserCustomerRelation as a" +
			" left join Gy_Czygl as b on a.HUserID = b.Czybm " +
			" left join Gy_Customer as c on a.HCusID = c.HItemID " +
			" where a.HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
			"values(" +
			"'" + HUserID + "'" +
			"," + HCusID + "" +
			")";
			oCN.RunProc(sql);
			oCN.RunProc(sql);
			}
			else
			{
			err += "第" + i + "行：用户【" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "】已经关联客户【" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "】,客户不可被多个用户关联！";
			}
			i++;
			}
			else
			{
			@@ -3318,7 +3352,18 @@
			}
			i++;
			}
			}else if(saveType == "2")
			//判断是否存在错误
			if (err.Length > 0)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "导入错误：" + err;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else if(saveType == "2")
			{
			oCN.BeginTran();
			string err = "";
			@@ -3334,20 +3379,34 @@
			string HOrgNumber = item["组织代码"].ToString();
			string HOrgName = item["组织名称"].ToString();

			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;

			sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
			" from Gy_UserCustomerRelation as a" +
			" left join Gy_Czygl as b on a.HUserID = b.Czybm " +
			" left join Gy_Customer as c on a.HCusID = c.HItemID " +
			" where a.HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HUserID"].ToString()!=HUserID)
			{
			sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
			"values(" +
			"'" + HUserID + "'" +
			"," + HCusID + "" +
			")";
			oCN.RunProc(sql);
			err += "第" + i + "行：用户【" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "】已经关联客户【" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "】,客户不可被多个用户关联！";
			}
			else
			{
			err += "第" + i + "行：用户已经关联该客户!";
			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			sql = "insert into Gy_UserCustomerRelation(HUserID,HCusID)" +
			"values(" +
			"'" + HUserID + "'" +
			"," + HCusID + "" +
			")";
			oCN.RunProc(sql);
			}
			else
			{
			err += "第" + i + "行：用户已经关联该客户!";
			}
			}
			i++;
			}
			@@ -3594,7 +3653,11 @@
			string HCusName = item["HCusName"].ToString(); //客户名称


			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID;
			sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
			" from Gy_UserCustomerRelation as a" +
			" left join Gy_Czygl as b on a.HUserID = b.Czybm " +
			" left join Gy_Customer as c on a.HCusID = c.HItemID " +
			" where a.HCusID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count == 0)
			{
			@@ -3607,7 +3670,7 @@
			}
			else
			{
			err += "第" + i + "行：用户【" + HUserName + "】已经关联客户【" + HCusName + "】";
			err += "第" + i + "行：用户【" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "】已经关联客户【" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "】,客户不可被多个用户关联！";
			}
			i++;
			}
			@@ -3641,7 +3704,11 @@
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if (ds.Tables[0].Rows.Count > 0)
			{
			sql = "select * from Gy_UserCustomerRelation where HUserID = '" + HUserID + "' and HCusID = " + HCusID + " and HItemID <> " + HItemID;
			sql = "select a.HItemID,a.HCusID,c.HName HCusName,a.HUserID,b.Czymc " +
			" from Gy_UserCustomerRelation as a" +
			" left join Gy_Czygl as b on a.HUserID = b.Czybm " +
			" left join Gy_Customer as c on a.HCusID = c.HItemID " +
			" where a.HCusID = " + HCusID + " and a.HItemID <> " + HItemID;
			ds = oCN.RunProcReturn(sql, "Gy_UserCustomerRelation");
			if(ds.Tables[0].Rows.Count == 0)
			{
			@@ -3653,7 +3720,7 @@
			}
			else
			{
			err += "第" + i + "行：用户【" + HUserName + "】已经关联客户【" + HCusName + "】";
			err += "第" + i + "行：用户【" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "】已经关联客户【" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "】,客户不可被多个用户关联！";
			}
			}
			else