From 5d2aa0cb0f40854a2d24a54d03d452987bc97484 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 26 二月 2026 16:40:54 +0800
Subject: [PATCH] 优化数采查询报表 增加了工艺参数子表保存
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 34 ----
WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs | 89 +++++++++---
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
WebAPI/WebAPI.csproj.user | 32 ++++
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WebAPI/Models/Gy_TechnologyParameterSub.cs | 16 ++
WebAPI/Controllers/SBGL/SBBB/Sb_EquipMentReportController.cs | 124 +++++++++++++++++
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 2
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 42 +++---
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
/dev/null | 0
WebAPI/Models/Gy_TechnologyParameter.cs | 28 ++++
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 33 ----
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
WebAPI/WebAPI.csproj | 10
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
20 files changed, 287 insertions(+), 123 deletions(-)
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index 0bfdebe..a7e7f70 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 24232e2..75e66e8 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index e855621..0000000
--- a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index e5091d4..4466b11 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,39 +1,5 @@
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-<<<<<<< HEAD
-E:\gz\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-E:\gz\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-E:\gz\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-=======
-<<<<<<< HEAD
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-=======
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
->>>>>>> 28e8091a515d24a9cf82251f383f055a2ab0cff9
->>>>>>> ed299767c89cd657b2a5373cb3546de9950382bd
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index 0bfdebe..a7e7f70 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 24232e2..75e66e8 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
deleted file mode 100644
index e5dc9b8..0000000
--- a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]
diff --git a/SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index a4655fe..0000000
--- a/SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
deleted file mode 100644
index bfb772c..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
deleted file mode 100644
index f1f78a9..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
deleted file mode 100644
index c0635b3..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.dll
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
deleted file mode 100644
index ca3eca3..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb
+++ /dev/null
Binary files differ
diff --git a/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs b/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs
index 63e4918..331008a 100644
--- a/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs
@@ -142,7 +142,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_TechnologyParameterList where HitemID=" + HInterID, "h_v_Gy_TechnologyParameterList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_TechnologyParameterEdit where HitemID=" + HInterID, "h_v_Gy_TechnologyParameterEdit");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -231,7 +231,7 @@
return objJsonResult;
}
- List<TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechnologyParameter>>(msg1);
+ List<Gy_TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_TechnologyParameter>>(msg1);
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
@@ -305,11 +305,25 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("Gy_TechnologyParameter_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
- List<TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<TechnologyParameter>>(msg2);
-
+ List<Gy_TechnologyParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_TechnologyParameter>>(msg2);
+ List<Gy_TechnologyParameterSub> list1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_TechnologyParameterSub>>(msg3
+ );
long HItemID = list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
@@ -328,15 +342,6 @@
long HUnitID = list[0].HUnitID;
long HClassID = list[0].HClassID;
- //鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_TechnologyParameter_Edit", 1, false, msg3))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -346,18 +351,8 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- //if (oDept.HavSameNumber(HItemID, HNumber))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- //淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
if (HItemID == 0)
{
@@ -394,7 +389,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触: 宸ヨ壓浠ｇ爜閲嶅!";
+ objJsonResult.Message = "淇濆瓨澶辫触: 宸ヨ壓鍙傛暟浠ｇ爜閲嶅!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -409,6 +404,35 @@
// Convert.ToString(HEndFlag ? 1 : 0); Convert.ToString(HStopflag ? 1 : 0);HUseFlag
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_TechnologyParameter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ // 鎵ц鏌ヨ鑾峰彇HItemID
+ DataSet temp_ds = oCN.RunProcReturn("select top 1 HItemID from Gy_TechnologyParameter where HNumber = N'" + HNumber + "'", "Gy_TechnologyParameter");
+
+ if (temp_ds.Tables[0].Rows.Count < 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜锛氭彃鍏ヤ富琛ㄦ暟鎹け璐�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ int itemID = int.Parse(temp_ds.Tables[0].Rows[0]["HItemID"].ToString());
+ string sql3 = "";
+
+ // 鏀逛负for寰幆锛孒EntryID浠�1寮�濮嬮�掑
+ for (int i = 0; i < list1.Count; i++)
+ {
+ // 鑾峰彇褰撳墠寰幆鐨勫疄浣撳璞�
+ Gy_TechnologyParameterSub listOne = list1[i];
+ int entryID = i + 1;
+
+ sql3 += "insert into Gy_TechnologyParameterSub(HInterID, HEntryID, HRemark,HEquipID,HTechParamAliasName) Values("
+ + itemID + "," + entryID + ",N'" + listOne.HRemark + "','" + listOne.HEquipID + "','" + listOne.HTechParamAliasName + "');";
+ }
+
+ oCN.RunProcReturn(sql3, "Gy_TechnologyParameterSub");
//淇濆瓨鍚庢帶鍒�=========================================
@@ -488,6 +512,23 @@
//灏嗕笂绾� 涓洪潪鏈骇
oCN.RunProc("Update Gy_TechnologyParameter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProcReturn("delete from Gy_TechnologyParameterSub where HInterID = " + HItemID, "Gy_TechnologyParameterSub");
+
+ string sql3 = "";
+
+ // 鏀逛负for寰幆锛孒EntryID浠�1寮�濮嬮�掑
+ for (int i = 0; i < list1.Count; i++)
+ {
+ // 鑾峰彇褰撳墠寰幆鐨勫疄浣撳璞�
+ Gy_TechnologyParameterSub listOne = list1[i];
+ int entryID = i + 1;
+
+ sql3 += "insert into Gy_TechnologyParameterSub(HInterID, HEntryID, HRemark,HEquipID,HTechParamAliasName) Values("
+ + HItemID + "," + entryID + ",N'" + listOne.HRemark + "','" + listOne.HEquipID + "','" + listOne.HTechParamAliasName + "');";
+ }
+
+ oCN.RunProcReturn(sql3, "Gy_TechnologyParameterSub");
+
//淇濆瓨鍚庢帶鍒�=========================================
string sql2 = "exec h_p_Gy_TechnologyParameter_AfterSaveCtrl " + HMakeEmp + ",'" + 2 + "'";
ds = oCN.RunProcReturn(sql2, "h_p_Gy_TechnologyParameter_AfterSaveCtrl");
diff --git a/WebAPI/Controllers/SBGL/SBBB/Sb_EquipMentCollectionTechParamController.cs b/WebAPI/Controllers/SBGL/SBBB/Sb_EquipMentCollectionTechParamController.cs
deleted file mode 100644
index f0c0f13..0000000
--- a/WebAPI/Controllers/SBGL/SBBB/Sb_EquipMentCollectionTechParamController.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-锘縰sing Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Pub_Class;
-using SyntacticSugar.constant;
-using SyntacticSugar.enums;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web.Http;
-using WebAPI.DLL.SBGL.SBBB;
-using WebAPI.Models;
-using WebAPI.Models.SBGL.SBBB;
-
-namespace WebAPI.Controllers.SBGL.SBBB
-{
- public class Sb_EquipMentCollectionTechParamController : ApiController
- {
- //鑾峰彇绯荤粺鍙傛暟
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-
- /// <summary>
- /// 鑾峰彇鍒楄〃
- /// </summary>
- /// <param name="sWhere"></param>
- /// <param name="user"></param>
- /// <returns></returns>
- [HttpGet]
- [Route("EquipMentCollection/list")]
- public json list(string sWhere, string user)
- {
- json res = new json();
- try
- {
- string sql = "select * from h_v_Sb_EquipMentCollectionTechParamList where 1 = 1" + sWhere;
- DataSet ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMentCollectionTechParamList");
-
- //鏁版嵁閬嶅巻, 鑾峰彇鍒楀悕
- List<object> columnNameList = new List<object>();
- 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鍒楀璞＄殑鍒楀悕
- }
-
- //杩斿洖缁撴灉
- res.code = CodeConstant.SUCCEED;
- res.count = CountConstant.SUCCEED;
- res.Message = "鏌ヨ鎴愬姛";
- res.data = ds.Tables["h_v_Sb_EquipMentCollectionTechParamList"];
- res.list = columnNameList;
- return res;
- }
- catch (Exception e)
- {
- res.code = CodeConstant.FAIL;
- res.count = CountConstant.FAIL;
- res.Message = e.Message;
- res.data = null;
- return res;
- }
- }
-
- /// <summary>
- /// 淇濆瓨
- /// </summary>
- /// <param name="eMCollection"></param>
- /// <param name="user"></param>
- /// <returns></returns>
- [HttpPost]
- [Route("EquipMentCollection/save")]
- public json SaveSb_EquipMentCollectionTechParam([FromBody] JObject oMain)
- {
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
- //涓昏〃鍙嶅簭鍒楀寲
- msg2 = "[" + msg2.ToString() + "]";
-
- //瀵硅薄杞寲
- List<Sb_EquipMentCollectionTechParam> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Sb_EquipMentCollectionTechParam>>(msg2);
- Sb_EquipMentCollectionTechParam eMColllection = list[0];
- json res = new json();
- try
- {
- //if (!ClsPub.Security_Log(msg5, (int)SecurityEnum.JUDGE_AND_WRITE, false, msg4))
- //{
- // res.code = CodeConstant.FAIL;
- // res.count = CountConstant.FAIL;
- // res.Message = "鏃犱繚瀛樻潈闄愶紒";
- // return res;
- //}
-
- if (!DBUtility.ClsPub.AllowNumber(eMColllection.HSourceCode))
- {
- res.code = CodeConstant.FAIL;
- res.count = CountConstant.FAIL;
- res.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
- return res;
- }
- Sb_EquipMentCollectionTechParam_Ctl collectionTechParam_Ctl =
- new Sb_EquipMentCollectionTechParam_Ctl(oCN, eMColllection);
- //鏁版嵁搴撴柊澧�
- collectionTechParam_Ctl.AddNew();
-
- res.code = CodeConstant.SUCCEED;
- res.count = CountConstant.SUCCEED;
- res.Message = "鏂板鎴愬姛";
- return res;
- }catch (Exception e)
- {
- res.code = CodeConstant.FAIL;
- res.count = CountConstant.FAIL;
- res.Message = e.Message;
- return res;
- }
- }
-
- /// <summary>
- /// 鑾峰彇鏈�澶у熀纭�璧勬枡ID
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("EquipMentCollection/GetMAXBillID")]
- [HttpGet]
- public object GetMAXBillID()
- {
- json res = new json();
- try
- {
- DataSet ds = oCN.RunProcReturn("select isnull(max(HItemID), 0)+1 HItemID from Sb_EquipMentCollectionTechParam", "Sb_EquipMentCollectionTechParam");
-
- res.code = CodeConstant.SUCCEED;
- res.count = CountConstant.SUCCEED;
- res.Message = "";
- res.data = ds.Tables[0];
- return res;
- }
- catch (Exception e)
- {
- res.code = CodeConstant.FAIL;
- res.count = CountConstant.FAIL;
- res.Message = "Exception锛�" + e.ToString();
- res.data = null;
- return res;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SBGL/SBBB/Sb_EquipMentCollectionTechParam_TempController.cs b/WebAPI/Controllers/SBGL/SBBB/Sb_EquipMentCollectionTechParam_TempController.cs
deleted file mode 100644
index f08d474..0000000
--- a/WebAPI/Controllers/SBGL/SBBB/Sb_EquipMentCollectionTechParam_TempController.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-锘縰sing Model;
-using Newtonsoft.Json;
-using SyntacticSugar.constant;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web.Http;
-using WebAPI.Models;
-using WebAPI.Models.SBGL.SBBB;
-
-namespace WebAPI.Controllers.SBGL.SBBB
-{
- public class Sb_EquipMentCollectionTechParam_TempController : ApiController
- {
- //鑾峰彇绯荤粺鍙傛暟
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- //鏁版嵁瀵硅薄鍒涘缓
- Sb_EquipMentCollectionTechParam_Temp CollectionTechParam_Temp;
-
-
- /// <summary>
- /// 鑾峰彇鍒楄〃
- /// </summary>
- /// <param name="sWhere"></param>
- /// <param name="user"></param>
- /// <returns></returns>
- [HttpGet]
- [Route("EquipMentCollectionTemp/list")]
- public json list(string sWhere, string user)
- {
- json res = new json();
- try
- {
- string sql = "select * from h_v_Sb_EquipMentCollectionTechParam_TempList where 1 = 1" + sWhere;
- DataSet ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMentCollectionTechParam_TempList");
-
-
-
- //鏁版嵁閬嶅巻, 鑾峰彇鍒楀悕
- List<object> columnNameList = new List<object>();
- 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鍒楀璞＄殑鍒楀悕
- }
-
- //杩斿洖缁撴灉
- res.code = CodeConstant.SUCCEED;
- res.count = CountConstant.SUCCEED;
- res.Message = "鏌ヨ鎴愬姛";
- res.data = ds.Tables["h_v_Sb_EquipMentCollectionTechParam_TempList"];
- res.list = columnNameList;
- return res;
- }
- catch (Exception e)
- {
- res.code = CodeConstant.FAIL;
- res.count = CountConstant.FAIL;
- res.Message = e.Message;
- res.data = null;
- return res;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SBGL/SBBB/Sb_EquipMentReportController.cs b/WebAPI/Controllers/SBGL/SBBB/Sb_EquipMentReportController.cs
new file mode 100644
index 0000000..caf98f1
--- /dev/null
+++ b/WebAPI/Controllers/SBGL/SBBB/Sb_EquipMentReportController.cs
@@ -0,0 +1,124 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using RestSharp;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Web;
+using System.Web.Http;
+using System.Windows.Forms;
+using WebAPI.Models;
+using WebAPI.Service;
+using System.Text.RegularExpressions;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using SyntacticSugar.constant;
+
+namespace WebAPI.Controllers.SBGL
+{
+ public class Sb_EquipMentReportController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+
+ #region 璁惧宸ヨ壓鍙傛暟鏁伴噰涓存椂琛ㄥ垎椤垫煡璇�
+ [Route("Sb_EquipMentReport/Sb_EquipMentCollectionTechParam_Temp_Page")]
+ [HttpGet]
+ public object Sb_EquipMentCollectionTechParam_Temp_Page(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipMentCollectionTechParam_TempList " + page + "," + size + ",''", "h_p_Sb_EquipMentCollectionTechParam_TempList");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipMentCollectionTechParam_TempList " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipMentCollectionTechParam_TempList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
+ #region 璁惧宸ヨ壓鍙傛暟鏁伴噰琛ㄥ垎椤垫煡璇�
+ [Route("Sb_EquipMentReport/Sb_EquipMentCollectionTechParam_Page")]
+ [HttpGet]
+ public object Sb_EquipMentCollectionTechParam_Page(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipMentCollectionTechParamList " + page + "," + size + ",''", "h_p_Sb_EquipMentCollectionTechParamList");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipMentCollectionTechParamList " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipMentCollectionTechParamList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
+ }
+}
diff --git a/WebAPI/DLL/SBGL/SBBB/Sb_EquipMentCollectionTechParam_Ctl.cs b/WebAPI/DLL/SBGL/SBBB/Sb_EquipMentCollectionTechParam_Ctl.cs
deleted file mode 100644
index 08cb8c1..0000000
--- a/WebAPI/DLL/SBGL/SBBB/Sb_EquipMentCollectionTechParam_Ctl.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-锘縰sing SQLHelper;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Web;
-using System.Web.Http;
-using WebAPI.Models.SBGL.SBBB;
-
-namespace WebAPI.DLL.SBGL.SBBB
-{
- public class Sb_EquipMentCollectionTechParam_Ctl: DBUtility.ClsGy_Base_Ctl
- {
- //鏁版嵁搴�
- SQLHelper.ClsCN oCn;
- //鏁版嵁瀵硅薄鍒涘缓
- private Sb_EquipMentCollectionTechParam oModel;
-
- /// <summary>
- /// 鏂板
- /// </summary>
- /// <returns></returns>
- public override bool AddNew()
- {
- //寮�鍚簨鍔�
- oCn.BeginTran();
-
- try
- {
- //璋冪敤SQL
- oCn.RunProc("insert into " + MvarItemKey +
- "(HDate, HSourceCode, HTechParamID, HTechParamName, HCount" +
- ", HCreateTime, HResult, HProcNumber, HFlag)" +
- "values('" + DateTime.Now + "','" + oModel.HSourceCode + "'," + oModel.HTechParamID + ",'" +
- oModel.HTechParamName + "'," + oModel.HCount + ",'" + DateTime.Now + "','" + oModel.HResult +
- "','" + oModel.HProcNumber + "','" + Convert.ToString(oModel.HFlag ? 1 : 0) + "')"
- , ref DBUtility.ClsPub.sExeReturnInfo);
-
- //鎻愪氦浜嬪姟
- oCn.Commit();
- return true;
- }
- catch (Exception e)
- {
- //鍥炴粴浜嬪姟
- oCn.RollBack();
- throw(e);
- }
-
- }
-
- /// <summary>
- /// 缂栬緫
- /// </summary>
- /// <param name="sItemID"></param>
- /// <returns></returns>
- public override bool ModifyByID(long sItemID)
- {
- try
- {
- //寮�鍚簨鍔�
- oCn.BeginTran();
-
- //璋冪敤SQL
- oCn.RunProc("Update " + MvarItemKey + "set " +
- " HDate = '" + oModel.HDate + "' , " + "HSourceCode = '" + oModel.HSourceCode +
- "'," + " HTechParamID = " + oModel.HTechParamID + "," +
- " HTechParamName = '" + oModel.HTechParamName + "'," + " HCount = " + oModel.HCount +
- "," + " HCreateTime = '" + oModel.HCreateTime + "'," + " HResult = '" + oModel.HResult +
- "',"+ "HProcNumber = '" + oModel.HProcNumber + "'," + "HFlag = " + Convert.ToString(oModel.HFlag ? 1 : 0) +
- "where HItemID = " + sItemID
- , ref DBUtility.ClsPub.sExeReturnInfo);
-
- //鎻愪氦浜嬪姟
- oCn.Commit();
- return true;
- }
- catch (Exception e)
- {
- //鍥炴粴浜嬪姟
- oCn.RollBack();
- throw(e);
- }
- }
-
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- /// <param name="oCn"></param>
- /// <param name="oModel"></param>
- public Sb_EquipMentCollectionTechParam_Ctl(ClsCN oCn, Sb_EquipMentCollectionTechParam oModel)
- {
- this.oCn = new SQLHelper.ClsCN();
- MvarItemKey = "Sb_EquipMentCollectionTechParam";
- MvarReportTitle = "璁惧宸ヨ壓鍙傛暟鏁伴噰琛�";
- this.oModel = oModel;
- }
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_TechnologyParameter.cs b/WebAPI/Models/Gy_TechnologyParameter.cs
new file mode 100644
index 0000000..c57e7f3
--- /dev/null
+++ b/WebAPI/Models/Gy_TechnologyParameter.cs
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_TechnologyParameter
+ {
+ public long HItemID { get; set; }
+ public string HNumber { get; set; }
+ public string HName { get; set; }
+ public string HShortNumber { get; set; }
+ public long HParentID { get; set; }
+ public long HLevel { get; set; }
+ public string HEndFlag { get; set; }
+ public string HStopflag { get; set; }
+ public string HRemark { get; set; }
+ public string HHelpCode { get; set; }
+ public string HUseFlag { get; set; }
+ public DateTime HMakeTime { get; set; }
+ public string HMakeEmp { get; set; }
+ public long HUSEORGID { get; set; }
+ public long HCREATEORGID { get; set; }
+ public long HUnitID { get; set; }
+
+ public long HClassID { get; set; }
+
+ }
+}
diff --git a/WebAPI/Models/Gy_TechnologyParameterSub.cs b/WebAPI/Models/Gy_TechnologyParameterSub.cs
new file mode 100644
index 0000000..0586a82
--- /dev/null
+++ b/WebAPI/Models/Gy_TechnologyParameterSub.cs
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_TechnologyParameterSub
+ {
+ public long HInterID { get; set; }
+ public long HEntryID { get; set; }
+ public string HRemark { get; set; }
+ public long HEquipID { get; set; }
+ public string HTechParamAliasName { get; set; }
+
+
+ }
+}
diff --git a/WebAPI/Models/SBGL/SBBB/Sb_EquipMentCollectionTechParam.cs b/WebAPI/Models/SBGL/SBBB/Sb_EquipMentCollectionTechParam.cs
deleted file mode 100644
index 4d1b3c5..0000000
--- a/WebAPI/Models/SBGL/SBBB/Sb_EquipMentCollectionTechParam.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace WebAPI.Models.SBGL.SBBB
-{
- public class Sb_EquipMentCollectionTechParam
- {
-
- public int HItemID { get; set; } // int --鑷鍒�
- public DateTime HDate { get; set; } // datetime --鏃ユ湡
- public string HSourceCode {get; set;} // varchar(50) --璁惧缂栫爜
-
- public int HTechParamID { get; set; } //int --宸ヨ壓鍙傛暟
- public string HTechParamName { get; set; } // varchar(50) --宸ヨ壓鍙傛暟鍚嶇О(纭欢閲屽彇杩囨潵鐨勫師濮嬪悕瀛�)
- public decimal HCount { get; set; } // dec(18,2) --鏁伴噺
- public DateTime HCreateTime { get; set; } // datetime --鏈�鏂版椂闂寸偣
- public string HResult { get; set; } // varchar(50) --宸ヨ壓鍙傛暟鍊�
- public string HProcNumber { get; set; } // varchar(50) --宸ュ簭
- public bool HFlag { get; set; } // bit --鍚屾鏍囪
-
- public static implicit operator Sb_EquipMentCollectionTechParam(Supplier v)
- {
- throw new NotImplementedException();
- }
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Models/SBGL/SBBB/Sb_EquipMentCollectionTechParam_Temp.cs b/WebAPI/Models/SBGL/SBBB/Sb_EquipMentCollectionTechParam_Temp.cs
deleted file mode 100644
index 1a337fb..0000000
--- a/WebAPI/Models/SBGL/SBBB/Sb_EquipMentCollectionTechParam_Temp.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace WebAPI.Models.SBGL.SBBB
-{
- public class Sb_EquipMentCollectionTechParam_Temp
- {
-
- public int HItemID { get; set; } // int --鑷鍒�
- public DateTime HDate { get; set; } // datetime --鏃ユ湡
- public string HSourceCode {get; set;} // varchar(50) --璁惧缂栫爜
-
- public int HTechParamID { get; set; } //int --宸ヨ壓鍙傛暟
- public string HTechParamName { get; set; } // varchar(50) --宸ヨ壓鍙傛暟鍚嶇О(纭欢閲屽彇杩囨潵鐨勫師濮嬪悕瀛�)
- public decimal HCount { get; set; } // dec(18,2) --鏁伴噺
- public DateTime HCreateTime { get; set; } // datetime --鏈�鏂版椂闂寸偣
- public string HResult { get; set; } // varchar(50) --宸ヨ壓鍙傛暟鍊�
- public string HProcNumber { get; set; } // varchar(50) --宸ュ簭
- public bool HFlag { get; set; } // bit --鍚屾鏍囪
-
- public static implicit operator Sb_EquipMentCollectionTechParam_Temp(Supplier v)
- {
- throw new NotImplementedException();
- }
- }
-}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index a150195..e798b64 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</_PublishTargetUrl>
- <History>True|2026-02-05T02:30:49.1692643Z;True|2026-02-05T10:08:23.6660406+08:00;False|2026-02-05T10:07:57.8963750+08:00;True|2026-02-05T09:48:58.5537239+08:00;True|2026-02-05T09:10:07.5363558+08:00;True|2026-02-05T08:46:56.2351000+08:00;False|2026-02-05T08:46:29.8267281+08:00;True|2026-02-04T18:26:12.1351312+08:00;False|2026-02-04T18:25:27.5993698+08:00;True|2026-02-02T15:29:42.9297406+08:00;False|2026-02-02T15:28:58.7223213+08:00;True|2026-01-27T09:41:11.9598463+08:00;True|2026-01-12T15:19:54.3717206+08:00;False|2026-01-12T15:17:17.3729576+08:00;True|2026-01-12T15:06:21.0862309+08:00;True|2026-01-12T15:05:12.9275744+08:00;True|2026-01-12T15:03:27.8176237+08:00;True|2026-01-12T14:49:27.5738671+08:00;True|2026-01-12T13:53:19.5855449+08:00;True|2026-01-12T13:38:48.5630901+08:00;True|2026-01-12T13:36:16.7827480+08:00;True|2026-01-12T13:11:13.0574812+08:00;True|2026-01-12T12:15:59.9874160+08:00;True|2026-01-12T11:28:11.2732011+08:00;True|2026-01-12T11:25:38.1085721+08:00;True|2026-01-12T11:20:56.4151816+08:00;True|2026-01-12T11:16:18.6890378+08:00;True|2026-01-12T10:21:18.4936159+08:00;True|2026-01-12T10:19:04.5140921+08:00;True|2026-01-12T10:12:29.5361934+08:00;True|2026-01-12T10:09:15.1808283+08:00;True|2026-01-12T10:06:57.1995205+08:00;True|2026-01-12T10:04:01.9541129+08:00;True|2026-01-12T10:00:35.3087230+08:00;True|2026-01-12T09:57:09.4993139+08:00;True|2026-01-12T09:56:03.1835848+08:00;True|2026-01-12T09:53:04.7564007+08:00;True|2026-01-12T09:51:52.2255672+08:00;True|2026-01-12T09:50:55.6467900+08:00;True|2026-01-12T09:48:40.7809221+08:00;True|2026-01-12T09:46:56.6322007+08:00;True|2026-01-12T09:45:02.7727778+08:00;True|2026-01-12T09:40:42.3093709+08:00;True|2026-01-12T09:37:57.6481305+08:00;True|2026-01-12T09:33:52.0030071+08:00;True|2026-01-12T09:28:28.3115742+08:00;True|2026-01-12T09:26:09.4986237+08:00;True|2026-01-12T09:15:22.9709305+08:00;True|2026-01-12T09:04:33.6006835+08:00;True|2026-01-12T09:02:26.0031140+08:00;True|2026-01-12T08:47:30.6112157+08:00;True|2026-01-12T08:39:51.8354905+08:00;False|2026-01-12T08:39:28.1520514+08:00;True|2026-01-09T12:19:00.1945481+08:00;True|2026-01-09T12:17:02.3797220+08:00;True|2026-01-09T12:15:15.5895935+08:00;True|2026-01-09T11:54:06.3559015+08:00;True|2026-01-09T11:46:20.0827712+08:00;True|2026-01-09T11:41:46.9419488+08:00;True|2026-01-09T11:31:33.9371218+08:00;True|2026-01-09T11:27:04.3293331+08:00;False|2026-01-09T11:26:35.7648277+08:00;True|2026-01-08T13:12:36.7702662+08:00;False|2026-01-08T13:12:15.5632570+08:00;True|2026-01-05T15:38:15.4194341+08:00;</History>
+ <History>False|2026-02-26T02:23:25.0017879Z;True|2026-02-05T10:30:49.1692643+08:00;True|2026-02-05T10:08:23.6660406+08:00;False|2026-02-05T10:07:57.8963750+08:00;True|2026-02-05T09:48:58.5537239+08:00;True|2026-02-05T09:10:07.5363558+08:00;True|2026-02-05T08:46:56.2351000+08:00;False|2026-02-05T08:46:29.8267281+08:00;True|2026-02-04T18:26:12.1351312+08:00;False|2026-02-04T18:25:27.5993698+08:00;True|2026-02-02T15:29:42.9297406+08:00;False|2026-02-02T15:28:58.7223213+08:00;True|2026-01-27T09:41:11.9598463+08:00;True|2026-01-12T15:19:54.3717206+08:00;False|2026-01-12T15:17:17.3729576+08:00;True|2026-01-12T15:06:21.0862309+08:00;True|2026-01-12T15:05:12.9275744+08:00;True|2026-01-12T15:03:27.8176237+08:00;True|2026-01-12T14:49:27.5738671+08:00;True|2026-01-12T13:53:19.5855449+08:00;True|2026-01-12T13:38:48.5630901+08:00;True|2026-01-12T13:36:16.7827480+08:00;True|2026-01-12T13:11:13.0574812+08:00;True|2026-01-12T12:15:59.9874160+08:00;True|2026-01-12T11:28:11.2732011+08:00;True|2026-01-12T11:25:38.1085721+08:00;True|2026-01-12T11:20:56.4151816+08:00;True|2026-01-12T11:16:18.6890378+08:00;True|2026-01-12T10:21:18.4936159+08:00;True|2026-01-12T10:19:04.5140921+08:00;True|2026-01-12T10:12:29.5361934+08:00;True|2026-01-12T10:09:15.1808283+08:00;True|2026-01-12T10:06:57.1995205+08:00;True|2026-01-12T10:04:01.9541129+08:00;True|2026-01-12T10:00:35.3087230+08:00;True|2026-01-12T09:57:09.4993139+08:00;True|2026-01-12T09:56:03.1835848+08:00;True|2026-01-12T09:53:04.7564007+08:00;True|2026-01-12T09:51:52.2255672+08:00;True|2026-01-12T09:50:55.6467900+08:00;True|2026-01-12T09:48:40.7809221+08:00;True|2026-01-12T09:46:56.6322007+08:00;True|2026-01-12T09:45:02.7727778+08:00;True|2026-01-12T09:40:42.3093709+08:00;True|2026-01-12T09:37:57.6481305+08:00;True|2026-01-12T09:33:52.0030071+08:00;True|2026-01-12T09:28:28.3115742+08:00;True|2026-01-12T09:26:09.4986237+08:00;True|2026-01-12T09:15:22.9709305+08:00;True|2026-01-12T09:04:33.6006835+08:00;True|2026-01-12T09:02:26.0031140+08:00;True|2026-01-12T08:47:30.6112157+08:00;True|2026-01-12T08:39:51.8354905+08:00;False|2026-01-12T08:39:28.1520514+08:00;True|2026-01-09T12:19:00.1945481+08:00;True|2026-01-09T12:17:02.3797220+08:00;True|2026-01-09T12:15:15.5895935+08:00;True|2026-01-09T11:54:06.3559015+08:00;True|2026-01-09T11:46:20.0827712+08:00;True|2026-01-09T11:41:46.9419488+08:00;True|2026-01-09T11:31:33.9371218+08:00;True|2026-01-09T11:27:04.3293331+08:00;False|2026-01-09T11:26:35.7648277+08:00;True|2026-01-08T13:12:36.7702662+08:00;False|2026-01-08T13:12:15.5632570+08:00;True|2026-01-05T15:38:15.4194341+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index 2fff280..75f259b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2026-02-03T03:56:14.3086755Z;True|2026-02-03T11:51:19.6091315+08:00;True|2026-02-03T10:42:35.4774950+08:00;False|2026-02-03T10:40:57.1735351+08:00;True|2026-02-03T09:30:22.5235073+08:00;False|2026-02-03T09:27:21.6917147+08:00;True|2026-02-02T15:31:07.3762944+08:00;True|2026-02-02T14:13:20.5690146+08:00;True|2026-02-02T10:42:22.4804584+08:00;False|2026-02-02T10:41:48.7402434+08:00;True|2026-02-01T17:40:21.0538069+08:00;True|2026-02-01T15:44:12.2393909+08:00;False|2026-02-01T15:40:37.6456544+08:00;True|2026-01-31T12:05:50.6946479+08:00;False|2026-01-31T12:04:44.5273342+08:00;True|2026-01-29T17:14:07.3795568+08:00;True|2026-01-29T17:11:48.4286289+08:00;True|2026-01-29T16:10:42.7141082+08:00;True|2026-01-29T14:41:38.0583611+08:00;True|2026-01-29T14:36:18.1975177+08:00;True|2026-01-29T14:34:43.7423264+08:00;True|2026-01-29T14:09:16.2701844+08:00;True|2026-01-29T13:17:37.0708838+08:00;True|2026-01-29T10:21:51.3074443+08:00;False|2026-01-29T10:20:12.1418198+08:00;True|2026-01-28T13:52:59.2210650+08:00;True|2026-01-28T10:34:06.8152564+08:00;False|2026-01-28T10:32:51.4478083+08:00;True|2026-01-27T12:19:58.2090999+08:00;True|2026-01-27T12:18:40.9255150+08:00;True|2026-01-27T12:10:45.0784359+08:00;True|2026-01-27T11:45:58.2218602+08:00;True|2026-01-27T08:54:11.2473398+08:00;False|2026-01-27T08:50:52.3900508+08:00;True|2026-01-25T16:51:10.8469862+08:00;True|2026-01-25T16:15:55.3063785+08:00;False|2026-01-25T16:13:47.1609576+08:00;False|2026-01-25T16:10:27.3797138+08:00;True|2026-01-22T19:26:11.1120981+08:00;False|2026-01-22T19:21:59.7591077+08:00;True|2026-01-21T20:10:38.2264542+08:00;True|2026-01-21T20:05:52.6769930+08:00;False|2026-01-21T20:04:52.2864808+08:00;True|2026-01-20T10:09:22.6558754+08:00;True|2026-01-20T09:43:16.9535139+08:00;False|2026-01-20T09:40:14.5080297+08:00;True|2026-01-19T17:23:36.9963060+08:00;True|2026-01-19T17:18:41.7602029+08:00;True|2026-01-19T17:05:35.1663057+08:00;True|2026-01-19T16:49:48.9497194+08:00;True|2026-01-19T12:35:09.4063486+08:00;False|2026-01-19T12:33:25.3260660+08:00;True|2026-01-17T20:21:42.3497625+08:00;True|2026-01-17T20:17:40.8631870+08:00;True|2026-01-17T20:13:16.6618986+08:00;False|2026-01-17T20:10:39.7099356+08:00;False|2026-01-17T20:10:01.5198461+08:00;False|2026-01-17T20:09:07.5632818+08:00;True|2026-01-17T20:06:07.7085249+08:00;True|2026-01-17T17:50:38.6295526+08:00;False|2026-01-17T17:48:59.9531552+08:00;True|2026-01-16T16:22:22.3525933+08:00;True|2026-01-16T14:14:39.4187185+08:00;False|2026-01-16T14:10:47.6350779+08:00;True|2026-01-15T17:33:04.8867687+08:00;True|2026-01-15T17:13:07.4827420+08:00;False|2026-01-15T17:11:32.8298249+08:00;True|2026-01-15T16:34:04.8984638+08:00;True|2026-01-15T14:12:39.3677563+08:00;False|2026-01-15T14:10:25.0842475+08:00;True|2026-01-14T19:47:01.2486856+08:00;False|2026-01-14T19:46:15.5380497+08:00;True|2026-01-14T15:49:22.6528911+08:00;True|2026-01-14T10:24:06.5942562+08:00;False|2026-01-14T10:22:32.4884475+08:00;False|2026-01-12T09:27:01.9297704+08:00;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
+ <History>True|2026-02-26T08:30:22.6331887Z;True|2026-02-26T15:56:54.4778359+08:00;False|2026-02-26T15:55:53.2808802+08:00;False|2026-02-26T15:55:27.7501008+08:00;True|2026-02-26T12:42:10.3734658+08:00;True|2026-02-26T12:01:13.4363491+08:00;True|2026-02-26T10:24:02.2555254+08:00;True|2026-02-03T11:56:14.3086755+08:00;True|2026-02-03T11:51:19.6091315+08:00;True|2026-02-03T10:42:35.4774950+08:00;False|2026-02-03T10:40:57.1735351+08:00;True|2026-02-03T09:30:22.5235073+08:00;False|2026-02-03T09:27:21.6917147+08:00;True|2026-02-02T15:31:07.3762944+08:00;True|2026-02-02T14:13:20.5690146+08:00;True|2026-02-02T10:42:22.4804584+08:00;False|2026-02-02T10:41:48.7402434+08:00;True|2026-02-01T17:40:21.0538069+08:00;True|2026-02-01T15:44:12.2393909+08:00;False|2026-02-01T15:40:37.6456544+08:00;True|2026-01-31T12:05:50.6946479+08:00;False|2026-01-31T12:04:44.5273342+08:00;True|2026-01-29T17:14:07.3795568+08:00;True|2026-01-29T17:11:48.4286289+08:00;True|2026-01-29T16:10:42.7141082+08:00;True|2026-01-29T14:41:38.0583611+08:00;True|2026-01-29T14:36:18.1975177+08:00;True|2026-01-29T14:34:43.7423264+08:00;True|2026-01-29T14:09:16.2701844+08:00;True|2026-01-29T13:17:37.0708838+08:00;True|2026-01-29T10:21:51.3074443+08:00;False|2026-01-29T10:20:12.1418198+08:00;True|2026-01-28T13:52:59.2210650+08:00;True|2026-01-28T10:34:06.8152564+08:00;False|2026-01-28T10:32:51.4478083+08:00;True|2026-01-27T12:19:58.2090999+08:00;True|2026-01-27T12:18:40.9255150+08:00;True|2026-01-27T12:10:45.0784359+08:00;True|2026-01-27T11:45:58.2218602+08:00;True|2026-01-27T08:54:11.2473398+08:00;False|2026-01-27T08:50:52.3900508+08:00;True|2026-01-25T16:51:10.8469862+08:00;True|2026-01-25T16:15:55.3063785+08:00;False|2026-01-25T16:13:47.1609576+08:00;False|2026-01-25T16:10:27.3797138+08:00;True|2026-01-22T19:26:11.1120981+08:00;False|2026-01-22T19:21:59.7591077+08:00;True|2026-01-21T20:10:38.2264542+08:00;True|2026-01-21T20:05:52.6769930+08:00;False|2026-01-21T20:04:52.2864808+08:00;True|2026-01-20T10:09:22.6558754+08:00;True|2026-01-20T09:43:16.9535139+08:00;False|2026-01-20T09:40:14.5080297+08:00;True|2026-01-19T17:23:36.9963060+08:00;True|2026-01-19T17:18:41.7602029+08:00;True|2026-01-19T17:05:35.1663057+08:00;True|2026-01-19T16:49:48.9497194+08:00;True|2026-01-19T12:35:09.4063486+08:00;False|2026-01-19T12:33:25.3260660+08:00;True|2026-01-17T20:21:42.3497625+08:00;True|2026-01-17T20:17:40.8631870+08:00;True|2026-01-17T20:13:16.6618986+08:00;False|2026-01-17T20:10:39.7099356+08:00;False|2026-01-17T20:10:01.5198461+08:00;False|2026-01-17T20:09:07.5632818+08:00;True|2026-01-17T20:06:07.7085249+08:00;True|2026-01-17T17:50:38.6295526+08:00;False|2026-01-17T17:48:59.9531552+08:00;True|2026-01-16T16:22:22.3525933+08:00;True|2026-01-16T14:14:39.4187185+08:00;False|2026-01-16T14:10:47.6350779+08:00;True|2026-01-15T17:33:04.8867687+08:00;True|2026-01-15T17:13:07.4827420+08:00;False|2026-01-15T17:11:32.8298249+08:00;True|2026-01-15T16:34:04.8984638+08:00;True|2026-01-15T14:12:39.3677563+08:00;False|2026-01-15T14:10:25.0842475+08:00;True|2026-01-14T19:47:01.2486856+08:00;False|2026-01-14T19:46:15.5380497+08:00;True|2026-01-14T15:49:22.6528911+08:00;True|2026-01-14T10:24:06.5942562+08:00;False|2026-01-14T10:22:32.4884475+08:00;False|2026-01-12T09:27:01.9297704+08:00;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/29/2026 10:21:35</publishTime>
+ <publishTime>02/26/2026 16:29:38</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/29/2026 10:21:35</publishTime>
+ <publishTime>02/26/2026 16:29:38</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/29/2026 10:21:27</publishTime>
+ <publishTime>02/26/2026 16:29:24</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/29/2026 10:21:27</publishTime>
+ <publishTime>02/26/2026 16:29:24</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/27/2026 08:51:58</publishTime>
+ <publishTime>02/26/2026 16:28:56</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>01/27/2026 08:51:58</publishTime>
+ <publishTime>02/26/2026 16:28:56</publishTime>
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
@@ -138,10 +138,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>01/29/2026 10:21:02</publishTime>
+ <publishTime>02/26/2026 16:29:06</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>01/29/2026 10:21:02</publishTime>
+ <publishTime>02/26/2026 16:29:06</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/23/2025 10:00:25</publishTime>
@@ -177,34 +177,34 @@
<publishTime>11/13/2012 20:19:34</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>01/27/2026 08:51:47</publishTime>
+ <publishTime>02/26/2026 16:28:33</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>01/27/2026 08:51:47</publishTime>
+ <publishTime>02/26/2026 16:28:33</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/27/2026 08:51:52</publishTime>
+ <publishTime>02/26/2026 16:28:44</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>01/27/2026 08:51:52</publishTime>
+ <publishTime>02/26/2026 16:28:44</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/27/2026 08:51:54</publishTime>
+ <publishTime>02/26/2026 16:28:46</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>01/27/2026 08:51:54</publishTime>
+ <publishTime>02/26/2026 16:28:46</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>01/22/2026 19:32:24</publishTime>
+ <publishTime>02/26/2026 16:00:04</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>01/22/2026 19:32:24</publishTime>
+ <publishTime>02/26/2026 16:00:04</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -315,19 +315,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>01/27/2026 13:10:15</publishTime>
+ <publishTime>02/26/2026 16:00:22</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>01/27/2026 13:10:15</publishTime>
+ <publishTime>02/26/2026 16:00:22</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>02/03/2026 11:58:20</publishTime>
+ <publishTime>02/26/2026 16:30:14</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/03/2026 11:58:20</publishTime>
+ <publishTime>02/26/2026 16:30:14</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>07/01/2025 16:53:56</publishTime>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index fcd18d8..7c0e43c 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -497,6 +497,7 @@
<Compile Include="Controllers\MJGL\Sc_MouldMoveStockRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Gy_MaterialPackingRelationController.cs" />
<Compile Include="Controllers\QC_InStockCheckBillController.cs" />
+ <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentReportController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
@@ -512,8 +513,6 @@
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
<Compile Include="Controllers\Xt_DefineBillMainSetController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldBatchWorkCheckBillController.cs" />
- <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" />
- <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParam_TempController.cs" />
<Compile Include="Controllers\SCGL\Sc_ProductionReportsController.cs" />
<Compile Include="Controllers\XSGL\Xs_OutDoorBillController.cs" />
<Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectBasisController.cs" />
@@ -937,7 +936,6 @@
<Compile Include="DLL\ClsSc_PHPCruxBillBill.cs" />
<Compile Include="DLL\ClsSc_ProcessPlan.cs" />
<Compile Include="DLL\ClsWW_PPBomBill.cs" />
- <Compile Include="DLL\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Ctl.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsGy_GroupEmpBill.cs" />
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_WorkTimesBill.cs" />
@@ -976,9 +974,8 @@
<Compile Include="Models\Gy_MouldFileSub_SubMater.cs" />
<Compile Include="Models\Gy_RoutingBillSub_WorkQty.cs" />
<Compile Include="Models\ClsQC_CheckNote_PNL_Temp.cs" />
+ <Compile Include="Models\Gy_TechnologyParameterSub.cs" />
<Compile Include="Models\QC_OutCompCheckBillSub_ValueGrid.cs" />
- <Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Temp.cs" />
- <Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam.cs" />
<Compile Include="Models\Sc_StationOutBillSub_Sup.cs" />
<Compile Include="Models\Gy_MateNumRelation_Sec.cs" />
<Compile Include="Models\ClsQC_RequestCheckBillMain.cs" />
@@ -1022,7 +1019,7 @@
<Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
<Compile Include="Models\SOPBill.cs" />
<Compile Include="Models\SOPBillSub.cs" />
- <Compile Include="Models\TechnologyParameter.cs" />
+ <Compile Include="Models\Gy_TechnologyParameter.cs" />
<Compile Include="Models\TechnologyParameterUnit.cs" />
<Compile Include="Models\TechParamByProc.cs" />
<Compile Include="Models\WorkCenter.cs" />
@@ -1295,6 +1292,7 @@
<Folder Include="App_Data\" />
<Folder Include="bin\" />
<Folder Include="Controllers\椤圭洰绠＄悊\鍩虹寤烘ā\" />
+ <Folder Include="DLL\SBGL\SBBB\" />
<Folder Include="obj\x86\Debug\" />
<Folder Include="Views\CB_WipProcessTable\" />
<Folder Include="Views\Cg_ContractTransportBillList\" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index d5afd02..2d7475b 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -9,8 +9,32 @@
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<UseGlobalApplicationHostFile />
- <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
- <ProjectView>ShowAllFiles</ProjectView>
+ <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
+ <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
- <ProjectExtensions />
+ <ProjectExtensions>
+ <VisualStudio>
+ <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+ <WebProjectProperties>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
+ <AspNetDebugging>True</AspNetDebugging>
+ <SilverlightDebugging>False</SilverlightDebugging>
+ <NativeDebugging>False</NativeDebugging>
+ <SQLDebugging>False</SQLDebugging>
+ <ExternalProgram>
+ </ExternalProgram>
+ <StartExternalURL>
+ </StartExternalURL>
+ <StartCmdLineArguments>
+ </StartCmdLineArguments>
+ <StartWorkingDirectory>
+ </StartWorkingDirectory>
+ <EnableENC>True</EnableENC>
+ <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+ </WebProjectProperties>
+ </FlavorProperties>
+ </VisualStudio>
+ </ProjectExtensions>
</Project>
\ No newline at end of file
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index d9d9721..0cf6575 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index f1639c3..b6e2ca4 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 08cee06..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index 28f3ed5..054e86e 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index b7784ab..9b65839 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,39 +1,6 @@
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-<<<<<<< HEAD
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-E:\gz\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-=======
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
->>>>>>> ed299767c89cd657b2a5373cb3546de9950382bd
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index d9d9721..0cf6575 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index f1639c3..b6e2ca4 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/sdk_dingding/TopSdk/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index c0445f3..0000000
--- a/sdk_dingding/TopSdk/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
deleted file mode 100644
index 5e34493..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 0312216..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
deleted file mode 100644
index c6ae541..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
deleted file mode 100644
index ac36d6d..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
deleted file mode 100644
index ee52663..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1