From 454a4392efc09525ba2ef9921f7bd08bd14356fc Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 08 十一月 2024 09:43:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs    |   52 +++++++++++++++++++++++++
 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs |   21 ++++++++++
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
index 367d73d..07a6398 100644
--- a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -77,8 +77,14 @@
             try
             {
                 List<object> columnNameList = new List<object>();
+                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
 
-                ds = oCN.RunProcReturn("exec h_p_Cj_HeatTreatmentTemperatureCurveChart '"+ sWhere + "'", "h_p_Cj_HeatTreatmentTemperatureCurveChart");
+                string HEquipNumber = dic["HEquipNumber"].ToString();//璁惧缂栫爜
+                string HBeginDate = dic["HBeginDate"].ToString();//閲囬泦鏃ユ湡
+                string HEndDate = dic["HEndDate"].ToString();//閲囬泦鏃ユ湡
+                string HProcExchBillNo = dic["HProcExchBillNo"].ToString();//宸ュ簭娴佽浆鍗�
+
+                ds = oCN.RunProcReturn("exec h_p_Cj_HeatTreatmentTemperatureCurveChart '" + HEquipNumber + "','" + HBeginDate + "','" + HEndDate + "','" + HProcExchBillNo + "'", "h_p_Cj_HeatTreatmentTemperatureCurveChart");
 
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)
@@ -105,5 +111,49 @@
             }
         }
         #endregion
+
+        #region 杞﹂棿绠$悊  骞茬嚗鏈烘俯搴︽洸绾垮浘
+        [Route("Cj_NoPassProc/Cj_TemperatureCurveDryingMachine")]
+        [HttpGet]
+        public object Cj_TemperatureCurveDryingMachine(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+
+                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+                string HEquipNumber = dic["HEquipNumber"].ToString();//璁惧缂栫爜
+                string HBeginDate = dic["HBeginDate"].ToString();//閲囬泦鏃ユ湡
+                string HEndDate = dic["HEndDate"].ToString();//閲囬泦鏃ユ湡
+                string HProcExchBillNo = dic["HProcExchBillNo"].ToString();//宸ュ簭娴佽浆鍗�
+
+                ds = oCN.RunProcReturn("exec h_p_Cj_TemperatureCurveDryingMachine '" + HEquipNumber + "','"+ HBeginDate + "','"+ HEndDate + "','" + HProcExchBillNo + "'", "h_p_Cj_TemperatureCurveDryingMachine");
+
+                //娣诲姞鍒楀悕
+                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 = "";
+                objJsonResult.data = ds;
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index e890165..076d216 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -1010,7 +1010,7 @@
         #region  宸ュ簭鍗曞搧杩囩珯 閰嶄欢鐮佹煡璇�
         [Route("Cj_SingleStation/HBardCodeAccessoryList")]
         [HttpGet]
-        public object HBardCodeAccessoryList(string HBarCode, string user)
+        public object HBardCodeAccessoryList(string HBarCode, string HProcExchBillNo, string user,string HBillType)
         {
             try
             {
@@ -1043,6 +1043,25 @@
                     return objJsonResult;
                 }
 
+                DataSet dataSet  = oCN.RunProcReturn(@"exec h_p_CJ_SNBarCodeBillMouldBathSelect '" + HBarCode + "','" + HProcExchBillNo + "','"+ HBillType + "'", "h_p_CJ_SNBarCodeBillMouldBathSelect");
+
+                if (dataSet.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "閰嶄欢鏉$爜鍒ゆ柇澶辫触锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                if (ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBack"]) == "2")
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(dataSet.Tables[0].Rows[0]["HBackRemark"]);
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "";

--
Gitblit v1.9.1