From 916f6b186e8eb682143e548db0d326bf1d96ffcc Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 04 一月 2024 17:31:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 8f391a6..0f9d62f 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -892,17 +892,17 @@
public static DataSet Sc_GetMESProductReportBillList(string sWhere)
{
- string sql = string.Format(@"select a.HInterID, a.HBillNo,a.HDate,a.HBillType,a.HBillStatus,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec
- ,a.HSourceID,s.HNumber HSourceCode,s.HName HSourceName,a.HGroupID,g.HNumber HGroupCode,g.HName HGroupName
- ,a.HWorkManID,e.HName HWorkManName,a.HMaker,a.HMakeDate, a.HReportType
- ,a.HQty,a.HICMOBillNo,a.HICMOInterID,a.HICMOEntryID
- ,a.HSourceInterID,a.HSourceEntryID,a.HSourceBillNo, a.HSourceBillType
- from Sc_ICMOBillWorkQtyStatus_Tmp a
- left join Gy_Material m on a.HMaterID=m.hitemid
- left join Gy_Source s on a.HSourceID=s.HItemID
- left join Gy_Group g on a.HGroupID=g.HItemID
- left join Gy_Employee e on a.HWorkManID=e.HItemID " + sWhere + " and HRelationInterID='0'");
- return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
+ string sql = "";
+ if (sWhere != null && sWhere != "")
+ {
+ sql = "select * from h_v_Sc_ICMOBillWorkQtyTmpList_ReportingPlatform " + sWhere;
+ }
+ else
+ {
+ sql = "select * from h_v_Sc_ICMOBillWorkQtyTmpList_ReportingPlatform " ;
+ }
+
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_ICMOBillWorkQtyTmpList_ReportingPlatform");
}
#endregion
--
Gitblit v1.9.1