From 4545b915123fb7b7535b697f6e82b12f525f8b71 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 16 七月 2022 21:16:19 +0800
Subject: [PATCH] 工序检验接口编写
---
VueWebApi/DLL/DAL/ProductModelDAL.cs | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index 05b65c2..3ab2f66 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -446,7 +446,7 @@
from TMateriel_Info A
left join TUom B on A.uom_code=B.code
left join TMateriel_Type C on A.materieltype_code=C.code
- left join T_Dict D on C.dict_code=D.code and D.dict_type='CHLX'
+ left join T_Dict D on A.stocktype_code=D.code and D.dict_type='CHLX'
left join T_Sec_Stck T on A.stck_code=T.code
where A.is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -474,13 +474,14 @@
{
if (operType == "Add")
{
- var sql = @"insert into TMateriel_Info(partcode,partname,partspec,uom_code,materieltype_code,stck_code,maxqty,minqty,lm_user,lm_date)
- values(@materialcode,@materialname,@materialspec,@uomcode,@materialtypecode,@warehousecode,@maxstockqty,@minstockqty,@username,@CreateDate)";
+ var sql = @"insert into TMateriel_Info(partcode,partname,partspec,uom_code,stocktype_code,materieltype_code,stck_code,maxqty,minqty,lm_user,lm_date)
+ values(@materialcode,@materialname,@materialspec,@uomcode,@stocktypecode,@materialtypecode,@warehousecode,@maxstockqty,@minstockqty,@username,@CreateDate)";
dynamicParams.Add("@materialcode", materialcode);
dynamicParams.Add("@materialname", materialname);
dynamicParams.Add("@materialspec", materialspec);
dynamicParams.Add("@uomcode", uomcode);
dynamicParams.Add("@warehousecode", warehousecode);
+ dynamicParams.Add("@stocktypecode", stocktypecode);
dynamicParams.Add("@materialtypecode", materialtypecode);
dynamicParams.Add("@minstockqty", minstockqty);
dynamicParams.Add("@maxstockqty", maxstockqty);
@@ -504,13 +505,14 @@
}
if (operType == "Update")
{
- var sql = @"update TMateriel_Type set partname=@materialname,partspec=@materialspec,uom_code=@uomcode,materieltype_code=@materialtypecode,stck_code=@warehousecode,
+ var sql = @"update TMateriel_Info set partname=@materialname,partspec=@materialspec,uom_code=@uomcode,stocktype_code=@stocktypecode,materieltype_code=@materialtypecode,stck_code=@warehousecode,
maxqty=@maxstockqty,minqty=@minstockqty,lm_user=@username,lm_date=@CreateDate where id=@materialid";
dynamicParams.Add("@materialid", materialid);
dynamicParams.Add("@materialname", materialname);
dynamicParams.Add("@materialspec", materialspec);
dynamicParams.Add("@uomcode", uomcode);
dynamicParams.Add("@warehousecode", warehousecode);
+ dynamicParams.Add("@stocktypecode", stocktypecode);
dynamicParams.Add("@materialtypecode", materialtypecode);
dynamicParams.Add("@minstockqty", minstockqty);
dynamicParams.Add("@maxstockqty", maxstockqty);
@@ -792,7 +794,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select code,name,description,enable,lm_user,lm_date
+ var sql = @"select id,code,name,description,enable,lm_user,lm_date
from TFlw_Rout
where is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -872,20 +874,20 @@
//鏂板宸ヨ壓璺嚎琛�
sql = @"insert into TFlw_Rout(code,name,description,enable,lm_user,lm_date) values(@code,@name,@description,@enable,@lm_user,@lm_date)";
list.Add(new { str = sql, parm = new { code = json.code, name = json.name, description = json.description, enable = json.enable, lm_user = username, lm_date = DateTime.Now.ToString() } });
- string is_firststep = "N"; //鏄惁棣栭亾宸ュ簭
- string is_laststep = "N"; //鏄惁鏈亾宸ュ簭
for (int i = 0; i < json.Data.Rows.Count; i++)
{
+ string is_firststep = "N"; //鏄惁棣栭亾宸ュ簭
+ string is_laststep = "N"; //鏄惁鏈亾宸ュ簭
if (json.Data.Rows[i]["SEQ"].ToString() == "1") //鏄惁棣栭亾宸ュ簭
{
is_firststep = "Y";
}
- if (Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()) == json.Data.Rows.Count) //鏄惁鏈亾宸ュ簭
+ else if (Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()) == json.Data.Rows.Count) //鏄惁鏈亾宸ュ簭
{
is_laststep = "Y";
}
//鏂板宸ヨ壓璺嚎鍏宠仈宸ュ簭琛�
- sql = @"insert TFlw_Rtdt (rout_code,seq,step_code,first_choke,last_choke,lm_user,lm_date) values()";
+ sql = @"insert TFlw_Rtdt (rout_code,seq,step_code,first_choke,last_choke,lm_user,lm_date) values(@rout_code,@seq,@step_code,@first_choke,@last_choke,@lm_user,@lm_date)";
list.Add(new { str = sql, parm = new { rout_code = json.code, seq = Convert.ToInt32(json.Data.Rows[i]["SEQ"].ToString()), step_code = json.Data.Rows[i]["STEPCODE"].ToString(), first_choke = is_firststep, last_choke = is_laststep, lm_user = username, lm_date = DateTime.Now.ToString() } });
}
bool aa = DapperHelper.DoTransaction(list);
@@ -991,14 +993,14 @@
- #region[宸ヨ壓璺嚎涓嬫媺鏌ヨ鎺ュ彛]
- public static ToMessage RouteSearch()
+ #region[宸ュ簭涓嬫媺鏌ヨ鎺ュ彛]
+ public static ToMessage StepSelect()
{
string sql = "";
try
{
- //鑾峰彇宸ヨ壓璺嚎鏁版嵁
- sql = @"select code,name from TFlw_Rout where is_delete<>'1' ";
+ //鑾峰彇宸ュ簭鏁版嵁
+ sql = @"select stepcode,stepname from TStep where is_delete<>'1' ";
var data = DapperHelper.selecttable(sql);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -1053,7 +1055,7 @@
}
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select stepcode,stepname,flwtype,enable,descr,lm_user,lm_date,is_eqp,is_defect
+ var sql = @"select id,stepcode,stepname,flwtype,enable,descr,lm_user,lm_date,is_eqp,is_defect
from TStep
where is_delete<>'1' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -1187,16 +1189,16 @@
}
//鍒犻櫎璁惧鑺傛媿宸ヤ环琛�
- sql = @"delete TPrteEqp_Stad where stepcode=@stepcode";
+ sql = @"delete TPrteEqp_Stad where step_code=@stepcode";
list.Add(new { str = sql, parm = new { stepcode = stepcode } });
//鍒犻櫎宸ュ簭鍏宠仈宸ヤ綔绔欒〃
sql = @"delete TFlw_Rteqp where step_code=@stepcode";
list.Add(new { str = sql, parm = new { stepcode = stepcode } });
//鍒犻櫎缂洪櫡鍏宠仈宸ュ簭琛�
- sql = @"update TDefect_Step where step_code=@stepcode";
+ sql = @"delete TDefect_Step where step_code=@stepcode";
list.Add(new { str = sql, parm = new { stepcode = stepcode } });
//鍒犻櫎宸ュ簭
- sql = @"update TStep set is_delete='1' where partcode=@stepcode";
+ sql = @"update TStep set is_delete='1' where stepcode=@stepcode";
list.Add(new { str = sql, parm = new { stepcode = stepcode } });
bool aa = DapperHelper.DoTransaction(list);
if (aa)
@@ -1247,7 +1249,7 @@
select distinct A.eqp_code,B.btype from TFlw_Rteqp A
inner join TCustomer B on A.eqp_code=B.code
where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
- ) B on T.code=B.eqp_code where T.btype='WX' and T.is_delete<>'1'";
+ ) B on T.btype=B.btype where T.btype='WX' and T.is_delete<>'1'";
dynamicParams.Add("@stepcode", stepcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
for (int i = 0; i < data.Rows.Count; i++)
@@ -1289,9 +1291,10 @@
left join(
select distinct A.eqp_code from TFlw_Rteqp A
inner join TEqpInfo B on A.eqp_code=B.code
- where B.wksp_code='W001' and A.is_delete<>'1' and B.is_delete<>'1'
- ) B on A.code=B.eqp_code and A.is_delete<>'1'";
+ where A.step_code=@stepcode and A.is_delete<>'1' and B.is_delete<>'1'
+ ) B on A.code=B.eqp_code where A.wksp_code=@wkspcode and A.is_delete<>'1'";
dynamicParams.Add("@stepcode", stepcode);
+ dynamicParams.Add("@wkspcode", data.Rows[i]["WKSP_CODE"].ToString());
var data0 = DapperHelper.selectdata(sql, dynamicParams);
for (int j = 0; j < data0.Rows.Count; j++)
{
@@ -1334,7 +1337,7 @@
sql = @"delete TFlw_Rteqp where step_code=@stepcode";
list.Add(new { str = sql, parm = new { stepcode = stepcode } });
//鏍囪宸ュ簭琛ㄥ叧鑱斿伐浣滅珯鏍囪瘑
- sql = @"update TStep is_eqp='N' where stepcode=@stepcode";
+ sql = @"update TStep set is_eqp='N' where stepcode=@stepcode";
list.Add(new { str = sql, parm = new { stepcode = stepcode } });
}
else
@@ -1401,7 +1404,7 @@
//鑾峰彇宸ュ簭鍏宠仈缂洪櫡鏁版嵁(鍖呭惈鍏宠仈鏍囪瘑)
sql = @"select A.code,A.name,(case when B.defect_code is null then 'N' else 'Y' end) flag from TDefect A
left join(
- select distinct defect_code from TDefect_Step where step_code='' and is_delete<>'1'
+ select distinct defect_code from TDefect_Step where step_code=@stepcode and is_delete<>'1'
) B on A.code=B.defect_code";
dynamicParams.Add("@stepcode", stepcode);
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1442,7 +1445,7 @@
sql = @"delete TDefect_Step where step_code=@stepcode";
list.Add(new { str = sql, parm = new { stepcode = stepcode } });
//鏍囪宸ュ簭琛ㄥ叧鑱斿伐浣滅珯鏍囪瘑
- sql = @"update TStep is_defect='N' where stepcode=@stepcode";
+ sql = @"update TStep set is_defect='N' where stepcode=@stepcode";
list.Add(new { str = sql, parm = new { stepcode = stepcode } });
}
else
@@ -1619,7 +1622,7 @@
{
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select C.partcode,C.partname,B.wksp_code,T.org_name as wksp_name,A.eqp_value,A.stand_value,A.cavity_qty,A.unprice
+ var sql = @"select B.code as eqpcode,B.name as eqpname,B.wksp_code,T.org_name as wksp_name,A.eqp_value,A.stand_value,A.cavity_qty,A.unprice
from (
select materiel_code, eqp_code,eqp_value,stand_value,cavity_qty,unprice from TPrteEqp_Stad
where materiel_code=@partcode and route_code=@routecode and step_code=@stepcode
@@ -1661,7 +1664,7 @@
if (partcode != "" && partcode != null)
{
search += "and A.materiel_code=@partcode ";
- dynamicParams.Add("@stepcode", partcode);
+ dynamicParams.Add("@partcode", partcode);
}
if (routecode != "" && routecode != null)
{
--
Gitblit v1.9.3