From 3e9b79b84905b1cf7a282d1bf03e6de3e85b91bb Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 02 十一月 2023 15:52:22 +0800
Subject: [PATCH] 1.生产开报工、报表增加销售订单号查询字段及列表字段
---
VueWebApi/Tools/ScanStartReport.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/VueWebApi/Tools/ScanStartReport.cs b/VueWebApi/Tools/ScanStartReport.cs
index 85bf63c..1be8f6d 100644
--- a/VueWebApi/Tools/ScanStartReport.cs
+++ b/VueWebApi/Tools/ScanStartReport.cs
@@ -18,10 +18,11 @@
/// 鎵爜淇℃伅涓哄伐鍗�+宸ュ簭鏉＄爜
/// </summary>
/// <param name="stu_torgcode">鎵�灞炵粍缁囩紪鐮�</param>
+ /// <param name="SelectType">璁惧缂栫爜</param>
/// <param name="ordercode">宸ュ崟缂栧彿</param>
/// <param name="stepcode">宸ュ簭缂栫爜</param>
/// <returns></returns>
- public static ToMessage ZZEncodingSeach(string stu_torgcode, string ordercode, string stepcode)
+ public static ToMessage ZZEncodingSeach(string stu_torgcode, string SelectType, string ordercode, string stepcode)
{
var sql = "";
string flwtype = ""; //宸ュ簭灞炴��
@@ -62,10 +63,12 @@
}
//1.鏍规嵁宸ュ崟+宸ュ簭鏌ユ壘褰撳墠宸ュ簭鏄惁棣栭亾宸ュ簭
- sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend,L.org_code,L.org_name
+ sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend,L.org_code,L.org_name,
+ M.m_po,W.saleOrderCode
from TK_Wrk_Step A
left join TStep T on A.step_code=T.stepcode
left join TK_Wrk_Man M on A.wo_code=M.wo_code
+ left join TKimp_Ewo W on M.m_po=W.wo and M.materiel_code=W.materiel_code
left join TMateriel_Info P on M.materiel_code=P.partcode
left join TOrganization L on M.wkshp_code=L.org_code
where A.wo_code=@ordercode and A.step_code=@stepcode";
@@ -76,6 +79,8 @@
{
rt.wkshopcode= data.Rows[0]["org_code"].ToString(); //杞﹂棿缂栫爜
rt.wkshopname = data.Rows[0]["org_name"].ToString(); //杞﹂棿鍚嶇О
+ rt.saleOrderCode = data.Rows[0]["saleOrderCode"].ToString();//閿�鍞鍗曞彿
+ rt.m_po= data.Rows[0]["m_po"].ToString();//璁㈠崟鍙�
rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //宸ュ崟鍙�
rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //浜у搧缂栫爜
rt.partname = data.Rows[0]["PARTNAME"].ToString(); //浜у搧鍚嶇О
@@ -116,6 +121,7 @@
mes.data = null;
return mes;
}
+
switch (flwtype)
{
case "Z": //鑷埗宸ュ簭
@@ -124,9 +130,10 @@
//1.棣栭亾宸ュ簭鏃讹紝鍒ゆ柇鏄惁鏈夊紑宸ヨ褰�
sql = @"select * from TK_Wrk_Record R
left join TEqpInfo E on R.eqp_code=E.code
- where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";
+ where R.wo_code=@ordercode and R.step_code=@stepcode and eqp_code=@eqp_code and R.style='S'";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
+ dynamicParams.Add("@eqp_code", SelectType);
var data0 = DapperHelper.selectdata(sql, dynamicParams);
if (data0.Rows.Count > 0) //鏈夊紑宸ヨ褰�
{
@@ -205,9 +212,10 @@
//1.闈為閬撳伐搴忔椂锛屽垽鏂湰閬撴槸鍚︽湁寮�宸ヨ褰�
sql = @"select * from TK_Wrk_Record R
left join TEqpInfo E on R.eqp_code=E.code
- where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";
+ where R.wo_code=@ordercode and R.step_code=@stepcode and eqp_code=@eqp_code and R.style='S'";
dynamicParams.Add("@ordercode", ordercode);
dynamicParams.Add("@stepcode", stepcode);
+ dynamicParams.Add("@eqp_code", SelectType);
var data1 = DapperHelper.selectdata(sql, dynamicParams);
if (data1.Rows.Count > 0)//鏈亾鏈夊紑宸ヨ褰�
{
@@ -573,10 +581,12 @@
}
//1.鏍规嵁宸ュ崟+宸ュ簭鏌ユ壘褰撳墠宸ュ簭鏄惁棣栭亾宸ュ簭
- sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend,L.org_code,L.org_name
+ sql = @"select A.wo_code,P.partcode,P.partname,P.partspec, T.stepcode,T.stepname,A.seq,T.flwtype,T.descr,A.status,A.plan_qty,A.isbott,A.isend,L.org_code,L.org_name,
+ M.m_po,W.saleOrderCode
from TK_Wrk_Step A
left join TStep T on A.step_code=T.stepcode
left join TK_Wrk_Man M on A.wo_code=M.wo_code
+ left join TKimp_Ewo W on M.m_po=W.wo and M.materiel_code=W.materiel_code
left join TMateriel_Info P on M.materiel_code=P.partcode
left join TOrganization L on M.wkshp_code=L.org_code
where A.wo_code=@ordercode and A.step_code=@stepcode";
@@ -588,6 +598,8 @@
rt.wkshopcode = data.Rows[0]["org_code"].ToString(); //杞﹂棿缂栫爜
rt.wkshopname = data.Rows[0]["org_name"].ToString(); //杞﹂棿鍚嶇О
rt.wo_code = data.Rows[0]["WO_CODE"].ToString(); //宸ュ崟鍙�
+ rt.saleOrderCode = data.Rows[0]["saleOrderCode"].ToString();//閿�鍞鍗曞彿
+ rt.m_po = data.Rows[0]["m_po"].ToString();//璁㈠崟鍙�
rt.partnumber = data.Rows[0]["PARTCODE"].ToString(); //浜у搧缂栫爜
rt.partname = data.Rows[0]["PARTNAME"].ToString(); //浜у搧鍚嶇О
rt.partspec = data.Rows[0]["PARTSPEC"].ToString(); //浜у搧瑙勬牸
--
Gitblit v1.9.3