From 2cd22bf33a21e534357c683e8f149f66a0ba5c7b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 02 八月 2024 15:08:30 +0800
Subject: [PATCH] 首检+巡检+工序检,测试并完善增加,最大/最小/平均/检验记录的值保存,上料防错保存方法中,注释掉给流转卡赋空值,增加 制程绩效趋势图(合格率)  查询

---
 WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
index 6455b57..4e2c548 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -1,4 +1,5 @@
 锘縰sing DBUtility;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -26,6 +27,7 @@
         {
             try
             {
+                List<object> columnNameList = new List<object>();
                 if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainPlanBillList", 1, false, user))
                 {
                     objJsonResult.code = "0";
@@ -46,11 +48,19 @@
                     ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan");
                 }
 
-               
+                //娣诲姞鍒楀悕
+                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 ex)
@@ -113,6 +123,8 @@
                     UserName = oItem.HMaker;  //鍒跺崟浜�
                     oItem.HBillType = "3902";
                     oItem.HBillSubType = "3902";
+                    oItem.HMainSourceInterID = oItem.HMouldMaintainRuleID;
+                    oItem.HMainSourceBillNo = oItem.HMouldMaintainRuleNo;
 
                     //oItem.HInterID =0;
                     //oItem.HBillNo = "";

--
Gitblit v1.9.1