From 9445c4660740dc8a544b5c2440fe365a218bab12 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 26 十月 2023 17:26:39 +0800
Subject: [PATCH] 1.修改仓位信息列表接口 2.新增仓库库位基础资料接口 3.修改模具出入库提交接口(增加库位) 、模具清单增加库位 4.新增模具上下机记录报表、模具借还记录报表
---
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 327 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 295 insertions(+), 32 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index 148d517..7d86f8e 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -68,7 +68,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.status,A.usestatus,A.code,A.name,A.spec,A.warehousecode,S.name as warehousename,
+ var sql = @"select A.status,A.usestatus,A.code,A.name,A.spec,A.warehousecode,S.name as warehousename,A.location_code,L.name as location_name,
A.surp_life,(select isnull(sum(usecount_life),0) from TMould_UpDownReord R where R.mould_code=A.code) as serlife,
A.resi_life,(case when isnull(M.mouldcode,'')='' then 'N' else 'Y' end) as is_part,
STUFF((SELECT ',' + B.partcode
@@ -78,6 +78,7 @@
A.lm_user as usercode,U.username,A.lm_date
from TMouldInfo A
left join TSecStck S on A.warehousecode=S.code
+ left join TSecLoca L on A.location_code=L.code
left join (
select distinct mouldcode from TMouldInfoPart
) M on A.code=M.mouldcode
@@ -3252,7 +3253,7 @@
#endregion
#region[妯″叿鍏ュ簱鎻愪氦]
- public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+ public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode,string locationcode, string description, User us)
{
var sql = "";
List<object> list = new List<object>();
@@ -3261,8 +3262,8 @@
{
list.Clear();
//鍐欏叆妯″叿鍑哄叆搴撹褰曡〃(鍏ュ簱鎿嶄綔)
- sql = @"insert into TMould_InOutReord(mould_code,type,warehouse_code,description,lm_user,lm_date)
- values(@mould_code,@type,@warehouse_code,@description,@lm_user,@lm_date)";
+ sql = @"insert into TMould_InOutReord(mould_code,type,warehouse_code,location_code,description,lm_user,lm_date)
+ values(@mould_code,@type,@warehouse_code,@location_code,@description,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -3271,6 +3272,7 @@
mould_code = mouldcode,
type = "IN",
warehouse_code = warehousecode,
+ location_code = locationcode,
description = description,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
@@ -3278,8 +3280,8 @@
});
//鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(鍏ュ簱),浠撳簱缂栫爜
- sql = @"update TMouldInfo set usestatus='0',warehousecode=@warehousecode where code=@mouldcode";
- list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode = warehousecode } });
+ sql = @"update TMouldInfo set usestatus='0',warehousecode=@warehousecode,location_code=@location_code where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode = warehousecode, location_code = locationcode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -3329,9 +3331,10 @@
{
//鍒ゆ柇褰撳墠妯″叿鏄惁鍦ㄥ鍊熺姸鎬�
sql = @"select M.code as mould_code,M.name as mould_name,M.spec as mould_spec,
- M.surp_life,M.resi_life,M.warehousecode,C.name as warehousename
+ M.surp_life,M.resi_life,M.warehousecode,C.name as warehousename,M.location_code,L.name as location_name
from TMouldInfo M
left join TSecStck C on M.warehousecode=C.code
+ left join TSecLoca L on M.location_code=L.code
where M.code=@mouldcode and M.usestatus='0'";
dynamicParams.Add("@mouldcode", mouldcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -3379,7 +3382,7 @@
#endregion
#region[妯″叿鍑哄簱鎻愪氦]
- public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+ public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode,string locationcode, string description, User us)
{
var sql = "";
List<object> list = new List<object>();
@@ -3388,8 +3391,8 @@
{
list.Clear();
//鍐欏叆妯″叿鍑哄叆搴撹褰曡〃(鍑哄簱鎿嶄綔)
- sql = @"insert into TMould_InOutReord(mould_code,type,warehouse_code,description,lm_user,lm_date)
- values(@mould_code,@type,@warehouse_code,@description,@lm_user,@lm_date)";
+ sql = @"insert into TMould_InOutReord(mould_code,type,warehouse_code,location_code,description,lm_user,lm_date)
+ values(@mould_code,@type,@warehouse_code,@location_code,@description,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -3398,6 +3401,7 @@
mould_code = mouldcode,
type = "OUT",
warehouse_code = warehousecode,
+ location_code= locationcode,
description = description,
lm_user = us.usercode,
lm_date = DateTime.Now.ToString()
@@ -3405,8 +3409,8 @@
});
//鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(鍑哄簱),娓呴櫎浠撳簱缂栫爜
- sql = @"update TMouldInfo set usestatus='1',warehousecode=@warehousecode where code=@mouldcode";
- list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode ="" } });
+ sql = @"update TMouldInfo set usestatus='1',warehousecode=@warehousecode,location_code=@location_code where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode ="", location_code="" } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -3695,14 +3699,9 @@
search += "and A.maint_result=@repairresult ";
dynamicParams.Add("@repairresult", repairresult);
}
- if (search == "")
- {
- search = "and 1=1 ";
- }
- //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.bywo,A.mould_code,E.name as mould_name,E.spec as mould_spec,M.code as stanedcode,M.name as stanedname,
+ var sql = @"select A.id,A.bywo,A.mould_code,E.name as mould_name,E.spec as mould_spec,M.code as stanedcode,M.name as stanedname,
U.username as maint_user,A.maint_result,A.maint_date
from TMouldmaint_Proc_Main A
left join TMouldInfo E on A.mould_code=E.code
@@ -3802,10 +3801,6 @@
{
search += "and A.maint_result=@repairresult ";
dynamicParams.Add("@repairresult", repairresult);
- }
- if (search == "")
- {
- search = "and 1=1 ";
}
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
@@ -3920,11 +3915,6 @@
search += "and A.verify_date between @vrifcatopendate and @vrifcatclosedate ";
dynamicParams.Add("@vrifcatopendate", vrifcatopendate + " 00:00:00");
dynamicParams.Add("@vrifcatclosedate", vrifcatclosedate + " 23:59:59");
- }
-
- if (search == "")
- {
- search = "and 1=1 ";
}
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
@@ -4080,11 +4070,6 @@
dynamicParams.Add("@vrifcatopendate", vrifcatopendate + " 00:00:00");
dynamicParams.Add("@vrifcatclosedate", vrifcatclosedate + " 23:59:59");
}
-
- if (search == "")
- {
- search = "and 1=1 ";
- }
//search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
@@ -4117,5 +4102,283 @@
return mes;
}
#endregion
+
+
+ #region[妯″叿涓婁笅鏈鸿褰曟煡璇
+ public static ToMessage MouldUpDownMachinesSearch(string mouldcode, string mouldname, string mouldspec, string type, string devicecode, string operuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (devicecode != "" && devicecode != null)
+ {
+ search += "and A.eqp_code=@devicecode ";
+ dynamicParams.Add("@devicecode", devicecode);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code,M.name as mould_name,M.spec as mould_spec,
+ (case when A.type='UP' then '涓婃満' else '涓嬫満' end) as type,A.usecount_life,
+ A.eqp_code,E.name as eqp_name,U.username as lm_user,A.lm_date
+ from TMould_UpDownReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TEqpInfo E on A.eqp_code=E.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿涓婁笅鏈鸿瀵煎嚭Excel]
+ public static ToMessage MouldUpDownMachinesOutExcel(string mouldcode, string mouldname, string mouldspec, string type, string devicecode, string operuser, string opendate, string closedate)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (devicecode != "" && devicecode != null)
+ {
+ search += "and A.eqp_code=@devicecode ";
+ dynamicParams.Add("@devicecode", devicecode);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code as '妯″叿缂栫爜',M.name as '妯″叿鍚嶇О',M.spec as '妯″叿瑙勬牸',
+ (case when A.type='UP' then '涓婃満' else '涓嬫満' end) as '鎿嶄綔绫诲瀷',A.usecount_life as '鏈浣跨敤',
+ A.eqp_code as '璁惧缂栫爜',E.name as '璁惧鍚嶇О',U.username as '鎿嶄綔浜哄憳',A.lm_date as '鎿嶄綔鏃堕棿'
+ from TMould_UpDownReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TEqpInfo E on A.eqp_code=E.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+ data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+ string msg = DownLoad.DataTableToExcel(data, "妯″叿涓婁笅鏈鸿褰曟姤琛�");
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = msg;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[妯″叿鍊熻繕璁板綍鏌ヨ]
+ public static ToMessage MouldCirculateMachinesSearch(string mouldcode, string mouldname, string mouldspec, string type, string operuser, string opendate, string closedate, int startNum, int endNum, string prop, string order)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code,M.name as mould_name,M.spec as mould_spec,
+ (case when A.type='OUT' then '澶栧��' else '褰掕繕' end) as type,
+ A.description,U.username as lm_user,A.lm_date
+ from TMould_LendOutReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = data.ToList();
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿鍊熻繕璁板綍瀵煎嚭]
+ public static ToMessage MouldCirculateMachinesOutExcel(string mouldcode, string mouldname, string mouldspec, string type, string operuser, string opendate, string closedate)
+ {
+ var dynamicParams = new DynamicParameters();
+ string search = "";
+ try
+ {
+ if (mouldcode != "" && mouldcode != null)
+ {
+ search += "and A.mould_code like '%'+@mouldcode+'%' ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ }
+ if (mouldname != "" && mouldname != null)
+ {
+ search += "and M.name like '%'+@mouldname+'%' ";
+ dynamicParams.Add("@mouldname", mouldname);
+ }
+ if (mouldspec != "" && mouldspec != null)
+ {
+ search += "and M.spec like '%'+@mouldspec+'%' ";
+ dynamicParams.Add("@mouldspec", mouldspec);
+ }
+ if (type != "" && type != null)
+ {
+ search += "and A.type=@type ";
+ dynamicParams.Add("@type", type);
+ }
+ if (operuser != "" && operuser != null)
+ {
+ search += "and U.username like '%'+@operuser+'%' ";
+ dynamicParams.Add("@operuser", operuser);
+ }
+ if (opendate != "" && opendate != null)
+ {
+ search += "and A.lm_date between @opendate and @closedate ";
+ dynamicParams.Add("@opendate", opendate + " 00:00:00");
+ dynamicParams.Add("@closedate", closedate + " 23:59:59");
+ }
+ //search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
+ // --------------鏌ヨ鎸囧畾鏁版嵁--------------
+ var total = 0; //鎬绘潯鏁�
+ var sql = @"select A.mould_code as '妯″叿缂栫爜',M.name as '妯″叿鍚嶇О',M.spec as '瑙勬牸鍨嬪彿',
+ (case when A.type='OUT' then '澶栧��' else '褰掕繕' end) as '鎿嶄綔绫诲瀷',
+ A.description as '鎻忚堪',U.username as '鎿嶄綔浜哄憳',A.lm_date as '鎿嶄綔鏃堕棿'
+ from TMould_LendOutReord A
+ left join TMouldInfo M on A.mould_code=M.code
+ left join TUser U on A.lm_user=U.usercode
+ where 1=1 " + search;
+ DataTable data = DapperHelper.selectdata(sql, dynamicParams);
+ data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
+ string msg = DownLoad.DataTableToExcel(data, "妯″叿鍊熻繕璁板綍鎶ヨ〃");
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.count = total;
+ mes.data = msg;
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
--
Gitblit v1.9.3