From 981e65a58c087f16fcff1777ea82f23759e84e5d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 28 十月 2024 17:57:24 +0800
Subject: [PATCH] 1

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

diff --git a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
index 9f288aa..5af371b 100644
--- a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
+++ b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
@@ -20,6 +20,69 @@
         DataSet ds;
         Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
 
+        #region 鐢熶骇璁㈠崟鍏ㄧ▼璺熻釜鎶ヨ〃 鏌ヨ鍏ㄩ儴閿�鍞鍗曞彿
+        [Route("Mes_OrderProcFlowAllReport/getHSeOrderBillNo")]
+        [HttpGet]
+        public object getHSeOrderBillNo()
+        {
+            try
+            {
+                ds = oCN.RunProcReturn($"select DISTINCT HSeOrderBillNo from Sc_ICMOBillMain ", "Sc_ICMOBillMain");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                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/OrderProcFlowAllReportICMOList")]
+        [HttpGet]
+        public object OrderProcFlowAllReportICMOList(string sWhere)
+        {
+            try
+            {
+                //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+
+                ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_ICMO " + sWhere + "", "h_p_Mes_OrderProcFlowAllReport_ICMO");
+
+                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/OrderProcFlowAllReportList")]
         [HttpGet]

--
Gitblit v1.9.1