From cc0f022b6538d5e40067b943bc4fcb6e15567f21 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 15 八月 2024 13:02:07 +0800
Subject: [PATCH] 优化pda设备保养记录单新增页面,保存后端时,制单人不是当前登录人,器具档案增加字段 HInitLife money //上线初始化寿命,修改工序流转卡下推设备点检参数表 查询方法
---
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