From 0c0a49144242879f97d1880caf0f8fe6c9afe950 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 27 三月 2026 17:07:46 +0800
Subject: [PATCH] 1.增加节拍工价导入(工艺路线版本、工序版本) 2.增加MES工单批量查找历史引用最新工艺信息接口MesOrderNewStepListContent
---
VueWebCoreApi/Tools/ExcelList.cs | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/VueWebCoreApi/Tools/ExcelList.cs b/VueWebCoreApi/Tools/ExcelList.cs
index b868a0b..53b438d 100644
--- a/VueWebCoreApi/Tools/ExcelList.cs
+++ b/VueWebCoreApi/Tools/ExcelList.cs
@@ -1,15 +1,19 @@
-锘縰sing System;
+锘縰sing Microsoft.AspNetCore.Http;
+using Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using VueWebCoreApi.Models;
namespace VueWebCoreApi.Tools
{
public class ExcelList
{
- public static List<ScoreReport> ExcelData()
+ public static List<ScoreReport> ExcelData(User us)
{
-
+ dynamic dynObj = JObject.Parse(us.mesSetting);
+ bool route = dynObj.route;
List<ScoreReport> list = new List<ScoreReport>
{
//new ScoreReport("0","缁勭粐鏋舵瀯"),
@@ -32,14 +36,24 @@
new ScoreReport("14","妯″叿淇濆吇椤圭洰"),
new ScoreReport("14_1","妯″叿淇濆吇鏍囧噯"),
new ScoreReport("15","宸ュ簭璁剧疆"),
- new ScoreReport("16","宸ヨ壓璺嚎"),
+ //new ScoreReport("16","宸ヨ壓璺嚎"),
//new ScoreReport("24","鑺傛媿宸ヤ环"),
new ScoreReport("17","璐ㄦ鏍囧噯"),
new ScoreReport("18","缂洪櫡瀹氫箟"),
- new ScoreReport("19","鐢熶骇璁㈠崟"),
- new ScoreReport("20","搴撳瓨鏌ヨ"),
- new ScoreReport("21","鐗╂枡娓呭崟"),
+ //new ScoreReport("19","鐢熶骇璁㈠崟"),
+ //new ScoreReport("20","搴撳瓨鏌ヨ"),
+ //new ScoreReport("21","鐗╂枡娓呭崟"),
};
+ //宸ヨ壓璺嚎鐗�
+ if (route)
+ {
+ list.Add(new ScoreReport("16", "宸ヨ壓璺嚎"));
+ list.Add(new ScoreReport("24", "鑺傛媿宸ヤ环(宸ヨ壓璺嚎鐗�)"));
+ }
+ else //宸ュ簭鐗�
+ {
+ list.Add(new ScoreReport("25", "鑺傛媿宸ヤ环(宸ュ簭鐗�)"));
+ }
return list;
}
}
--
Gitblit v1.9.3