From ad877b5a14f90dca73adc74a45e2eac447622b84 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 10 三月 2026 16:04:13 +0800
Subject: [PATCH] 新增 巡检 开工 检验是否开启 首件检验配置项
---
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index d70ad5d..7dfe452 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -13,8 +13,10 @@
using System.Threading.Tasks;
using System.Web.Http;
using WebAPI.Models;
+using WebAPI.Service;
using System.Threading;
using SyntacticSugar.constant;
+using WebApiWithFleck;
namespace WebAPI.Controllers.SCGL
{
@@ -7407,7 +7409,6 @@
}
if (bResult)
{
-
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -7793,6 +7794,12 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ // 涓帹鏂瑰紡鎺ㄩ�佹暟鎹�
+ GeTuiService.PubishSingle(HInterID);
+
+ // webSocket鏂瑰紡鎺ㄩ�佹暟鎹�
+ // WebSocketServer.PushOne(HInterID);
}
if (IsAudit == 1) //鍙嶅鏍告彁浜�
{
@@ -8224,14 +8231,29 @@
{
try
{
+ List<object> columnNameList = new List<object>();
- string sql = "select * from OA_WorkLinkBillSub where HInterID = '" + HInterID + "'order by HDate desc";
+ string sql = $@"select HSendMan 鍥炲浜�, HDescription 鍥炲鍐呭, HDate 鍥炲鏃堕棿,
+ case HSendStatus
+ when 1 then '鏅��'
+ when 10 then '楠岃瘉閫氳繃'
+ when 9 then '缁撴'
+ end as 绫诲瀷
+ ,* from OA_WorkLinkBillSub where HInterID = '" + HInterID + "'order by HDate desc";
ds = oCN.RunProcReturn(sql, "OA_WorkLinkBillSub");
+
+ 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 e)
--
Gitblit v1.9.1