From eddeff0b81ea84c3b66ab1b8b7943146f953b0e1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 13 二月 2023 17:17:05 +0800
Subject: [PATCH] 1.往来单位同步修改(客户、供应商、客户/供应商) 2.往来单位新增/编修 ：单位属性改为(客户、供应商、客户/供应商) 3.生产开报工PC端、APP端：外协工序时外协供应商(供应商、客户/供应商) 4.委外工序明细报表：(供应商、客户/供应商) 5.工序定义关联工作站(供应商、客户/供应商) 6.综合看板右上角字段(供应商、客户/供应商) 7.采购订单看板(供应商、客户/供应商) 8.采购订单关闭接口开发
---
VueWebApi/DLL/DAL/BasicSettingDAL.cs | 35 +++++++++--------------------------
1 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/VueWebApi/DLL/DAL/BasicSettingDAL.cs b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
index 32b52e3..8f23a9a 100644
--- a/VueWebApi/DLL/DAL/BasicSettingDAL.cs
+++ b/VueWebApi/DLL/DAL/BasicSettingDAL.cs
@@ -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);
--
Gitblit v1.9.3