From 38b01cb446b0725ded3ae8867353925e67da3ac1 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 18 六月 2024 19:41:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 89983c8..66a1b09 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -396,7 +396,7 @@
if (sWhere == null || sWhere.Equals(""))
{
string sql = "select * from h_v_OA_ErrMsgBackBillList order by 鍗曟嵁鍙� desc";
- ds = oCN.RunProcReturn(sql, "p_v_OA_ErrMsgBackBillList");
+ ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackBillList");
}
else
{
@@ -518,10 +518,12 @@
A.HReceiveMan,A.HCopyMan,A.HHasten,
A.HLevel,A.HMaterName,A.HMaterModel,
B.HReadFlag, A.HMaker,A.HMakeDate,A.HUpDater,A.HUpDateDate,A.HChecker,A.HCheckDate,A.HCloseMan,A.HCloseDate,A.HDeleteMan,A.HDeleteDate,
- A.HSourceInterID,A.HSourceEntryID,A.HSourceBillNo,A.HSourceBillType
+ A.HSourceInterID,A.HSourceEntryID,A.HSourceBillNo,A.HSourceBillType,
+ A.HHandleEmpID,f.HName HHandleEmpName
from OA_ErrMsgBackBillMain A
inner join OA_ErrMsgBackBillSub2 B on A.HInterID=B.HInterID
left join Gy_Department D on A.HDeptID=D.HItemID
+ left join Gy_Employee f on A.HHandleEmpID=f.HItemID
where A.HInterID='" + HID + "' and b.HEntryID='" + HEntryID + "'");
var dataSet = oCN.RunProcReturn(sql, "OA_ErrMsgBackBillMain");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
--
Gitblit v1.9.1