From c0cee04d997030777bd85d198d82cc2567f4773f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 02 二月 2024 18:18:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
index 5e24800..7344dad 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
@@ -26,30 +26,19 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp " + sWhere, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp " + sWhere+ "order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
}
else
{
string sql1 = "select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by 鍗曟嵁鍙� desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鏌ヨ鏁版嵁鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- }
}
catch (Exception e)
{
--
Gitblit v1.9.1