From 82de67c48acaf472a6f8bb8b53f3f4feec9f5e54 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 17 十月 2025 10:42:18 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
index 748e7a1..1e1093e 100644
--- a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
+++ b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
@@ -27,7 +27,7 @@
         {
             try
             {
-                ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillMain ", "Sc_ICMOBillMain");
+                ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillSub ", "Sc_ICMOBillSub");
 
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
@@ -120,6 +120,43 @@
         }
         #endregion
 
+        #region 杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃 鏌ヨ
+        [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_TK")]
+        [HttpGet]
+        public object OrderProcFlowAllReportList_TK(string sWhere)
+        {
+            try
+            {
+                //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+
+                ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_TK " + sWhere + "", "h_p_Mes_OrderProcFlowAllReport_TK");
+
+                List<object> listCol = new List<object>();
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    listCol.Add(JsonConvert.DeserializeObject(str));
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = listCol;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
         #region 宸ュ簭鍦ㄥ埗鍝佹姤琛�(绾靛悜) 鏌ヨ
         [Route("Mes_OrderProcFlowAllReport/WIPProcReportList")]
         [HttpGet]

--
Gitblit v1.9.1