From fffa6078ae34abf09bf8d7a97ea24e691c94dee0 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期四, 01 九月 2022 09:10:28 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/WebAPIController.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index cef38b2..d9c6515 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1023,7 +1023,8 @@
}
try
{
- ds = webserver.GetEmployeeList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ string sql = $"Select * from h_v_IF_Emp {sWhere} Order by HNumber";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_Emp");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objjson.code = "0";
@@ -3141,7 +3142,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
- b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain a
+ b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark,a.HInterID,a.HBillNo from Sb_EquipDotCheckRuleBillMain a
left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID
left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
left join Gy_Employee e on e.HItemID=b.HManagerID
--
Gitblit v1.9.1