From 85d25ecc7b0c82879da899106f203be503e80210 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 24 四月 2024 10:04:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BLL/Xt_UserController.cs | 109 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 87 insertions(+), 22 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 4c60ad0..5bb295d 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -206,14 +206,14 @@
",HWhID,HWHName,HSupID,HSupName " +
",HSCWHID,HSCWHName " +
",HCloudUserName,HCloudUserPsd,HUSEORGID,HProcID" +
- ",HGroupID,HSourceID) " +
+ ",HGroupID,HSourceID,HCheckEmpID,HWorkCenterID) " +
"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() + ")");
//鏂板鍚庢煡璇� 纭繚鏁版嵁娣诲姞鎴愬姛
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,6 +264,7 @@
",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() + "'" +
@@ -283,6 +285,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,6 +294,7 @@
",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() + "'" +
@@ -3218,12 +3222,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 +3323,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 +3350,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 +3377,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 +3651,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 +3668,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 +3702,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 +3718,7 @@
}
else
{
- err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + HUserName + "銆戝凡缁忓叧鑱斿鎴枫��" + HCusName + "銆�";
+ err += "绗�" + i + "琛岋細鐢ㄦ埛銆�" + ds.Tables[0].Rows[0]["Czymc"].ToString() + "銆戝凡缁忓叧鑱斿鎴枫��" + ds.Tables[0].Rows[0]["HCusName"].ToString() + "銆�,瀹㈡埛涓嶅彲琚涓敤鎴峰叧鑱旓紒";
}
}
else
--
Gitblit v1.9.1