From 3ed9cb86be252941e35b6ccfc9be24642751ef46 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 09 十一月 2022 21:34:24 +0800
Subject: [PATCH] 修改报工列表查询接口、修改报工自制工序首道、末道数量判断接口开发
---
VueWebApi/DLL/DAL/ProductModelDAL.cs | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ProductModelDAL.cs b/VueWebApi/DLL/DAL/ProductModelDAL.cs
index f073b22..34123d3 100644
--- a/VueWebApi/DLL/DAL/ProductModelDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductModelDAL.cs
@@ -2001,12 +2001,12 @@
try
{
//閫氳繃浜у搧缂栫爜鏌ユ壘鍏宠仈鐨勫伐鑹鸿矾绾夸俊鎭�
- sql = @"select B.stepcode as code,B.stepname as name
+ sql = @"select B.stepcode as code,B.stepname as name,B.flwtype as flag
from TFlw_Rtdt A
inner join TStep B on A.step_code=B.stepcode
where A.rout_code=@routecode and B.is_delete<>'1' and A.is_delete<>'1'";
dynamicParams.Add("@routecode", routecode);
- var data = DapperHelper.select<ObjectData>(sql, dynamicParams);
+ var data = DapperHelper.select<StepDefect>(sql, dynamicParams);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
mes.data = data;
@@ -2050,16 +2050,19 @@
}
#endregion
- #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶囬泦鍚圿
- public static ToMessage StepSelectEqpList(string partcode, string routecode, string stepcode, int startNum, int endNum, string prop, string order)
+ #region[鏍规嵁宸ュ簭绾跨紪鐮佹煡鎵惧叧鑱旇澶�/澶栧崗渚涙柟闆嗗悎]
+ public static ToMessage StepSelectEqpList(string partcode, string routecode, string stepcode,string steptype, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
- string search = "";
+ string search = "",sql="";
+ int total = 0;
try
{
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
- var total = 0; //鎬绘潯鏁�
- 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
+ if (steptype == "Z") //鑷埗宸ュ簭
+ {
+ total = 0; //鎬绘潯鏁�
+ 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
@@ -2071,9 +2074,27 @@
left join TOrganization T on B.wksp_code=T.org_code
left join TMateriel_Info C on A.materiel_code=C.partcode
where B.is_delete<>'1' and T.is_delete<>'1' and C.is_delete<>'1' ";
- dynamicParams.Add("@partcode", partcode);
- dynamicParams.Add("@routecode", routecode);
- dynamicParams.Add("@stepcode", stepcode);
+ dynamicParams.Add("@partcode", partcode);
+ dynamicParams.Add("@routecode", routecode);
+ dynamicParams.Add("@stepcode", stepcode);
+ }
+ else //澶栧崗宸ュ簭
+ {
+ total = 0; //鎬绘潯鏁�
+ sql = @"select B.code as eqpcode,B.name as eqpname,'' as wksp_code,'' 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
+ union all
+ select @partcode as materiel_code,eqp_code,'0' as eqp_value,'0' as stand_value,'0' as cavity_qty,'0' as unprice
+ from TFlw_Rteqp where step_code=@stepcode and style='W' and @partcode+eqp_code+step_code not in(select materiel_code+eqp_code+step_code from TPrteEqp_Stad)
+ ) A
+ left join TCustomer B on A.eqp_code=B.code
+ where B.is_delete<>'1'";
+ dynamicParams.Add("@partcode", partcode);
+ dynamicParams.Add("@routecode", routecode);
+ dynamicParams.Add("@stepcode", stepcode);
+ }
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
@@ -2100,31 +2121,33 @@
{
if (partcode != "" && partcode != null)
{
- search += "and A.materiel_code=@partcode ";
+ search += "and AA.materiel_code=@partcode ";
dynamicParams.Add("@partcode", partcode);
}
if (routecode != "" && routecode != null)
{
- search += "and A.route_code=@routecode ";
+ search += "and AA.route_code=@routecode ";
dynamicParams.Add("@routecode", routecode);
}
if (stepcode != "" && stepcode != null)
{
- search += "and A.step_code=@stepcode ";
+ search += "and AA.step_code=@stepcode ";
dynamicParams.Add("@stepcode", stepcode);
}
if (eqpcode != "" && eqpcode != null)
{
- search += "and A.eqp_code=@eqpcode";
+ search += "and AA.eqp_code=@eqpcode";
dynamicParams.Add("@eqpcode", eqpcode);
}
if (search == "")
{
search = "and 1=1 ";
}
+ search = search.Substring(3);//鎴彇绱㈠紩2鍚庨潰鐨勫瓧绗�
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
- var sql = @"select A.materiel_code as partcode,B.partname,B.partspec,A.route_code,C.name as route_name,
+ var sql = @"select * from (
+ select A.materiel_code as partcode,B.partname,B.partspec,A.route_code,C.name as route_name,
D.stepcode,D.stepname,A.eqp_code,E.name as eqp_name,E.wksp_code,F.org_name as wksp_name,
A.eqp_value,A.stand_value,A.cavity_qty,A.unprice
from TPrteEqp_Stad A
@@ -2133,7 +2156,19 @@
left join TStep D on A.step_code=D.stepcode
left join TEqpInfo E on A.eqp_code=E.code
left join TOrganization F on E.wksp_code=F.org_code
- where B.is_delete<>'1' and C.is_delete<>'1' and D.is_delete<>'1' and E.is_delete<>'1' and F.is_delete<>'1' " + search;
+ left join TCustomer S on A.eqp_code=S.code
+ where B.is_delete<>'1' and C.is_delete<>'1' and D.is_delete<>'1' and E.is_delete<>'1' and F.is_delete<>'1'
+ union all
+ select A.materiel_code as partcode,B.partname,B.partspec,A.route_code,C.name as route_name,
+ D.stepcode,D.stepname,S.code,S.name as eqp_name,'' as wksp_code,'' as wksp_name,
+ A.eqp_value,A.stand_value,A.cavity_qty,A.unprice
+ from TPrteEqp_Stad A
+ left join TMateriel_Info B on A.materiel_code=B.partcode
+ left join TFlw_Rout C on A.route_code=C.code
+ left join TStep D on A.step_code=D.stepcode
+ left join TCustomer S on A.eqp_code=S.code
+ where B.is_delete<>'1' and C.is_delete<>'1' and D.is_delete<>'1' and S.is_delete<>'1'
+ ) as AA where" + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
mes.Message = "鏌ヨ鎴愬姛!";
--
Gitblit v1.9.3