From db5e488203b05d785baf1614b727afaf20a03fe6 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期五, 19 十二月 2025 18:52:05 +0800
Subject: [PATCH] llj备注
---
StandardInterface/MES.Service/service/QC/LljService.cs | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index b7a220c..f91c540 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -1,4 +1,4 @@
-锘縰sing System.Data;
+锘匡豢using System.Data;
using System.Xml;
using System.Linq;
using Masuit.Tools;
@@ -72,6 +72,8 @@
CreateDate = a.CreateDate,
FcovertQty = a.FcovertQty,
DEPARTMENTNAME = a.DEPARTMENTNAME,
+ FcheckBy = a.FcheckBy,
+ Modify1By = a.Modify1By,
FngDesc = a.FngDesc,
UrgentFlag = a.UrgentFlag,
Ftype = a.Ftype,
@@ -154,6 +156,8 @@
UrgentFlag = a.UrgentFlag,
Ftype = a.Ftype,
LotNo1 = a.LotNo1,
+ FcheckBy = a.FcheckBy,
+ Modify1By = a.Modify1By,
EMERGENCY = a.EMERGENCY,
Status = a.Status,
IqcDate = a.IqcDate,
@@ -578,6 +582,9 @@
// 鏍囧噯鍖朏TP鏈嶅姟鍣ㄥ湴鍧�
string normalizedServer = NormalizeFtpServer(ftpServer);
+ // 娓呯悊鏂囦欢鍚嶏細鍘婚櫎鎵�鏈夌┖鐧藉瓧绗︼紙鍖呮嫭涓嫳鏂囩┖鏍笺�佸埗琛ㄧ銆佸洖杞︽崲琛岀瓑锛�
+ fileName = System.Text.RegularExpressions.Regex.Replace(fileName, @"[\s\u3000\r\n]+", "");
+
// 鏋勫缓FTP鏂囦欢璺緞 - 鏉ユ枡妫�浣跨敤IQC鐩綍锛屼娇鐢╢version浣滀负瀛愮洰褰�
string ftpPath;
if (!string.IsNullOrEmpty(fversion))
@@ -670,8 +677,8 @@
normalizedServer += ":21"; // 榛樿FTP绔彛
}
- // 寮�鍙戠幆澧冧娇鐢ㄦ湰鍦版湇鍔″櫒
- normalizedServer = "ftp://192.168.1.22:21";
+ // 娉ㄩ噴鎺夊紑鍙戠幆澧冨己鍒惰鐩栵紝浣跨敤浼犲叆鐨勫疄闄匜TP鏈嶅姟鍣ㄥ湴鍧�
+ // normalizedServer = "ftp://192.168.1.22:21";
return normalizedServer;
}
@@ -1524,4 +1531,24 @@
return match.Success ? int.Parse(match.Groups[1].Value) : 0;
}
+
+ /// <summary>
+ /// 淇濆瓨澶囨敞鍒颁富琛�
+ /// </summary>
+ /// <param name="gid">涓昏〃ID</param>
+ /// <param name="releaseNo">妫�楠屽崟鍙�</param>
+ /// <param name="lotNo1">澶囨敞鍐呭</param>
+ /// <returns>褰卞搷琛屾暟</returns>
+ public int SaveLotNo1(decimal gid, string? releaseNo, string? lotNo1)
+ {
+ var db = SqlSugarHelper.GetInstance();
+ return db.Updateable<MesQaItemsDetect01>()
+ .SetColumns(it => new MesQaItemsDetect01
+ {
+ LotNo1 = lotNo1
+ })
+ .Where(it => it.Id == gid && it.ReleaseNo == releaseNo)
+ .ExecuteCommand();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3