From af7cef297da2ac1937dbcf437c3a91b00658f6c2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 29 三月 2023 10:47:39 +0800
Subject: [PATCH] 订单下达获取工单语句修改，手工创建工单获取单号接口
---
VueWebApi/DLL/DAL/ReportManagerDAL.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/VueWebApi/DLL/DAL/ReportManagerDAL.cs b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
index fd0601e..3772d71 100644
--- a/VueWebApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -276,7 +276,7 @@
if (rejectstepcode != "" && rejectstepcode != null)
{
string[] s1 = Array.ConvertAll<string, string>(rejectstepcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- search += "and A.step_code not in @s1";
+ search += "and E.wksp_code not in @s1";
dynamicParams.Add("@s1", s1);
}
@@ -298,6 +298,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on A.lm_user=U.usercode
+ left join TEqpInfo E on A.eqp_code=E.code
where G.group_code<>'' " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
mes.code = "200";
@@ -400,7 +401,7 @@
if (rejectstepcode != "" && rejectstepcode != null)
{
string[] s1 = Array.ConvertAll<string, string>(rejectstepcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- search += "and A.step_code not in @s1";
+ search += "and E.wksp_code not in @s1";
dynamicParams.Add("@s1", s1);
}
@@ -423,6 +424,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on A.lm_user=U.usercode
+ left join TEqpInfo E on A.eqp_code=E.code
where G.group_code<>'' " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
data.TableName = "Table"; //璁剧疆DataTable鐨勫悕绉�
@@ -500,7 +502,7 @@
if (rejectstepcode != "" && rejectstepcode != null)
{
string[] s1 = Array.ConvertAll<string, string>(rejectstepcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string鍒嗗壊杞瑂tring[]
- search += "and AA.stepcode not in @s1";
+ search += "and AA.wksp_code not in @s1";
dynamicParams.Add("@s1", s1);
}
if (search == "")
@@ -512,11 +514,11 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select AA.wo_code,AA.partcode,AA.partname,AA.partspec,AA.stepcode,AA.stepname,
AA.task_qty,AA.group_code,AA.group_name,AA.report_qty,AA.unprice,AA.ratio,AA.isend,
- AA.moneys as usermoney,AA.username,AA.report_date
+ AA.moneys as usermoney,AA.username,AA.report_date,AA.wksp_code
from (
select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,B.ratio,P.isend,
- (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date
+ (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date,E.wksp_code
from TK_Wrk_Record A
inner join TK_Wrk_RecordSub B on A.id=B.m_id
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
@@ -526,6 +528,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on B.report_person=U.usercode
+ left join TEqpInfo E on A.eqp_code=E.code
) as AA
where " + search;
var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -613,11 +616,11 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select AA.wo_code as 宸ュ崟缂栧彿,AA.partcode as 浜у搧缂栫爜,AA.partname as 浜у搧鍚嶇О,AA.partspec as 浜у搧瑙勬牸,AA.stepcode as 宸ュ簭缂栫爜,AA.stepname as 宸ュ簭鍚嶇О,AA.isend as 鏄惁鏈亾宸ュ簭,
AA.task_qty as 浠诲姟鏁伴噺,AA.group_code as 鐢熶骇鐝粍缂栫爜,AA.group_name as 鐢熶骇鐝粍鍚嶇О,AA.report_qty as 鎶ュ伐鏁伴噺,AA.unprice as 宸ュ簭鍗曚环,AA.ratio as 鍒嗛厤姣斾緥,
- AA.moneys as 璁′欢宸ヨ祫,AA.username as 鎶ュ伐浜哄憳,AA.report_date as 鎶ュ伐鏃堕棿
+ AA.moneys as 璁′欢宸ヨ祫,AA.username as 鎶ュ伐浜哄憳,AA.report_date as 鎶ュ伐鏃堕棿,AA.wksp_code as 杞﹂棿缂栫爜
from (
select distinct A.wo_code,M.partcode,M.partname,M.partspec,T.stepcode,T.stepname,
A.task_qty,G.group_code,G.group_name,B.report_qty,isnull(S.unprice,0) as unprice,B.ratio,P.isend,
- (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date
+ (B.report_qty*isnull(S.unprice,0))*(B.ratio/100) as moneys,U.username,B.report_date,E.wksp_code
from TK_Wrk_Record A
inner join TK_Wrk_RecordSub B on A.id=B.m_id
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
@@ -627,6 +630,7 @@
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on B.report_person=U.usercode
+ left join TEqpInfo E on A.eqp_code=E.code
) as AA
where " + search;
DataTable data = DapperHelper.selectdata(sql, dynamicParams);
--
Gitblit v1.9.3