From 88a1ab54409ebf39c0bfa269aa7d513a7ac9219e Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期一, 14 四月 2025 14:17:04 +0800
Subject: [PATCH] 111
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs | 14
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MES.Service/Modes/QcIssueResult/UpdateMesQaItems .cs | 8
MESApplication/Controllers/ZuHeRequestOrder/ZuHeRequestOrderController.cs | 84 +++++
MES.Service/service/ZuHeRequestOrder/ZuHeRequestOrderManager.cs | 164 ++++++++++
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/Modes/SentLaboratory/GetLaboratoryDetails.cs | 6
MES.Service/Modes/SentLaboratory/UpdateMesQmsSample.cs | 10
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MES.Service/Modes/SentLaboratory/UpdateMesQmsSamplePjt.cs | 61 ++++
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/Dto/webApi/ZuHeRequestOrder/ZuHeRequestsOrder.cs | 21 +
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/ZuHeRequestOrder/ZuHeRequestOrders.cs | 25 +
MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs | 26 +
MESApplication/bin/Debug/net8.0/MESApplication.xml | 14
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs | 462 ++++++++++++++++++++++++++++--
32 files changed, 853 insertions(+), 44 deletions(-)
diff --git a/MES.Service/Dto/webApi/ZuHeRequestOrder/ZuHeRequestsOrder.cs b/MES.Service/Dto/webApi/ZuHeRequestOrder/ZuHeRequestsOrder.cs
new file mode 100644
index 0000000..836c850
--- /dev/null
+++ b/MES.Service/Dto/webApi/ZuHeRequestOrder/ZuHeRequestsOrder.cs
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MES.Service.Dto.webApi.ZuHeRequestOrder
+{
+ public class ZuHeRequestsOrder
+ {
+
+ public List<ComboSingleItem> ComboSingle { get; set; }
+
+ }
+
+ public class ComboSingleItem
+ {
+ public string RELEASE_NO { get; set; }
+ }
+
+}
diff --git a/MES.Service/Modes/QcIssueResult/UpdateMesQaItems .cs b/MES.Service/Modes/QcIssueResult/UpdateMesQaItems .cs
index da1d433..d9880f6 100644
--- a/MES.Service/Modes/QcIssueResult/UpdateMesQaItems .cs
+++ b/MES.Service/Modes/QcIssueResult/UpdateMesQaItems .cs
@@ -25,4 +25,12 @@
[SugarColumn(ColumnName = "FMRMODE")]
public string? FMRMODE { get; set; }
+ //閫佽揣鍗曞彿
+ [SugarColumn(ColumnName = "IS_SJ")]
+ public decimal? ISSJ { get; set; }
+
+ //閫佽揣鍗曞彿
+ [SugarColumn(ColumnName = "SJ_NO")]
+ public string? SJ_NO { get; set; }
+
}
diff --git a/MES.Service/Modes/SentLaboratory/GetLaboratoryDetails.cs b/MES.Service/Modes/SentLaboratory/GetLaboratoryDetails.cs
index 8034d6b..1621ee7 100644
--- a/MES.Service/Modes/SentLaboratory/GetLaboratoryDetails.cs
+++ b/MES.Service/Modes/SentLaboratory/GetLaboratoryDetails.cs
@@ -24,6 +24,10 @@
public string? ITEM_NO { get; set; }
public string? DEPARTMENTCODE { get; set; }
public string? JYDH { get; set; }
-
+ public string? buttonStatu { get; set; }
+ public decimal? IS_SUBMIT { get; set; }
+ public string? ZH_BS { get; set; }
+ public decimal? ITEM_ID { get; set; }
+ public string? SUPP_NAME { get; set; }
}
diff --git a/MES.Service/Modes/SentLaboratory/UpdateMesQmsSample.cs b/MES.Service/Modes/SentLaboratory/UpdateMesQmsSample.cs
index 2f0ec86..1b4786f 100644
--- a/MES.Service/Modes/SentLaboratory/UpdateMesQmsSample.cs
+++ b/MES.Service/Modes/SentLaboratory/UpdateMesQmsSample.cs
@@ -3,7 +3,7 @@
namespace MES.Service.Modes.SentLaboratory;
-//寮備骇鍝佹娴嬪崟琛�
+//浜у搧妫�娴嬪崟琛�
[SugarTable("MES_QMS_SAMPLE")]
public class UpdateMesQmsSample
{
@@ -143,4 +143,12 @@
[SugarColumn(ColumnName = "JYDH")]
public string? JYDH { get; set; }
+ //閫佹鐘舵��
+ [SugarColumn(ColumnName = "IS_SUBMIT")]
+ public decimal? IsSubmit { get; set; }
+
+ //缁勫悎鏍囪瘑
+ [SugarColumn(ColumnName = "ZH_BS")]
+ public string? ZHBS { get; set; }
+
}
diff --git a/MES.Service/Modes/SentLaboratory/UpdateMesQmsSamplePjt.cs b/MES.Service/Modes/SentLaboratory/UpdateMesQmsSamplePjt.cs
new file mode 100644
index 0000000..472149f
--- /dev/null
+++ b/MES.Service/Modes/SentLaboratory/UpdateMesQmsSamplePjt.cs
@@ -0,0 +1,61 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MES.Service.Modes.SentLaboratory;
+
+//浜у搧妫�娴嬪崟----椤圭洰淇℃伅琛�
+[SugarTable("MES_QMS_SAMPLE_PJT")]
+public class UpdateMesQmsSamplePjt
+{
+ //SEQ_QMS_EQ_CHECK
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_QMS_EQ_CHECK")]
+ public decimal Id { get; set; }
+
+ //涓昏〃ID
+ [SugarColumn(ColumnName = "PID")]
+ public decimal? PID { get; set; }
+
+ //閫佹鍗曞彿
+ [SugarColumn(ColumnName = "SJ_NO")]
+ public string? SJ_NO { get; set; }
+
+ //妫�楠屽崟鍙�
+ [SugarColumn(ColumnName = "RELEASE_NO")]
+ public string? RELEASE_NO { get; set; }
+
+ //鐗╂枡缂栫爜
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string? ITEM_NO { get; set; }
+
+ //鏍锋湰鏁伴噺
+ [SugarColumn(ColumnName = "QUANTITY")]
+ public string? QUANTITY { get; set; }
+
+ //鎬ユ枡鏍囪瘑
+ [SugarColumn(ColumnName = "URGENT_FLAG")]
+ public decimal? URGENT_FLAG { get; set; }
+
+ //鍒涘缓浜�
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string? CREATE_BY { get; set; }
+
+ //鍒涘缓鏃堕棿
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CREATE_DATE { get; set; }
+
+ //鐗╂枡鍐呯爜
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ITEM_ID { get; set; }
+
+ //渚涘簲鍟嗗悕绉�
+ [SugarColumn(ColumnName = "SUPP_NAME")]
+ public string? SUPP_NAME { get; set; }
+
+ //娴嬭瘯鍒ゅ畾缁撴灉
+ [SugarColumn(ColumnName = "DECISION_OUTCOMES")]
+ public string? DECISION_OUTCOMES { get; set; }
+}
diff --git a/MES.Service/Modes/ZuHeRequestOrder/ZuHeRequestOrders.cs b/MES.Service/Modes/ZuHeRequestOrder/ZuHeRequestOrders.cs
new file mode 100644
index 0000000..37ff8cc
--- /dev/null
+++ b/MES.Service/Modes/ZuHeRequestOrder/ZuHeRequestOrders.cs
@@ -0,0 +1,25 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MES.Service.Modes.ZuHeRequestOrder;
+
+[SugarTable("MES_QA_ITEMS_DETECT_01")]
+public class ZuHeRequestOrders
+{
+
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_QM_ID",
+ IsPrimaryKey = true)]
+ public decimal Id { get; set; }
+ //妫�楠屽崟鍙�
+ [SugarColumn(ColumnName = "RELEASE_NO")]
+ public string? ReleaseNo { get; set; }
+
+ //妫�楠屽崟鍙�
+ [SugarColumn(ColumnName = "ZH_BS")]
+ public string? ZH_BS { get; set; }
+
+}
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 802d0ac..783483a 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index f02e19f..1dea739 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index b68a334..e4184f4 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index 6995d48..5a92c8f 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs b/MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs
index b548b57..5f9df44 100644
--- a/MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs
+++ b/MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs
@@ -1,4 +1,5 @@
锘縰sing MES.Service.DB;
+using MES.Service.Dto.webApi.QcIssueResult;
using MES.Service.Modes.QcIssueResult;
using MES.Service.Modes.SentLaboratory;
using Newtonsoft.Json;
@@ -7,6 +8,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
+using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
@@ -14,6 +16,219 @@
public class SaveLaboratoryManager:Repository<UpdateMesQmsSample>
{
+
+ public class ResultObject
+ {
+ public string? SjReleaseNo { get; set; }
+ public decimal? IS_SJ { get; set; }
+ public string? DEPARTMENTNAME { get; set; }
+ public string? DEPARTMENTCODE { get; set; }
+ public DateTime? CREATE_DATE { get; set; }
+ public DateTime? CompleteDate { get; set; }
+ public string? REMARKS { get; set; }
+ public string? SIM_REQ { get; set; }
+ //纾侀搧鎷夊姏
+ public decimal? Check01 { get; set; }
+
+ //纾侀搧鎵块噸
+ public decimal? Check02 { get; set; }
+
+ //鐩愰浘
+
+ public decimal? Check03 { get; set; }
+
+ //IP
+ public decimal? Check04 { get; set; }
+
+ //鑰佸寲娴嬭瘯
+ public decimal? Check05 { get; set; }
+
+ //浼犲杈愬皠
+ public decimal? Check06 { get; set; }
+
+ public decimal? Check07 { get; set; }
+
+ //鐢电嚎鎷夊姏
+ public decimal? Check08 { get; set; }
+
+ //鎺ュ彛鎻掓嫈
+ public decimal? Check09 { get; set; }
+
+ //鍏夎氨娴嬭瘯
+ public decimal? Check10 { get; set; }
+
+ //ROHS
+ public decimal? Check11 { get; set; }
+
+ //鐢垫睜鍏呮斁鐢�
+ public decimal? Check12 { get; set; }
+
+ //楂樻俯
+ public decimal? Check13 { get; set; }
+
+ //浣庢俯
+ public decimal? Check14 { get; set; }
+
+ //IK
+ public decimal? Check15 { get; set; }
+
+ //娓╁崌娴嬭瘯
+ public decimal? Check16 { get; set; }
+
+ //瀵垮懡
+ public decimal? Check17 { get; set; }
+
+ //鍏跺畠
+ public decimal? Check18 { get; set; }
+
+ //鍏跺畠鐨勫唴瀹�
+ public string? Line04 { get; set; }
+ public List<AllItem>? allItem { get; set; }
+ }
+
+ public class AllItem
+ {
+ public decimal? Pid { get; set; }
+ public string? sj_no { get; set; }
+ public string? release_no { get; set; }
+ public decimal? ITEM_ID { get; set; }
+ public string? ITEM_NO { get; set; }
+ public string? QUANTITY { get; set; }
+ public decimal? URGENT_FLAG { get; set; }
+ public DateTime? CREATE_DATE { get; set; }
+ public string? SUPP_NAME { get; set; }
+ public string? DECISION_OUTCOMES { get; set; }
+
+ }
+
+ public ResultObject GetListAll(string RELEASE_NO)
+ {
+ // 鍋囪浣犳湁涓�涓暟鎹簱涓婁笅鏂囨垨鏁版嵁璁块棶灞�
+ // 杩欓噷鐢ㄦā鎷熸暟鎹唬鏇垮疄闄呮暟鎹簱鏌ヨ
+ var mainTable = GetMainTableData(RELEASE_NO);
+ var subTable = GetSubTableData(RELEASE_NO);
+
+ // 鍒涘缓杩斿洖瀵硅薄
+ var result = new ResultObject
+ {
+
+ SjReleaseNo = mainTable.ReleaseNo,
+ IS_SJ = mainTable.IsSubmit,
+ DEPARTMENTNAME = mainTable.DEPARTMENTNAME,
+ DEPARTMENTCODE=mainTable.DEPARTMENTCODE,
+ REMARKS = mainTable.REMARKS,
+ SIM_REQ = mainTable.SimReq,
+ Check01 = mainTable.Check01,
+ Check02 = mainTable.Check02,
+ Check03 = mainTable.Check03,
+ Check04 = mainTable.Check04,
+ Check05 = mainTable.Check05,
+ Check06 = mainTable.Check06,
+ Check07 = mainTable.Check07,
+ Check08 = mainTable.Check08,
+ Check09 = mainTable.Check09,
+ Check10 = mainTable.Check10,
+ Check11 = mainTable.Check11,
+ Check12 = mainTable.Check12,
+ Check13 = mainTable.Check13,
+ Check14 = mainTable.Check14,
+ Check15 = mainTable.Check15,
+ Check16 = mainTable.Check16,
+ Check17 = mainTable.Check17,
+ Check18 = mainTable.Check18,
+ Line04 = mainTable.Line04,
+ allItem = subTable.Select(item => new AllItem
+ {
+ Pid=item.PID,
+ sj_no = item.SJ_NO,
+ CREATE_DATE = item.CREATE_DATE,
+ ITEM_ID = item.ITEM_ID,
+ release_no=item.RELEASE_NO,
+ ITEM_NO = item.ITEM_NO,
+ SUPP_NAME = item.SUPP_NAME,
+ QUANTITY=item.QUANTITY,
+ URGENT_FLAG=item.URGENT_FLAG,
+ DECISION_OUTCOMES=item.DECISION_OUTCOMES,
+
+ }).ToList()
+ };
+
+ return result;
+ }
+
+ // 妯℃嫙涓昏〃鏁版嵁鏌ヨ
+ private UpdateMesQmsSample GetMainTableData(string RELEASE_NO)
+ {
+ var db = SqlSugarHelper.GetInstance();
+
+ var map = db.Queryable<UpdateMesQmsSample>()
+ .Where(t => t.ReleaseNo == RELEASE_NO)
+ .First();
+
+
+ // 杩欓噷搴旇鏄疄闄呯殑鏁版嵁搴撴煡璇㈤�昏緫
+ // 渚嬪锛歳eturn db.MainTable.FirstOrDefault(m => m.RELEASE_NO == RELEASE_NO);
+ return new UpdateMesQmsSample
+ {
+ ReleaseNo = map.ReleaseNo,
+ DEPARTMENTNAME = map.DEPARTMENTNAME,
+ CreateDate = map.CreateDate,
+ QUANTITY = map.QUANTITY,
+ CompleteDate = map.CompleteDate,
+ TestReq = map.TestReq,
+ SimReq = map.SimReq,
+ ItemNo = map.ItemNo,
+ UrgentFlag = map.UrgentFlag,
+ JYDH = map.JYDH,
+ REMARKS = map.REMARKS,
+ ItemName = map.ItemName,
+ DEPARTMENTCODE = map.DEPARTMENTCODE,
+ PAPERBILLNO = map.PAPERBILLNO,
+ IsSubmit = map.IsSubmit,
+ ZHBS = map.ZHBS,
+ Check01 = map.Check01,
+ Check02 = map.Check02,
+ Check03 = map.Check03,
+ Check04 = map.Check04,
+ Check05 = map.Check05,
+ Check06 = map.Check06,
+ Check07 = map.Check07,
+ Check08 = map.Check08,
+ Check09 = map.Check09,
+ Check10 = map.Check10,
+ Check11 = map.Check11,
+ Check12 = map.Check12,
+ Check13 = map.Check13,
+ Check14 = map.Check14,
+ Check15 = map.Check15,
+ Check16 = map.Check16,
+ Check17 = map.Check17,
+ Check18 = map.Check18,
+ Line04=map.Line04
+
+ };
+ }
+
+ // 妯℃嫙瀛愯〃鏁版嵁鏌ヨ
+ private List<UpdateMesQmsSamplePjt> GetSubTableData(string RELEASE_NO)
+ {
+ var db = SqlSugarHelper.GetInstance();
+
+ var mapping = db.Queryable<UpdateMesQmsSamplePjt>()
+ .Where(t => t.SJ_NO == RELEASE_NO)
+ .ToList();
+
+ // 濡傛灉鏌ヨ缁撴灉涓虹┖锛岃繑鍥炵┖鍒楄〃
+ if (mapping == null || mapping.Count == 0)
+ {
+ return new List<UpdateMesQmsSamplePjt>();
+ }
+
+ // 杩斿洖鏌ヨ缁撴灉
+ return mapping;
+
+ }
+
public dynamic Save(GetLaboratoryDetails getLaboratoryDetails)
{
@@ -21,12 +236,17 @@
return UseTransaction(db =>
{
- return SaveOrUpdateData(db, mesUpdateMesQmsSample) ? 1 : 0;
+ return SaveOrUpdateData(db, mesUpdateMesQmsSample,getLaboratoryDetails) ? 1 : 0;
}) > 0;
}
public UpdateMesQmsSample GetMesQcIssueResults(GetLaboratoryDetails getLaboratoryDetails)
{
+
+ if (getLaboratoryDetails.URGENT_FLAG == null) {
+ getLaboratoryDetails.URGENT_FLAG = 0;
+ }
+
var mesUpdateMesQmsSample = new UpdateMesQmsSample
{
ReleaseNo = getLaboratoryDetails.RELEASE_NO,
@@ -43,8 +263,29 @@
ItemName = getLaboratoryDetails.ITEM_NAME,
DEPARTMENTCODE = getLaboratoryDetails.DEPARTMENTCODE,
PAPERBILLNO = getLaboratoryDetails.LOT_NO,
+ IsSubmit = getLaboratoryDetails.IS_SUBMIT,
+ ZHBS = getLaboratoryDetails.ZH_BS
};
+
+ mesUpdateMesQmsSample.Check01 = 0;
+ mesUpdateMesQmsSample.Check02 = 0;
+ mesUpdateMesQmsSample.Check03 = 0;
+ mesUpdateMesQmsSample.Check04 = 0;
+ mesUpdateMesQmsSample.Check05 = 0;
+ mesUpdateMesQmsSample.Check06 = 0;
+ mesUpdateMesQmsSample.Check07 = 0;
+ mesUpdateMesQmsSample.Check08 = 0;
+ mesUpdateMesQmsSample.Check09 = 0;
+ mesUpdateMesQmsSample.Check10 = 0;
+ mesUpdateMesQmsSample.Check11 = 0;
+ mesUpdateMesQmsSample.Check12 = 0;
+ mesUpdateMesQmsSample.Check13 = 0;
+ mesUpdateMesQmsSample.Check14 = 0;
+ mesUpdateMesQmsSample.Check15 = 0;
+ mesUpdateMesQmsSample.Check16 = 0;
+ mesUpdateMesQmsSample.Check17 = 0;
+ mesUpdateMesQmsSample.Check18 = 0;
// 閬嶅巻 CHECKBOX 骞惰祴鍊�
foreach (var item in getLaboratoryDetails.CHECKBOX)
@@ -117,41 +358,161 @@
/**
* 鎻掑叆鏁版嵁搴撹〃
*/
- private bool SaveOrUpdateData(SqlSugarScope db, UpdateMesQmsSample updateMesQmsSample)
+ private bool SaveOrUpdateData(SqlSugarScope db, UpdateMesQmsSample updateMesQmsSample, GetLaboratoryDetails getLaboratoryDetails)
{
- ////// 鏌ヨ QcIssueResults 琛ㄤ腑鏄惁瀛樺湪鍖归厤鐨勮褰�
- ////var mapping = db.Queryable<UpdateMesQmsSample>()
- //// .Where(t => t.ReleaseNo == updateMesQmsSample.ReleaseNo)
- //// .Select(t => new QcIssueResults
- //// {
- //// ReleaseNo = t.ReleaseNo,
- //// })
- //// .ToList();
+ // 鏌ヨ MES_QMS_SAMPLE 琛ㄤ腑鏄惁瀛樺湪鍖归厤鐨勮褰�
+ var existingRecord = db.Queryable<UpdateMesQmsSample>()
+ .Where(t => t.ReleaseNo == updateMesQmsSample.ReleaseNo)
+ .First(); // 浣跨敤 First 鑾峰彇绗竴鏉¤褰�
+
+ if (existingRecord != null)
+ {
+ Debug.WriteLine("hhhhhhhhh!");
+ // 鏇存柊 UpdateMesQaItems 琛ㄤ腑鐨勫瓧娈�
+ updateMesQmsSample.Id = existingRecord.Id;
- //// 鏌ヨ UpdateMesQmsSample 琛ㄤ腑鏄惁瀛樺湪鍖归厤鐨勮褰�
- //var existingRecord = db.Queryable<UpdateMesQmsSample>()
- // .Where(t => t.ReleaseNo == updateMesQmsSample.ReleaseNo)
- // .First(); // 浣跨敤 First 鑾峰彇绗竴鏉¤褰�
+ // 鎵ц鏇存柊鎿嶄綔
+ var updateResult = db.Updateable(updateMesQmsSample).ExecuteCommand();
- //if (existingRecord != null)
- //{
- // // 鏇存柊 UpdateMesQaItems 琛ㄤ腑鐨勫瓧娈�
- // updateMesQmsSample.Id = existingRecord.Id;
+ var mapping = db.Queryable<UpdateMesQmsSamplePjt>()
+ .Where(t => t.RELEASE_NO == updateMesQmsSample.JYDH && t.SJ_NO == updateMesQmsSample.ReleaseNo)
+ .Select(t => new UpdateMesQmsSamplePjt
+ {
+ PID=t.PID
+ })
+ .ToList();
+ if (mapping.Any())
+ {
+ updateResult = db.Updateable<UpdateMesQmsSamplePjt>()
+ .SetColumns(t => new UpdateMesQmsSamplePjt
+ {
+ SJ_NO = updateMesQmsSample.ReleaseNo,
+ RELEASE_NO = updateMesQmsSample.JYDH,
+ ITEM_NO = updateMesQmsSample.ItemNo,
+ QUANTITY = updateMesQmsSample.QUANTITY,
+ URGENT_FLAG = updateMesQmsSample.UrgentFlag,
+ CREATE_DATE = System.DateTime.Now,
+ ITEM_ID = getLaboratoryDetails.ITEM_ID,
+ SUPP_NAME = getLaboratoryDetails.SUPP_NAME
+ })
+ .Where(t => t.PID == updateMesQmsSample.Id) // 鏄惧紡鎸囧畾鏇存柊鏉′欢
+ .ExecuteCommand();
+
+ }
+ else
+ {
+ Debug.WriteLine("hhhhhhhhaddadah!");
+ var mesUpdateMesQmsSamplePjt = new UpdateMesQmsSamplePjt
+ {
- // // 鎵ц鏇存柊鎿嶄綔
- // var updateResult = db.Updateable(updateMesQmsSample).ExecuteCommand();
- // return updateResult > 0; // 濡傛灉鏇存柊鎴愬姛锛岃繑鍥� true
-
- //}
- //else
- //{
- // Debug.WriteLine("鎻掑叆");
- // 濡傛灉 mapping 涓虹┖锛屾彃鍏ユ柊璁板綍鍒� QcIssueResults 琛�
+ PID = updateMesQmsSample.Id,
+ SJ_NO = updateMesQmsSample.ReleaseNo,
+ RELEASE_NO = updateMesQmsSample.JYDH,
+ ITEM_NO = updateMesQmsSample.ItemNo,
+ QUANTITY = updateMesQmsSample.QUANTITY,
+ URGENT_FLAG = updateMesQmsSample.UrgentFlag,
+ CREATE_DATE = System.DateTime.Now,
+ ITEM_ID = getLaboratoryDetails.ITEM_ID,
+ SUPP_NAME = getLaboratoryDetails.SUPP_NAME
+
+ };
+
+ updateResult = db.Insertable(mesUpdateMesQmsSamplePjt).ExecuteCommand();
+
+ }
+
+
+ var maping = db.Queryable<UpdateMesQaItems>()
+ .Where(t => t.ReleaseNo == updateMesQmsSample.JYDH)
+ .Select(t => new UpdateMesQaItems
+ {
+ ISSJ = t.ISSJ,
+ SJ_NO = t.SJ_NO
+ })
+ .ToList();
+
+ if (maping.Any())
+ {
+ updateResult = db.Updateable<UpdateMesQaItems>()
+ .SetColumns(t => new UpdateMesQaItems
+ {
+ ISSJ = updateMesQmsSample.IsSubmit,
+ SJ_NO = updateMesQmsSample.ReleaseNo
+ })
+ .Where(t => t.ReleaseNo == updateMesQmsSample.JYDH) // 鏄惧紡鎸囧畾鏇存柊鏉′欢
+ .ExecuteCommand();
+ }
+ else
+ {
+ throw new NotImplementedException("鏈壘鍒板搴旀潵鏂欐楠岀敵璇峰崟");
+ }
+
+ return updateResult > 0; // 濡傛灉鏇存柊鎴愬姛锛岃繑鍥� true
+
+ }
+ else
+ {
+ //Debug.WriteLine("鎻掑叆");
+ //濡傛灉 mapping 涓虹┖锛屾彃鍏ユ柊璁板綍鍒� QcIssueResults 琛�
var orUpdate = base.Insert(updateMesQmsSample);
- if (orUpdate) return true;
- throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
- //}
+
+ var insertedId = 0;
+
+ if (orUpdate)
+ {
+ // 浣跨敤 RELEASE_NO 鏌ヨ鍒氬垰鎻掑叆鐨勮褰曠殑 id
+ insertedId =(int) db.Queryable<UpdateMesQmsSample>()
+ .Where(it => it.ReleaseNo == updateMesQmsSample.ReleaseNo)
+ .Select(it => it.Id)
+ .Single(); // 濡傛灉 RELEASE_NO 鏄敮涓�瀛楁锛屽彲浠ヤ娇鐢� Single()
+ };
+
+ var mesUpdateMesQmsSamplePjt = new UpdateMesQmsSamplePjt
+ {
+
+ PID= insertedId,
+ SJ_NO= updateMesQmsSample.ReleaseNo,
+ RELEASE_NO= updateMesQmsSample.JYDH,
+ ITEM_NO= updateMesQmsSample.ItemNo,
+ QUANTITY= updateMesQmsSample.QUANTITY,
+ URGENT_FLAG= updateMesQmsSample.UrgentFlag,
+ CREATE_DATE = System.DateTime.Now,
+ ITEM_ID= getLaboratoryDetails.ITEM_ID,
+ SUPP_NAME=getLaboratoryDetails.SUPP_NAME
+
+ };
+
+ var updateResult = db.Insertable(mesUpdateMesQmsSamplePjt).ExecuteCommand();
+
+ var mapping = db.Queryable<UpdateMesQaItems>()
+ .Where(t => t.ReleaseNo == updateMesQmsSample.JYDH)
+ .Select(t => new UpdateMesQaItems
+ {
+ ISSJ = t.ISSJ,
+ SJ_NO= t.SJ_NO
+ })
+ .ToList();
+
+ if (mapping.Any())
+ {
+ updateResult = db.Updateable<UpdateMesQaItems>()
+ .SetColumns(t => new UpdateMesQaItems
+ {
+ ISSJ= updateMesQmsSample.IsSubmit,
+ SJ_NO = updateMesQmsSample.ReleaseNo
+ })
+ .Where(t => t.ReleaseNo == updateMesQmsSample.JYDH) // 鏄惧紡鎸囧畾鏇存柊鏉′欢
+ .ExecuteCommand();
+ }
+ else
+ {
+ throw new NotImplementedException("鏈壘鍒板搴旀潵鏂欐楠岀敵璇峰崟");
+ }
+
+ if (orUpdate) return true;
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ }
}
@@ -161,24 +522,51 @@
{
var db = SqlSugarHelper.GetInstance();
// 鍋囪 db 鏄� SQLSugar 鐨� SqlSugarClient 瀹炰緥
- var result = db.Deleteable<UpdateMesQmsSample>()
- .Where(t => t.JYDH == JYDH) // 鏍规嵁 JYDH 鍒犻櫎
- .ExecuteCommand();
+ var result = db.Updateable<UpdateMesQmsSample>()
+ .SetColumns(t => new UpdateMesQmsSample
+ {
+ IsSubmit = 2,
+ })
+ .Where(t => t.JYDH == JYDH) // 鏄惧紡鎸囧畾鏇存柊鏉′欢
+ .ExecuteCommand();
Debug.WriteLine(result);
+ var mapping = db.Queryable<UpdateMesQaItems>()
+ .Where(t => t.ReleaseNo ==JYDH)
+ .Select(t => new UpdateMesQaItems
+ {
+ ISSJ = t.ISSJ,
+ })
+ .ToList();
- if (result > 0)
+ if (mapping.Any())
{
- return "鍒犻櫎鎴愬姛锛�";
+ var updateResult = db.Updateable<UpdateMesQaItems>()
+ .SetColumns(t => new UpdateMesQaItems
+ {
+ ISSJ = 2,
+ SJ_NO=null
+ })
+ .Where(t => t.ReleaseNo == JYDH) // 鏄惧紡鎸囧畾鏇存柊鏉′欢
+ .ExecuteCommand();
}
else
{
- return "鏈壘鍒板尮閰嶇殑璁板綍锛屽垹闄ゅけ璐ャ��";
+ throw new NotImplementedException("鏈壘鍒板搴旀潵鏂欐楠岀敵璇峰崟");
+ }
+
+ if (result > 0)
+ {
+ return "鎾ゅ洖鎴愬姛锛�";
+ }
+ else
+ {
+ return "鏈壘鍒板尮閰嶇殑璁板綍锛屾挙鍥炲け璐ャ��";
}
}
catch (Exception ex)
{
- return "鍒犻櫎澶辫触锛岄敊璇俊鎭細" + ex.Message;
+ return "鎾ゅ洖澶辫触锛岄敊璇俊鎭細" + ex.Message;
}
}
diff --git a/MES.Service/service/ZuHeRequestOrder/ZuHeRequestOrderManager.cs b/MES.Service/service/ZuHeRequestOrder/ZuHeRequestOrderManager.cs
new file mode 100644
index 0000000..b6925d8
--- /dev/null
+++ b/MES.Service/service/ZuHeRequestOrder/ZuHeRequestOrderManager.cs
@@ -0,0 +1,164 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Dto.webApi.QcIssueResult;
+using MES.Service.Dto.webApi.ZuHeRequestOrder;
+using MES.Service.Modes.QcIssueResult;
+using MES.Service.Modes.ZuHeRequestOrder;
+using Newtonsoft.Json;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MES.Service.service.ZuHeRequestOrder;
+
+public class ZuHeRequestOrderManager : Repository<ZuHeRequestOrders>
+{
+ /**
+ * 缁勫悎鏉ユ枡妫�楠岀敵璇峰崟
+ */
+ public dynamic SaveZHBS(ZuHeRequestsOrder zuHeRequestsOrder )
+ {
+
+ var mesZuHeRequestsOrder = GetMesQcIssueResults(zuHeRequestsOrder);
+
+ return UseTransaction(db =>
+ {
+ return SaveOrUpdateData(db, mesZuHeRequestsOrder) ? 1 : 0;
+ }) > 0;
+ }
+
+ public ZuHeRequestOrders GetMesQcIssueResults(ZuHeRequestsOrder zuHeRequestsOrder)
+ {
+ // 浠� ComboSingle 涓彁鍙栨墍鏈� RELEASE_NO
+ var releaseNoList = zuHeRequestsOrder.ComboSingle.Select(item => item.RELEASE_NO).ToList();
+
+ var mesQcIssueResults = new ZuHeRequestOrders
+ {
+ ReleaseNo = string.Join(",", releaseNoList) // 灏嗘墍鏈� RELEASE_NO 鎷兼帴鎴愪竴涓瓧绗︿覆
+ };
+
+ return mesQcIssueResults;
+ }
+
+ /**
+ * 瑙ｉ櫎鏉ユ枡妫�楠岀敵璇峰崟缁勫悎
+ */
+ public dynamic deleateZHBS(ZuHeRequestsOrder zuHeRequestsOrder)
+ {
+
+ var mesZuHeRequestsOrder = GetMesQcIssueResults(zuHeRequestsOrder);
+
+ return UseTransaction(db =>
+ {
+ return ReleaseData(db, mesZuHeRequestsOrder) ? 1 : 0;
+ }) > 0;
+ }
+
+ /**
+ * 鏇存柊鏁版嵁搴撹〃杩涜缁勫悎
+ */
+ private bool SaveOrUpdateData(SqlSugarScope db, ZuHeRequestOrders zuHeRequestOrders )
+ {
+
+ try
+ {
+ // 浠� ReleaseNo 涓彁鍙栨墍鏈� RELEASE_NO
+ var releaseNoList = zuHeRequestOrders.ReleaseNo.Split(',').ToList();
+
+ var firstReleaseNo = zuHeRequestOrders.ReleaseNo.Split(',').FirstOrDefault();
+
+ foreach (var releaseNo in releaseNoList)
+ {
+ // 鏌ヨ ZuHeRequestOrders 琛ㄤ腑鏄惁瀛樺湪鍖归厤鐨勮褰�
+ var existingQcIssueResult = db.Queryable<ZuHeRequestOrders>()
+ .Where(t => t.ReleaseNo == releaseNo)
+ .First();
+
+ if (existingQcIssueResult != null)
+ {
+ // 鏇存柊 ZuHeRequestOrders 琛ㄤ腑鐨勫瓧娈�
+ var updateResult = db.Updateable<ZuHeRequestOrders>()
+ .SetColumns(t => new ZuHeRequestOrders
+ {
+ ZH_BS = firstReleaseNo,
+ })
+ .Where(t => t.ReleaseNo == releaseNo)
+ .ExecuteCommand();
+
+ if (updateResult <= 0)
+ {
+ throw new Exception($"鏇存柊 ZuHeRequestOrders 琛ㄥけ璐ワ紝ReleaseNo: {releaseNo}");
+ }
+ }
+ else
+ {
+ throw new Exception($"鏈壘鍒版楠屽崟鍙凤紝ReleaseNo: {releaseNo}");
+ }
+ }
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ Debug.WriteLine($"閿欒: {ex.Message}");
+ throw;
+ }
+
+ }
+
+ /**
+ * 鏇存柊鏁版嵁搴撹〃杩涜缁勫悎
+ */
+ private bool ReleaseData(SqlSugarScope db, ZuHeRequestOrders zuHeRequestOrders)
+ {
+
+ try
+ {
+ // 浠� ReleaseNo 涓彁鍙栨墍鏈� RELEASE_NO
+ var releaseNoList = zuHeRequestOrders.ReleaseNo.Split(',').ToList();
+
+ var firstReleaseNo = zuHeRequestOrders.ReleaseNo.Split(',').FirstOrDefault();
+
+ foreach (var releaseNo in releaseNoList)
+ {
+ // 鏌ヨ ZuHeRequestOrders 琛ㄤ腑鏄惁瀛樺湪鍖归厤鐨勮褰�
+ var existingQcIssueResult = db.Queryable<ZuHeRequestOrders>()
+ .Where(t => t.ReleaseNo == releaseNo)
+ .First();
+
+ if (existingQcIssueResult != null)
+ {
+ // 鏇存柊 ZuHeRequestOrders 琛ㄤ腑鐨勫瓧娈�
+ var updateResult = db.Updateable<ZuHeRequestOrders>()
+ .SetColumns(t => new ZuHeRequestOrders
+ {
+ ZH_BS = null,
+ })
+ .Where(t => t.ReleaseNo == releaseNo)
+ .ExecuteCommand();
+
+ if (updateResult <= 0)
+ {
+ throw new Exception($"鏇存柊 ZuHeRequestOrders 琛ㄥけ璐ワ紝ReleaseNo: {releaseNo}");
+ }
+ }
+ else
+ {
+ throw new Exception($"鏈壘鍒版楠屽崟鍙凤紝ReleaseNo: {releaseNo}");
+ }
+ }
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ Debug.WriteLine($"閿欒: {ex.Message}");
+ throw;
+ }
+
+ }
+
+}
diff --git a/MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs b/MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs
index 6e3aed9..eada4fb 100644
--- a/MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs
+++ b/MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs
@@ -29,7 +29,7 @@
private readonly string URL = "http://localhost:10054/api/SentLaboratoryTestingItems/";
/// <summary>
- /// 鑾峰彇鎵�鏈�
+ /// 鑾峰彇閫佹鍗曞彿
/// </summary>
/// <returns></returns>
[HttpPost("GetList")]
@@ -55,12 +55,12 @@
}
[HttpPost("GetLaboratoryList")]
- public ResponseResult GetLaboratoryList()
+ public ResponseResult GetLaboratoryList(string RELEASE_NO)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = n.GetList();
+ resultInfos.tbBillList = n.GetListAll(RELEASE_NO);
return new ResponseResult
{
@@ -75,6 +75,10 @@
}
}
+ /// <summary>
+ /// 淇濆瓨鎴栨彁浜ら�佹鍗曟暟鎹�
+ /// </summary>
+ /// <returns></returns>
[HttpPost("SaveLaboratoryDetails")]
public IActionResult SaveLaboratoryDetails([FromBody] GetLaboratoryDetails getLaboratoryDetails)
{
@@ -98,6 +102,10 @@
}
}
+ /// <summary>
+ /// 鎾ゅ洖閫佹鍗�
+ /// </summary>
+ /// <returns></returns>
[HttpPost("DeleteLaboratoryDetails")]
public IActionResult DeleteLaboratoryDetails(string JYDH)
{
diff --git a/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs b/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs
index 089a715..53c0dd1 100644
--- a/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs
+++ b/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs
@@ -11,7 +11,10 @@
using Newtonsoft.Json.Linq;
using System.Diagnostics;
using System.Dynamic;
+using System.Net;
+using System.Text;
using System.Text.Json.Nodes;
+using System.Web;
namespace MESApplication.Controllers.QcIssueResult;
@@ -35,6 +38,8 @@
try
{
+ // 鏂板URL瑙ｇ爜澶勭悊閫昏緫
+ DecodeUrlEncodedProperties(getQcIssueResultDetail);
// 璋冪敤 QcIssueResultManager 涓殑 GetProcessNo 鏂规硶鏉ュ惎鍔ㄩ拤閽夊伐浣滄祦瀹炰緥
string result = m.GetProcessNo(getQcIssueResultDetail);
@@ -61,6 +66,27 @@
}
}
+ // 鏂板瑙ｇ爜鏂规硶
+ private void DecodeUrlEncodedProperties(object obj)
+ {
+ if (obj == null) return;
+
+ var properties = obj.GetType().GetProperties();
+ foreach (var prop in properties)
+ {
+ // 鍙鐞嗗瓧绗︿覆绫诲瀷鐨勫睘鎬�
+ if (prop.PropertyType == typeof(string) && prop.CanWrite)
+ {
+ var value = prop.GetValue(obj) as string;
+ if (!string.IsNullOrEmpty(value))
+ {
+ // 浣跨敤UTF8缂栫爜杩涜瑙ｇ爜
+ var decodedValue = HttpUtility.UrlDecode(value, Encoding.UTF8);
+ prop.SetValue(obj, decodedValue);
+ }
+ }
+ }
+ }
[HttpPost("Save")]
public ResponseResult Save(ErpQcIssueResult erpQcIssueResult)
diff --git a/MESApplication/Controllers/ZuHeRequestOrder/ZuHeRequestOrderController.cs b/MESApplication/Controllers/ZuHeRequestOrder/ZuHeRequestOrderController.cs
new file mode 100644
index 0000000..b292de4
--- /dev/null
+++ b/MESApplication/Controllers/ZuHeRequestOrder/ZuHeRequestOrderController.cs
@@ -0,0 +1,84 @@
+锘縰sing MES.Service.Dto.webApi.ZuHeRequestOrder;
+using MES.Service.service.QcIssueResult;
+using MES.Service.service;
+using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
+using MES.Service.service.ZuHeRequestOrder;
+
+namespace MESApplication.Controllers.ZuHeRequestOrder;
+
+[ApiController]
+[Route("api/[controller]")]
+public class ZuHeRequestOrderController : ControllerBase
+{
+
+ private readonly MessageCenterManager _manager = new();
+ private readonly ZuHeRequestOrderManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "MES_QA_ITEMS_DETECT_01";
+
+ private readonly string URL = "http://localhost:10054/api/ZuHeRequestOrder/";
+
+ [HttpPost("UpdateZHBS")]
+ public IActionResult UpdateZHBS([FromBody] ZuHeRequestsOrder zuHeRequestsOrder)
+ {
+ try
+ {
+ // 楠岃瘉鏁版嵁
+ if (zuHeRequestsOrder == null || zuHeRequestsOrder.ComboSingle == null || zuHeRequestsOrder.ComboSingle.Count == 0)
+ {
+ return BadRequest("ComboSingle 蹇呴』鏄竴涓潪绌烘暟缁�");
+ }
+
+ // 鎵撳嵃鎺ユ敹鍒扮殑鏁版嵁锛堣皟璇曠敤锛�
+ foreach (var item in zuHeRequestsOrder.ComboSingle)
+ {
+ Debug.WriteLine($"RELEASE_NO: {item.RELEASE_NO}");
+ }
+
+ // 澶勭悊鏁版嵁锛堜緥濡傚瓨鍌ㄥ埌鏁版嵁搴擄級
+ var result = m.SaveZHBS(zuHeRequestsOrder);
+
+ // 杩斿洖鎴愬姛鍝嶅簲
+ return Ok(result);
+ }
+ catch (Exception ex)
+ {
+ // 鎹曡幏寮傚父骞惰繑鍥為敊璇俊鎭�
+ return StatusCode(500, $"鍚姩閽夐拤宸ヤ綔娴佸疄渚嬪け璐�: {ex.Message}");
+ }
+ }
+
+ [HttpPost("ReleaseCombination")]
+ public IActionResult ReleaseCombination([FromBody] ZuHeRequestsOrder zuHeRequestsOrder)
+ {
+ try
+ {
+ // 楠岃瘉鏁版嵁
+ if (zuHeRequestsOrder == null || zuHeRequestsOrder.ComboSingle == null || zuHeRequestsOrder.ComboSingle.Count == 0)
+ {
+ return BadRequest("ComboSingle 蹇呴』鏄竴涓潪绌烘暟缁�");
+ }
+
+ // 鎵撳嵃鎺ユ敹鍒扮殑鏁版嵁锛堣皟璇曠敤锛�
+ foreach (var item in zuHeRequestsOrder.ComboSingle)
+ {
+ Debug.WriteLine($"RELEASE_NO: {item.RELEASE_NO}");
+ }
+
+ // 澶勭悊鏁版嵁锛堜緥濡傚瓨鍌ㄥ埌鏁版嵁搴擄級
+ var result = m.deleateZHBS(zuHeRequestsOrder);
+
+ // 杩斿洖鎴愬姛鍝嶅簲
+ return Ok(result);
+ }
+ catch (Exception ex)
+ {
+ // 鎹曡幏寮傚父骞惰繑鍥為敊璇俊鎭�
+ return StatusCode(500, $"鍚姩閽夐拤宸ヤ綔娴佸疄渚嬪け璐�: {ex.Message}");
+ }
+ }
+
+}
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index 60029af..b99c8d1 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\VISUAL STUDIOS JOB\YC\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2025-03-28T06:28:57.3291596Z||;True|2025-03-25T17:51:51.1941007+08:00||;True|2025-03-25T17:28:17.3219786+08:00||;True|2025-03-25T15:25:43.0061330+08:00||;True|2025-03-24T17:58:37.6820871+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
+ <History>True|2025-04-10T08:29:29.4614826Z||;True|2025-04-03T12:04:01.6354165+08:00||;True|2025-03-28T14:28:57.3291596+08:00||;True|2025-03-25T17:51:51.1941007+08:00||;True|2025-03-25T17:28:17.3219786+08:00||;True|2025-03-25T15:25:43.0061330+08:00||;True|2025-03-24T17:58:37.6820871+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 802d0ac..783483a 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index f02e19f..1dea739 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index eb0d1a7..c1c36e7 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index 5e4d312..e6b387e 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 7ec20a3..329a2c7 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.xml b/MESApplication/bin/Debug/net8.0/MESApplication.xml
index 6bb0741..8381543 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -716,7 +716,19 @@
</member>
<member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.GetList">
<summary>
- 鑾峰彇鎵�鏈�
+ 鑾峰彇閫佹鍗曞彿
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.SaveLaboratoryDetails(MES.Service.Modes.SentLaboratory.GetLaboratoryDetails)">
+ <summary>
+ 淇濆瓨鎴栨彁浜ら�佹鍗曟暟鎹�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.DeleteLaboratoryDetails(System.String)">
+ <summary>
+ 鎾ゅ洖閫佹鍗�
</summary>
<returns></returns>
</member>
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index b68a334..e4184f4 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index 6995d48..5a92c8f 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index 6acd796..72c2a15 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index 9522148..e6b387e 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index 7b73bb2..7a32512 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index b68a334..e4184f4 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index 6995d48..5a92c8f 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index 6acd796..72c2a15 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index 9522148..e6b387e 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index 7b73bb2..7a32512 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3