From c4c8ad30b13937190c3e17e50ccbe22d17cb97c9 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 11 八月 2022 14:16:51 +0800
Subject: [PATCH] 优化
---
WebAPI/Controllers/POInStockController.cs | 23 +++++++----------------
WebAPI/Controllers/Xt_grdAlignment_WMESController.cs | 6 +++++-
2 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 8c06a45..f73fa4b 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -474,22 +474,13 @@
//鑾峰彇杩斿洖鏁版嵁
ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBillList '" + PcWhere + "'", "H_p_SRM_POInStockBillList");
LogService.Write("閫佽揣鍗曞垪琛ㄥ姞杞絪ql:exec H_p_SRM_POInStockBillList '" + PcWhere + "'");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "鑾峰彇鎴愬姛锛屾棤鏁版嵁";
- objjson.data = null;
- return objjson;
- }
- else
- {
- objjson.code = "0";
- objjson.count = 10000;
- objjson.Message = "鑾峰彇鎴愬姛";
- objjson.data = ds.Tables[0];
- return objjson;
- }
+
+ objjson.code = "0";
+ objjson.count = 10000;
+ objjson.Message = "鑾峰彇鎴愬姛";
+ objjson.data = ds.Tables[0];
+ return objjson;
+
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/Xt_grdAlignment_WMESController.cs
index 19d0144..434ba0e 100644
--- a/WebAPI/Controllers/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/Xt_grdAlignment_WMESController.cs
@@ -62,6 +62,7 @@
public string ColumnName;
public bool IsHide;
public string Alignment;
+ public string ColumnWidth;
}
[Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")]
@@ -108,7 +109,10 @@
var HGridString = "";
for (int i = 0; i < omdelsub.Count; i++)
{
- HGridString += $"{(i+1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment},";
+ var width = omdelsub[i].ColumnWidth;
+ if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0)
+ width = "120";
+ HGridString += $"{(i+1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width},";
}
HGridString = HGridString.Substring(0, HGridString.Length - 1);
--
Gitblit v1.9.1