From 3fb978e25d7ea25038e56ec1db950189b413718b Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 04 三月 2023 11:17:30 +0800
Subject: [PATCH] 1.工单派发选择工艺路线或选择生产车间时判断绑定条件接口开发 2.组织架构删除update改为delete 3.工艺路线新增else if改为if
---
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 150 +++++++++++++++++++++++--------------------------
1 files changed, 71 insertions(+), 79 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 81d8f54..f120520 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -244,7 +244,7 @@
}
else
{
- sql = @"update TOrganization set is_delete='1' where id=@orgid";
+ sql = @"delete TOrganization where id=@orgid";
dynamicParams.Add(@"orgid", orgid);
cont = DapperHelper.SQL(sql, dynamicParams);
if (cont > 0)
@@ -1512,21 +1512,8 @@
}
if (unitAttr != "" && unitAttr != null)
{
- switch (unitAttr)
- {
- case "WG": //澶栬喘
- search += "and A.mtype=@unitAttr ";
- dynamicParams.Add("@unitAttr", unitAttr);
- break;
- case "WX": //澶栧崗
- search += "and A.btype=@unitAttr ";
- dynamicParams.Add("@unitAttr", unitAttr);
- break;
- default: //瀹㈡埛
- search += "and A.htype=@unitAttr ";
- dynamicParams.Add("@unitAttr", unitAttr);
- break;
- }
+ search += "and A.type=@unitAttr ";
+ dynamicParams.Add("@unitAttr", unitAttr);
}
if (createUser != "" && createUser != null)
{
@@ -1539,7 +1526,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.id,A.code,A.name,A.mtype,A.btype,A.htype,A.conttacts,A.conttphone,A.addr,T.username as lm_user,A.lm_date from TCustomer A
+ var sql = @"select A.id,A.code,A.name,A.type,A.conttacts,A.conttphone,A.addr,T.username as lm_user,A.lm_date from TCustomer A
left join TUser T on A.lm_user=T.usercode
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -1560,7 +1547,7 @@
#endregion
#region[寰�鏉ュ崟浣嶆柊澧炵紪杈慮
- public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string mtypecode, string btypecode, string htypecode, string person, string contact, string description, string usercode, string OperType)
+ public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string typecode, string person, string contact, string description, string usercode, string OperType)
{
var dynamicParams = new DynamicParameters();
try
@@ -1578,13 +1565,11 @@
mes.data = null;
return mes;
}
- var sql = @"insert into TCustomer(code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date)
- values(@unitcode,@unitname,@mtypecode,@btypecode,@htypecode,@person,@contact,@description,@usercode,@CreateDate)";
+ var sql = @"insert into TCustomer(code,name,type,conttacts,conttphone,addr,lm_user,lm_date)
+ values(@unitcode,@unitname,@typecode,@person,@contact,@description,@usercode,@CreateDate)";
dynamicParams.Add("@unitcode", unitcode);
dynamicParams.Add("@unitname", unitname);
- dynamicParams.Add("@mtypecode", mtypecode);
- dynamicParams.Add("@btypecode", btypecode);
- dynamicParams.Add("@htypecode", htypecode);
+ dynamicParams.Add("@typecode", typecode);
dynamicParams.Add("@person", person);
dynamicParams.Add("@contact", contact);
dynamicParams.Add("@description", description);
@@ -1608,12 +1593,10 @@
}
if (OperType == "Update")
{
- var sql = @"update TCustomer set name=@unitname,mtype=@mtypecode,btype=@btypecode,htype=@htypecode,conttacts=@person,conttphone=@contact,addr=@description,lm_user=@usercode,lm_date=@CreateDate where id=@unitid";
+ var sql = @"update TCustomer set name=@unitname,type=@typecode,conttacts=@person,conttphone=@contact,addr=@description,lm_user=@usercode,lm_date=@CreateDate where id=@unitid";
dynamicParams.Add("@unitid", unitid);
dynamicParams.Add("@unitname", unitname);
- dynamicParams.Add("@mtypecode", mtypecode);
- dynamicParams.Add("@btypecode", btypecode);
- dynamicParams.Add("@htypecode", htypecode);
+ dynamicParams.Add("@typecode", typecode);
dynamicParams.Add("@person", person);
dynamicParams.Add("@contact", contact);
dynamicParams.Add("@description", description);
@@ -1699,9 +1682,8 @@
#region[瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇
- public static ToMessage AnDengTypeSearch(int startNum, int endNum, string prop, string order)
+ public static ToMessage AnDengTypeSearch()
{
- var dynamicParams = new DynamicParameters();
try
{
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
@@ -1709,11 +1691,11 @@
var sql = @"select id, code,name
from TAnDonType
where is_delete<>'1' ";
- var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.count = total;
- mes.data = data.ToList();
+ mes.data = data;
}
catch (Exception e)
{
@@ -1840,24 +1822,16 @@
sql = @"select B.id,B.ando_cogfigid,U.usercode,U.username,A.enable from TAnDon_Roul_ConFig A
inner join TAnDon_Roul_ConFigUser B on A.id=B.ando_cogfigid
left join TUser U on B.usercode=U.usercode
- where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode";
+ where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode and U.is_delete=0";
dynamicParams.Add("@wkshopcode", wkshopcode);
dynamicParams.Add("@calltypecode", calltypecode);
var data = DapperHelper.selectdata(sql, dynamicParams);
- if (data.Rows.Count > 0)
- {
- mes.code = "200";
- mes.count = 0;
- mes.Message = "鏌ヨ鎴愬姛!";
- mes.data = data;
- }
- else
- {
- mes.code = "300";
- mes.count = 0;
- mes.Message = "鏆傛棤鍝嶅簲浜哄憳!";
- mes.data = null;
- }
+
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+
}
catch (Exception e)
{
@@ -1877,13 +1851,14 @@
var dynamicParams = new DynamicParameters();
try
{
- sql = @"select B.user_code as code,U.username as name,(case when C.usercode is null then 'N' else 'Y' end) flag from TUserRoleRelation B
- left join(
- select B.usercode from TAnDon_Roul_ConFig A
- inner join TAnDon_Roul_ConFigUser B on A.id=B.ando_cogfigid
- where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode
- ) C on B.user_code=C.usercode
- left join TUser U on B.user_code=U.usercode";
+ sql = @"select A.usercode,A.username,(case when B.usercode<>'' then 'Y' else 'N' end) as flag
+ from TUser A
+ left join (
+ select B.usercode from TAnDon_Roul_ConFig A
+ inner join TAnDon_Roul_ConFigUser B on A.id=B.ando_cogfigid
+ where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode
+ ) B on A.usercode=B.usercode
+ where A.userclassid='0'";
dynamicParams.Add("@wkshopcode", wkshopcode);
dynamicParams.Add("@calltypecode", calltypecode);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1928,30 +1903,19 @@
dynamicParams.Add("@wkshopcode", wkshopcode);
dynamicParams.Add("@calltypecode", calltypecode);
var data = DapperHelper.selectdata(sql, dynamicParams);
- mid = Convert.ToInt32(data.Rows[0]["ID"].ToString());
- if (json == null || json.Rows.Count <= 0)
+ if (data.Rows.Count > 0)
{
- //娓呴櫎瀹夌伅銆佽澶囦换鍔￠厤缃〃鏁版嵁
- sql = @"delete TAnDon_Roul_ConFig where id=@mid";
- list.Add(new { str = sql, parm = new { mid = mid } });
+ mid = Convert.ToInt32(data.Rows[0]["ID"].ToString());
//娓呴櫎瀹夌伅銆佽澶囦换鍔￠厤缃叧鑱斾汉鍛樿〃鏁版嵁
sql = @"delete TAnDon_Roul_ConFigUser where ando_cogfigid=@mid";
list.Add(new { str = sql, parm = new { mid = mid } });
}
- else
+ else
{
- //娓呴櫎瀹夌伅銆佽澶囦换鍔￠厤缃〃鏁版嵁
- sql = @"delete TAnDon_Roul_ConFig where id=@mid";
- list.Add(new { str = sql, parm = new { mid = mid } });
- //娓呴櫎瀹夌伅銆佽澶囦换鍔￠厤缃叧鑱斾汉鍛樿〃鏁版嵁
- sql = @"delete TAnDon_Roul_ConFigUser where ando_cogfigid=@mid";
- list.Add(new { str = sql, parm = new { mid = mid } });
-
-
//鑾峰彇涓昏〃鏈�澶D
- sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_Record')+1,1) as id";
+ sql = @"select ISNULL(IDENT_CURRENT('TAnDon_Roul_ConFig')+1,1) as id";
var dt = DapperHelper.selecttable(sql);
-
+ mid = Convert.ToInt32(dt.Rows[0]["ID"].ToString());
//鍐欏叆瀹夌伅銆佽澶囦换鍔￠厤缃〃鏁版嵁
sql = @"insert into TAnDon_Roul_ConFig(wkshp_code,andotype_code,lm_user,lm_date,enable) values(@wkshp_code,@andotype_code,@lm_user,@lm_date,@enable)";
list.Add(new
@@ -1966,12 +1930,12 @@
enable = enable
}
});
- //寰幆鍐欏叆瀹夌伅銆佽澶囦换鍔￠厤缃叧鑱斾汉鍛樿〃
- for (int i = 0; i < json.Rows.Count; i++)
- {
- sql = @"insert into TAnDon_Roul_ConFigUser(ando_cogfigid,user_code) values(@usercode,@role_code)";
- list.Add(new { str = sql, parm = new { ando_cogfigid = mid, role_code = json.Rows[i]["CODE"].ToString() } });
- }
+ }
+ //寰幆鍐欏叆瀹夌伅銆佽澶囦换鍔￠厤缃叧鑱斾汉鍛樿〃
+ for (int i = 0; i < json.Rows.Count; i++)
+ {
+ sql = @"insert into TAnDon_Roul_ConFigUser(ando_cogfigid,usercode) values(@ando_cogfigid,@role_code)";
+ list.Add(new { str = sql, parm = new { ando_cogfigid = mid, role_code = json.Rows[i]["CODE"].ToString() } });
}
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -2016,8 +1980,8 @@
parm = new
{
wkshp_code = wkshopcode,
- andengtypecode=calltypecode,
- lm_user=usercode,
+ andengtypecode = calltypecode,
+ lm_user = usercode,
lm_date = DateTime.Now.ToString(),
enable = enable
}
@@ -2050,7 +2014,7 @@
#endregion
#region[瀹夌伅绯荤粺/鍝嶅簲浜哄憳鍒犻櫎]
- public static ToMessage AnDengResponUserDeleteSeave(string id,string ando_cogfigid)
+ public static ToMessage AnDengResponUserDeleteSeave(string id, string ando_cogfigid)
{
var sql = "";
List<object> list = new List<object>();
@@ -2068,7 +2032,7 @@
sql = @"delete TAnDon_Roul_ConFigUser where id=@id";
list.Add(new { str = sql, parm = new { id = id } });
}
- else
+ else
{
//鏍规嵁瀛愯〃id鍒犻櫎瀵瑰簲瀛愯〃浜哄憳
sql = @"delete TAnDon_Roul_ConFigUser where id=@id";
@@ -2103,5 +2067,33 @@
return mes;
}
#endregion
+
+
+ #region[閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅]
+ public static ToMessage WhkspIsEqpSearch(string wkshpcode)
+ {
+ string sql = "";
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鑾峰彇璁惧涓嬫媺妗嗘暟鎹�
+ sql = @"select code as eqp_code,name as eqp_name
+ from TEqpInfo where wksp_code=@wkshpcode and enable='Y' ";
+ dynamicParams.Add("@wkshpcode", wkshpcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3