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 |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/VueWebApi/Tools/ScanStartReport.cs b/VueWebApi/Tools/ScanStartReport.cs
index 979d022..1be8f6d 100644
--- a/VueWebApi/Tools/ScanStartReport.cs
+++ b/VueWebApi/Tools/ScanStartReport.cs
@@ -63,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";
@@ -77,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(); //浜у搧鍚嶇О
@@ -577,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";
@@ -592,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