From fc9f979e90c300778c6dd43804145dac6db185e5 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 12 二月 2026 19:39:07 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs
index 20a17db..2dde268 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs
@@ -539,6 +539,63 @@
}
}
+ [Route("Gy_ConkType/List_PDA2")]
+ [HttpGet]
+ public object List_PDA(string sWhere, string user, string Mode)
+ {
+ if (string.IsNullOrWhiteSpace(Mode))
+ {
+ return List_PDA(sWhere, user);
+ }
+ try
+ {
+ string errRef = "";
+ List<object> columnNameList = new List<object>();
+
+ if(oClsXt_SystemParameter.ShowBill(ref errRef))
+ {
+ if(oClsXt_SystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
+ {
+ if(Mode == "Module")
+ {
+ sWhere += $" and 鏁呴殰绫诲埆浠ｇ爜 like 'MJ%' ";
+ }
+ else if (Mode == "Equip")
+ {
+ sWhere += $" and 鏁呴殰绫诲埆浠ｇ爜 like 'SB%' ";
+ }
+ }
+ }
+
+ sWhere += $" and 绂佺敤鏍囧織='' ";
+ LogService.Write(sWhere);
+ string sql1 = string.Format(@"select * from h_v_Gy_ConkTypeList where 1=1 ");
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by 鏁呴殰绫诲埆浠ｇ爜 ", "h_v_Gy_ConkTypeList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
--
Gitblit v1.9.1