From 37b39b9748eaaa7900271d83a94698299d53fed4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 18 十月 2023 20:00:52 +0800
Subject: [PATCH] 1.模具扫码入库、出库功能接口 2.模具维修图片上传接口修改
---
VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs | 333 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 297 insertions(+), 36 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
index e65c2b4..53f99eb 100644
--- a/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/MouldManagerDAL.cs
@@ -72,19 +72,20 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.status,A.usestatus,A.code,A.name,A.spec,A.warehousecode,S.name as warehousename,
- A.surp_life,'0' as serlife,A.resi_life,(case when isnull(M.mouldcode,'')='' then 'N' else 'Y' end) as is_part,
- STUFF((SELECT ',' + B.partcode
- from TMouldInfoPart B
- where A.code = B.mouldcode
- FOR XML PATH('')), 1, 1, '') AS partcode,
- A.lm_user as usercode,U.username,A.lm_date
- from TMouldInfo A
- left join TSecStck S on A.warehousecode=S.code
- left join (
- select distinct mouldcode from TMouldInfoPart
- ) M on A.code=M.mouldcode
- left join TUser U on A.lm_user=U.usercode
- where 1=1 " + search;
+ 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
+ from TMouldInfoPart B
+ where A.code = B.mouldcode
+ FOR XML PATH('')), 1, 1, '') AS partcode,
+ A.lm_user as usercode,U.username,A.lm_date
+ from TMouldInfo A
+ left join TSecStck S on A.warehousecode=S.code
+ left join (
+ select distinct mouldcode from TMouldInfoPart
+ ) M on A.code=M.mouldcode
+ 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 = "鏌ヨ鎴愬姛!";
@@ -103,7 +104,7 @@
#endregion
#region[妯″叿娓呭崟鏂板缂栬緫]
- public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string warehousecode, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
+ public static ToMessage AddUpdateMouldManger(string mouldcode, string mouldname, string mouldspec, string surplife, string resilife, string status, string mouldpart, string opertype, User us)
{
var sql = "";
var dynamicParams = new DynamicParameters();
@@ -113,8 +114,8 @@
if (opertype == "Add")
{
//鍐欏叆妯″叿娓呭崟琛�
- sql = @"insert into TMouldInfo(code,name,spec,status,usestatus,warehousecode,surp_life,resi_life,lm_user,lm_date)
- values(@code,@name,@spec,@status,@usestatus,@warehousecode,@surp_life,@resi_life,@lm_user,@lm_date)";
+ sql = @"insert into TMouldInfo(code,name,spec,status,surp_life,resi_life,lm_user,lm_date)
+ values(@code,@name,@spec,@status,@surp_life,@resi_life,@lm_user,@lm_date)";
list.Add(new
{
str = sql,
@@ -124,8 +125,6 @@
name = mouldname,
spec = mouldspec,
status = status,
- usestatus = "0",//浣跨敤鐘舵�侊細鍦ㄥ簱/鍑哄簱/涓婃満/涓嬫満/缁翠慨/澶栧��(0,1,2,3,4,5)
- warehousecode = warehousecode,
surp_life = surplife,
resi_life = resilife,
lm_user = us.usercode,
@@ -171,7 +170,7 @@
if (opertype == "Update")
{
//淇敼妯″叿娓呭崟琛�
- sql = @"update TMouldInfo set name=@name,spec=@spec,status=@status,warehousecode=@warehousecode,
+ sql = @"update TMouldInfo set name=@name,spec=@spec,status=@status,
surp_life=@surp_life,resi_life=@resi_life,lm_user=@lm_user,lm_date=@lm_date where code=@code";
list.Add(new
{
@@ -182,7 +181,6 @@
name = mouldname,
spec = mouldspec,
status = status,
- warehousecode = warehousecode,
surp_life = surplife,
resi_life = resilife,
lm_user = us.usercode,
@@ -1814,7 +1812,7 @@
//鍐欏叆淇濆吇璁板綍涓昏〃
sql = @"insert into TMouldmaint_Proc_Main(bywo,mould_code,mouldmaint_code,maint_result,maint_user,maint_date)
- values(@bywo,@mould_code,@mouldmaint_code,@maint_result,@lm_user,@lm_date)";
+ values(@bywo,@mould_code,@mouldmaint_code,@maint_result,@maint_user,@maint_date)";
list.Add(new
{
str = sql,
@@ -1823,15 +1821,15 @@
bywo = bywo,
mould_code = json.code,
mouldmaint_code = json.standcode,
- lm_user = us.usercode,
- lm_date = DateTime.Now.ToString(),
+ maint_user = us.usercode,
+ maint_date = DateTime.Now.ToString(),
maint_result = json.result
}
});
//寰幆鍐欏叆淇濆吇璁板綍瀛愯〃
for (int i = 0; i < json.children.Count; i++)
{
- sql = @"insert into TEqpmaint_Proc_Deta(seq,m_id,mouldmaideta_code,result,maint_value,lm_user,lm_date)
+ sql = @"insert into TMouldmaint_Proc_Deta(seq,m_id,mouldmaideta_code,result,maint_value,lm_user,lm_date)
values(@seq,CONVERT(INT,IDENT_CURRENT('TMouldmaint_Proc_Main')),@mouldmaideta_code,@result,@maint_value,@lm_user,@lm_date)";
list.Add(new
{
@@ -1976,8 +1974,8 @@
}
#endregion
- #region[璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨]
- public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, List<IFormFile> files)
+ #region[妯″叿缁翠慨鐢宠,鎻愪氦淇濆瓨]
+ public static ToMessage MaintainScanMouldApplySave(string menucode, string mouldcode, string faultsourcecode, string faultdescr, User us, IFormFileCollection files)
{
var sql = "";
string sqwo = "", numvalue = "";
@@ -2001,16 +1999,20 @@
{
for (int i = 0; i < files.Count; i++)
{
+ IFormFile file = files[i];
+ string imgName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
+ string filePath = "wwwroot/MouldRecordImage/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕
+
// 鐢熸垚鏂囦欢鍚�
- var fileName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
+ //var fileName = "SQ" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
// 鎷兼帴鏂囦欢淇濆瓨璺緞
- var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
+ //var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
- // 淇濆瓨鏂囦欢
+ // 淇濆瓨鏂囦欢var stream = new FileStream(filePath, FileMode.Create)
using (var stream = new FileStream(filePath, FileMode.Create))
{
- files[i].CopyToAsync(stream);
+ files[i].CopyTo(stream);
}
//寰幆鍐欑淮淇褰曞搴斿浘鐗囪〃
sql = @"insert into TMould_RepairImage(source_wo,wo_type,img1url)
@@ -2124,7 +2126,7 @@
#endregion
#region[妯″叿缁翠慨鎻愪氦]
- public static ToMessage RepairScanMouldSave(string menucode, string docu_code, string mouldcode, string faultdescr, string is_stoprepair, string repaircontent, User us, List<IFormFile> files)
+ public static ToMessage RepairScanMouldSave(string menucode, string docu_code, string mouldcode, string faultdescr, string is_stoprepair, string repaircontent, User us, IFormFileCollection files)
{
var sql = "";
string wxwo = "", numvalue = "";
@@ -2148,16 +2150,20 @@
{
for (int i = 0; i < files.Count; i++)
{
+ IFormFile file = files[i];
+ string imgName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
+ string filePath = "wwwroot/MouldRecordImage/" + imgName + file.FileName; //閫氳繃姝ゅ璞¤幏鍙栨枃浠跺悕
+
// 鐢熸垚鏂囦欢鍚�
- var fileName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
+ //var fileName = "WX" + DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString() + Path.GetExtension(files[i].FileName);
// 鎷兼帴鏂囦欢淇濆瓨璺緞
- var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
+ //var filePath = Path.Combine("wwwroot/MouldRecordImage", fileName);
- // 淇濆瓨鏂囦欢
+ // 淇濆瓨鏂囦欢var stream = new FileStream(filePath, FileMode.Create)
using (var stream = new FileStream(filePath, FileMode.Create))
{
- files[i].CopyToAsync(stream);
+ files[i].CopyTo(stream);
}
//寰幆鍐欑淮淇褰曞搴斿浘鐗囪〃
sql = @"insert into TMould_RepairImage(source_wo,wo_type,img1url)
@@ -2413,7 +2419,6 @@
return mes;
}
#endregion
-
#region[妯″叿涓婃満,鎵弿妯″叿缂栫爜]
@@ -2942,5 +2947,261 @@
return mes;
}
#endregion
+
+
+ #region[妯″叿鍏ュ簱,鎵弿妯″叿缂栫爜]
+ public static ToMessage MouldInWareHouseQrCodeData(string mouldcode)
+ {
+ string sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鍒ゆ柇褰撳墠妯″叿褰撳墠浣跨敤鐘舵��
+ sql = @"select code,name,spec,status,usestatus,surp_life,resi_life
+ from TMouldInfo where code=@mouldcode";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ if (dt.Rows[0]["status"].ToString() == "Y")
+ {
+ switch (dt.Rows[0]["usestatus"].ToString())
+ {
+ case "0": //鍦ㄥ簱
+ mes.code = "300";
+ mes.Message = "褰撳墠妯″叿鍦ㄥ簱鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ case "2": //涓婃満
+ mes.code = "300";
+ mes.Message = "褰撳墠妯″叿涓婃満鐘舵��,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ case "7": //澶栧��
+ mes.code = "300";
+ mes.Message = "褰撳墠妯″叿澶栧�熺姸鎬�,涓嶇鍚堝叆搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ default:
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = dt;
+ break;
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶅厑璁稿叆搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.data = null;
+ return mes;
+ }
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿鍏ュ簱鎻愪氦]
+ public static ToMessage MouldInWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ 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)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mould_code = mouldcode,
+ type = "IN",
+ warehouse_code = warehousecode,
+ description = description,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+
+ //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(鍏ュ簱),浠撳簱缂栫爜
+ sql = @"update TMouldInfo set usestatus='0',warehousecode=@warehousecode where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode = warehousecode } });
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "妯″叿鍏ュ簱", "妯″叿:" + mouldcode, us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "妯″叿鍏ュ簱鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "妯″叿鍏ュ簱澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+
+ #region[妯″叿鍑哄簱,鎵弿妯″叿缂栫爜]
+ public static ToMessage MouldOutWareHouseQrCodeData(string mouldcode)
+ {
+ string sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ //鍒ゆ柇褰撳墠妯″叿褰撳墠浣跨敤鐘舵��
+ sql = @"select * from TMouldInfo where code=@mouldcode ";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var dt = DapperHelper.selectdata(sql, dynamicParams);
+ if (dt.Rows.Count > 0)
+ {
+ if (dt.Rows[0]["status"].ToString() == "Y")
+ {
+ //鍒ゆ柇褰撳墠妯″叿鏄惁鍦ㄥ鍊熺姸鎬�
+ 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
+ from TMouldInfo M
+ left join TSecStck C on M.warehousecode=C.code
+ where M.code=@mouldcode and M.usestatus='0'";
+ dynamicParams.Add("@mouldcode", mouldcode);
+ var data = DapperHelper.selectdata(sql, dynamicParams);
+ if (data.Rows.Count > 0)
+ {
+ mes.code = "200";
+ mes.Message = "鏌ヨ鎴愬姛!";
+ mes.data = data;
+ return mes;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "褰撳墠妯″叿鏈湪搴�,涓嶇鍚堝嚭搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "妯″叿鏁呴殰鎴栫淮淇腑,涓嶇鍚堝嚭搴撴搷浣�!";
+ mes.data = null;
+ return mes;
+ }
+ }
+ else
+ {
+ mes.code = "300";
+ mes.Message = "鏃犳晥鐨勬ā鍏蜂簩缁寸爜淇℃伅!";
+ mes.data = null;
+ return mes;
+ }
+
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
+
+ #region[妯″叿鍑哄簱鎻愪氦]
+ public static ToMessage MouldOutWareHouseSave(string mouldcode, string warehousecode, string description, User us)
+ {
+ var sql = "";
+ List<object> list = new List<object>();
+ var dynamicParams = new DynamicParameters();
+ try
+ {
+ 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)";
+ list.Add(new
+ {
+ str = sql,
+ parm = new
+ {
+ mould_code = mouldcode,
+ type = "OUT",
+ warehouse_code = warehousecode,
+ description = description,
+ lm_user = us.usercode,
+ lm_date = DateTime.Now.ToString()
+ }
+ });
+
+ //鍥炲啓妯″叿娓呭崟,浣跨敤鐘舵��(鍑哄簱),娓呴櫎浠撳簱缂栫爜
+ sql = @"update TMouldInfo set usestatus='1',warehousecode=@warehousecode where code=@mouldcode";
+ list.Add(new { str = sql, parm = new { mouldcode = mouldcode, warehousecode ="" } });
+
+ bool aa = DapperHelper.DoTransaction(list);
+ if (aa)
+ {
+ //鍐欏叆鎿嶄綔璁板綍琛�
+ LogHelper.DbOperateLog(us.usercode, "妯″叿鍑哄簱", "妯″叿:" + mouldcode, us.usertype);
+ mes.code = "200";
+ mes.count = 0;
+ mes.Message = "妯″叿鍑哄簱鎴愬姛!";
+ mes.data = null;
+ }
+ else
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = "妯″叿鍑哄簱澶辫触!";
+ mes.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ mes.code = "300";
+ mes.count = 0;
+ mes.Message = e.Message;
+ mes.data = null;
+ }
+ return mes;
+ }
+ #endregion
}
}
--
Gitblit v1.9.3