From 5b84275a7ce63b83c778c5ac050b8c039cd4fac8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 06 八月 2024 17:46:25 +0800
Subject: [PATCH] 1.修改接口：UpdateMesOrderStepSearch --工单派发 2.修改接口：MesOrderNewStepContent --工单派发 3.修改接口：RouteSelectStep--工单派发 4.新增组织架构类型接口：TOrganTypeDate 5.新增组织架构车间接口：TorgWkshop 6.新增车间查找设备接口：WkshopEqpPermissions 7.新增往来单位基础资料接口：CustomerTypePermissions 8.新增往来单位类型查找往来单位资料接口：CustomerTypeSearchPermissions 9.新增工序关联工作站接口 10.修改工序工价提交接口(增加了设备)
---
VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs | 163 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 130 insertions(+), 33 deletions(-)
diff --git a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
index 9d4975e..48ae0ab 100644
--- a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
@@ -808,17 +808,50 @@
}
}
//鑾峰彇宸ュ簭淇℃伅
- sql = @"select S.wo_code,S.seq,S.step_code,T.stepname,S.stepprice,(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
+ sql = @"select S.id,S.wo_code,S.seq,S.step_code,T.stepname,T.flwtype,S.stepprice,(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty,(isnull(S.plan_qty,0)-(isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0))) as delive_qty,S.isbott,S.isend
from TK_Wrk_Step S
left join TStep T on S.step_code=T.stepcode
where S.wo_code=@wocode order by S.seq ";
dynamicParams.Add("@wocode", wocode);
- var data1 = DapperHelper.selectdata(sql, dynamicParams);
+ var parents = DapperHelper.select<WorkRouteStepEqp>(sql, dynamicParams);
+ //鑾峰彇宸ュ簭瀵瑰簲璁惧淇℃伅
+ for (int i = 0; i < parents.Count; i++)
+ {
+ if (parents[i].flwtype == "Z")
+ {
+ //閫氳繃宸ヨ壓璺嚎宸ュ簭琛↖D鏌ユ壘瀵瑰簲璁惧淇℃伅
+ sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
+ (isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
+ S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
+ from TK_Wrk_StepEqp S
+ inner join TEqpInfo E on S.eqp_code=E.code
+ where S.m_id=@m_id";
+ dynamicParams.Add("@m_id", parents[i].id);
+ var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
+ parents[i].children = children.ToList();
+ }
+ else
+ {
+ //閫氳繃宸ヨ壓璺嚎宸ュ簭琛↖D鏌ユ壘瀵瑰簲澶栧崗渚涘簲鍟嗕俊鎭�
+ sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
+ (isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
+ S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
+ from TK_Wrk_StepEqp S
+ inner join TCustomer E on S.eqp_code=E.code
+ where S.m_id=@m_id";
+ dynamicParams.Add("@m_id", parents[i].id);
+ var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
+ parents[i].children = children.ToList();
+ }
+
+ }
+
+
dir.Add("canupdate_qty", canupdate_qty);
- dir.Add("stepdata", data1);
+ dir.Add("stepdata", parents);
mes.code = "200";
- mes.count = data1.Rows.Count;
+ mes.count = parents.Count;
mes.message = "鏌ヨ鎴愬姛";
mes.data = dir;
}
@@ -1150,35 +1183,99 @@
if (route) //宸ヨ壓璺嚎鐗�
{
//MES宸ュ崟鏌ユ壘鍘嗗彶寮曠敤鏈�鏂板伐搴忎俊鎭�
- sql = @"select S.wo_code,S.seq,S.step_code,S.stepprice,isbott,isend
- from TK_Wrk_Step S
- inner join (
- select top 1 A.wo_code,A.route_code from TK_Wrk_Man A
- inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.route_code=S.route_code
- where A.materiel_code=@partcode and A.wkshp_code=@wkshopcode and A.route_code=@routecode
- order by A.lm_date desc
- ) as W on S.wo_code=W.wo_code and S.route_code=W.route_code
- left join TStep T on S.step_code=T.stepcode
- order by S.seq";
+ sql = @"select S.id,S.wo_code,S.seq,S.step_code,T.stepname,T.flwtype,S.stepprice,'0' as produceq_qty,
+ '0' as good_qty,'0' as ng_qty,'0' as laborbad_qty,'0' as materielbad_qty,'0' as delive_qty,isbott,isend
+ from TK_Wrk_Step S
+ inner join (
+ select top 1 S.id,A.wo_code,A.route_code from TK_Wrk_Man A
+ inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.route_code=S.route_code
+ where A.materiel_code=@partcode and A.wkshp_code=@wkshopcode and A.route_code=@routecode
+ order by A.lm_date desc
+ ) as W on S.wo_code=W.wo_code and S.route_code=W.route_code
+ left join TStep T on S.step_code=T.stepcode
+ order by S.seq";
dynamicParams.Add("@wkshopcode", wkshopcode);
dynamicParams.Add("@partcode", partcode);
dynamicParams.Add("@routecode", routecode);
+ var parents = DapperHelper.select<WorkRouteStepEqp>(sql, dynamicParams);
+ //鑾峰彇宸ュ簭瀵瑰簲璁惧淇℃伅
+ for (int i = 0; i < parents.Count; i++)
+ {
+ if (parents[i].flwtype == "Z")
+ {
+ //閫氳繃宸ヨ壓璺嚎宸ュ簭琛↖D鏌ユ壘瀵瑰簲璁惧淇℃伅
+ sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
+ (isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
+ S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
+ from TK_Wrk_StepEqp S
+ inner join TEqpInfo E on S.eqp_code=E.code
+ where S.m_id=@m_id";
+ dynamicParams.Add("@m_id", parents[i].id);
+ var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
+ parents[i].children = children.ToList();
+ }
+ else
+ {
+ //閫氳繃宸ヨ壓璺嚎宸ュ簭琛↖D鏌ユ壘瀵瑰簲澶栧崗渚涘簲鍟嗕俊鎭�
+ sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
+ (isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
+ S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
+ from TK_Wrk_StepEqp S
+ inner join TCustomer E on S.eqp_code=E.code
+ where S.m_id=@m_id";
+ dynamicParams.Add("@m_id", parents[i].id);
+ var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
+ parents[i].children = children.ToList();
+ }
+ }
}
else
{
//MES宸ュ崟鏌ユ壘鍘嗗彶寮曠敤鏈�鏂板伐搴忎俊鎭�
- sql = @"select S.wo_code,S.seq,S.step_code,S.stepprice,isbott,isend
- from TK_Wrk_Step S
- inner join (
- select top 1 A.wo_code from TK_Wrk_Man A
- inner join TK_Wrk_Step S on A.wo_code=S.wo_code
- where A.materiel_code=@partcode and A.wkshp_code=@wkshopcode
- order by A.lm_date desc
- ) as W on S.wo_code=W.wo_code
- left join TStep T on S.step_code=T.stepcode
- order by S.seq";
+ sql = @"select S.id,S.wo_code,S.seq,S.step_code,T.stepname,T.flwtype,S.stepprice,'0' as produceq_qty,
+ '0' as good_qty,'0' as ng_qty,'0' as laborbad_qty,'0' as materielbad_qty,'0' as delive_qty,isbott,isend
+ from TK_Wrk_Step S
+ inner join (
+ select top 1 A.wo_code from TK_Wrk_Man A
+ inner join TK_Wrk_Step S on A.wo_code=S.wo_code
+ where A.materiel_code=@partcode and A.wkshp_code=@wkshopcode
+ order by A.lm_date desc
+ ) as W on S.wo_code=W.wo_code
+ left join TStep T on S.step_code=T.stepcode
+ order by S.seq";
dynamicParams.Add("@wkshopcode", wkshopcode);
dynamicParams.Add("@partcode", partcode);
+ var parents = DapperHelper.select<WorkRouteStepEqp>(sql, dynamicParams);
+ //鑾峰彇宸ュ簭瀵瑰簲璁惧淇℃伅
+ for (int i = 0; i < parents.Count; i++)
+ {
+ if (parents[i].flwtype == "Z")
+ {
+ //閫氳繃宸ヨ壓璺嚎宸ュ簭琛↖D鏌ユ壘瀵瑰簲璁惧淇℃伅
+ sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
+ (isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
+ S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
+ from TK_Wrk_StepEqp S
+ inner join TEqpInfo E on S.eqp_code=E.code
+ where S.m_id=@m_id";
+ dynamicParams.Add("@m_id", parents[i].id);
+ var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
+ parents[i].children = children.ToList();
+ }
+ else
+ {
+ //閫氳繃宸ヨ壓璺嚎宸ュ簭琛↖D鏌ユ壘瀵瑰簲澶栧崗渚涘簲鍟嗕俊鎭�
+ sql = @"select S.eqp_code,E.name as eqp_name,S.eqpprice as eqp_price,
+ (isnull(S.good_qty,0)+isnull(S.ng_qty,0)+isnull(S.laborbad_qty,0)+isnull(S.materielbad_qty,0)) as produceq_qty,
+ S.good_qty,S.ng_qty,S.laborbad_qty,S.materielbad_qty
+ from TK_Wrk_StepEqp S
+ inner join TCustomer E on S.eqp_code=E.code
+ where S.m_id=@m_id";
+ dynamicParams.Add("@m_id", parents[i].id);
+ var children = DapperHelper.select<WorkRouteStepEqpSub>(sql, dynamicParams);
+ parents[i].children = children.ToList();
+ }
+ }
}
var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1923,7 +2020,7 @@
else //涓嶆寜搴忔敹鍙戞枡
{
mes = ScanStartReport.NoWXEncodingSeach(SelectType, wocode, stepcode);
- }
+ }
break;
default:
break;
@@ -3382,7 +3479,7 @@
}
}
}
- }
+ }
}
}
else //涓嶆寜搴�
@@ -3390,10 +3487,10 @@
//鎺у埗閫昏緫锛氬綋鍓嶅伐搴忔姤宸ヨ皟鏁�-> (鏈亾宸ュ簭褰撳墠璋冩暣鍚堟牸鏁�+鏈亾宸ュ簭闈炲綋鍓嶆姤宸ュ悎鏍兼�绘暟)<涓嬮亾宸ュ簭鎶ュ伐鎬绘暟(鍚堟牸+涓嶈壇+鎶ュ簾) ==涓嶈兘灏忎簬涓嬮亾鎶ュ伐鎬绘暟
list.Clear();
//鍒ゆ柇褰撳墠宸ュ簭鏄嚜鍒跺伐搴忚繕鏄鍗忓伐搴�
- if (json[0].flw_type.ToString() == "Z")
+ if (json[0].flw_type.ToString() == "Z")
{
-
- //鏌ヨ褰撳墠鎶ュ伐宸ュ簭闈炴娆℃姤宸ワ細鎬绘姤宸ユ暟閲忋�佹�讳笉鑹暟閲忋�佹�诲伐搴熸暟閲忋�佹�绘枡搴熸暟閲�
+
+ //鏌ヨ褰撳墠鎶ュ伐宸ュ簭闈炴娆℃姤宸ワ細鎬绘姤宸ユ暟閲忋�佹�讳笉鑹暟閲忋�佹�诲伐搴熸暟閲忋�佹�绘枡搴熸暟閲�
sql = @"select isnull(sum(good_qty),0) as good_qty,isnull(sum(ng_qty),0) as ng_qty,isnull(sum(laborbad_qty),0) as laborbad_qty,isnull(sum(materielbad_qty),0) as materielbad_qty
from TK_Wrk_Record where wo_code=@wo_code and style='B' and id<>@id and step_code=@step_code";
dynamicParams.Add("@wo_code", json[0].wo_code);
@@ -3415,7 +3512,7 @@
return mes;
}
}
- if (json[0].flw_type.ToString() == "W")
+ if (json[0].flw_type.ToString() == "W")
{
//鑾峰彇褰撳墠宸ュ簭銆佷緵搴斿晢瀵瑰簲鐨勬�诲彂鏂欐暟閲�
sql = @"select isnull(sum(fqty),0) as fqty
@@ -3437,7 +3534,7 @@
decimal notthis_ngqty = decimal.Parse(dt.Rows[0]["ng_qty"].ToString()); //褰撳墠鏈亾宸ュ簭闈炴湰娆℃姤宸ユ�绘暟
decimal notthis_laborbad_qty = decimal.Parse(dt.Rows[0]["laborbad_qty"].ToString()); //褰撳墠鏈亾宸ュ簭闈炴湰娆℃姤宸ュ伐搴熸�绘暟
decimal notthis_materielbad_qty = decimal.Parse(dt.Rows[0]["materielbad_qty"].ToString()); //褰撳墠鏈亾宸ュ簭闈炴湰娆℃姤宸ユ枡搴熸�绘暟
- //鑾峰彇褰撳墠鏈亾宸ュ簭鏀舵枡鎬绘暟閲忥細鏈淇敼鏀舵枡鏁伴噺+鏈淇敼涓嶈壇鏁伴噺+鏈淇敼宸ュ簾鏁伴噺+鏈淇敼鎶ュ伐鏂欏簾鏁伴噺+褰撳墠宸ュ簭闈炴湰娆℃敹鏂欐�绘暟+褰撳墠宸ュ簭闈炴湰娆′笉鑹�绘暟+褰撳墠宸ュ簭闈炴湰娆″伐搴熸�绘暟+褰撳墠宸ュ簭闈炴湰娆℃枡搴熸�绘暟
+ //鑾峰彇褰撳墠鏈亾宸ュ簭鏀舵枡鎬绘暟閲忥細鏈淇敼鏀舵枡鏁伴噺+鏈淇敼涓嶈壇鏁伴噺+鏈淇敼宸ュ簾鏁伴噺+鏈淇敼鎶ュ伐鏂欏簾鏁伴噺+褰撳墠宸ュ簭闈炴湰娆℃敹鏂欐�绘暟+褰撳墠宸ュ簭闈炴湰娆′笉鑹�绘暟+褰撳墠宸ュ簭闈炴湰娆″伐搴熸�绘暟+褰撳墠宸ュ簭闈炴湰娆℃枡搴熸�绘暟
decimal updatereportsumqty = this_reportqty + this_ngqty + this_laborbadqty + this_materielbadqty + notthis_reportqty + notthis_ngqty + notthis_laborbad_qty + notthis_materielbad_qty;
//鍒ゆ柇褰撳墠宸ュ簭渚涘簲鍟嗘敹鏂欐�绘暟>褰撳墠宸ュ簭渚涘簲鍟嗗搴斿彂鏂欐暟閲�
if (updatereportsumqty > decimal.Parse(dt_0.Rows[0]["fqty"].ToString()))
@@ -3485,7 +3582,7 @@
str = sql,
parm = new
{
- step_price=decimal.Parse(json[0].unprice),
+ step_price = decimal.Parse(json[0].unprice),
good_qty = decimal.Parse(json[0].report_dvalue),
ng_qty = this_ng_dvalue,
laborbad_qty = this_laborbad_dvalue,
@@ -3588,7 +3685,7 @@
str = sql,
parm = new
{
- step_price=decimal.Parse(json[0].unprice),
+ step_price = decimal.Parse(json[0].unprice),
good_qty = decimal.Parse(json[0].report_dvalue),
ng_qty = this_ng_dvalue,
laborbad_qty = this_laborbad_dvalue,
--
Gitblit v1.9.3