From ddbdac2e9cd8258508fb96ca0eb58a9e222b8631 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期一, 24 三月 2025 14:51:04 +0800
Subject: [PATCH] 生产制造单修改
---
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MES.Service/service/ProductionOrder/ProductionOrderManager.cs | 2 +-
MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs | 21 +++++++++++++++++----
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/Dto/webApi/ProductionOrder/ErpProductionOrder.cs | 2 +-
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs | 26 ++++++++++++++++++++++++++
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
11 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/MES.Service/Dto/webApi/ProductionOrder/ErpProductionOrder.cs b/MES.Service/Dto/webApi/ProductionOrder/ErpProductionOrder.cs
index 403499a..9c087e9 100644
--- a/MES.Service/Dto/webApi/ProductionOrder/ErpProductionOrder.cs
+++ b/MES.Service/Dto/webApi/ProductionOrder/ErpProductionOrder.cs
@@ -3,7 +3,7 @@
public class ErpProductionOrder
{
//public string? Id { get; set; }
- public string? SalesOrder { get; set; }
+ public string? SalesOrderNo { get; set; }
public string? ImageUrl { 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 d14c9d7..06e0487 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 ab07b63..a0dca01 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/service/ProductionOrder/ProductionOrderManager.cs b/MES.Service/service/ProductionOrder/ProductionOrderManager.cs
index d1d1f99..1a4f3a7 100644
--- a/MES.Service/service/ProductionOrder/ProductionOrderManager.cs
+++ b/MES.Service/service/ProductionOrder/ProductionOrderManager.cs
@@ -263,7 +263,7 @@
var mesProductionOrders = new ProductionOrders
{
ImageUrl = erpProductionOrder.ImageUrl,
- SalesOrder = erpProductionOrder.SalesOrder
+ SalesOrder = erpProductionOrder.SalesOrderNo
};
return mesProductionOrders;
diff --git a/MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs b/MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs
index dbfa7b9..5eff960 100644
--- a/MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs
+++ b/MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs
@@ -154,4 +154,30 @@
//}
}
+
+ public string DeleteLaboratory(string JYDH)
+ {
+ try
+ {
+ var db = SqlSugarHelper.GetInstance();
+ // 鍋囪 db 鏄� SQLSugar 鐨� SqlSugarClient 瀹炰緥
+ var result = db.Deleteable<UpdateMesQmsSample>()
+ .Where(t => t.JYDH == JYDH) // 鏍规嵁 JYDH 鍒犻櫎
+ .ExecuteCommand();
+
+ if (result > 0)
+ {
+ return "鍒犻櫎鎴愬姛锛�";
+ }
+ else
+ {
+ return "鏈壘鍒板尮閰嶇殑璁板綍锛屽垹闄ゅけ璐ャ��";
+ }
+ }
+ catch (Exception ex)
+ {
+ return "鍒犻櫎澶辫触锛岄敊璇俊鎭細" + ex.Message;
+ }
+ }
+
}
diff --git a/MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs b/MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs
index a8e545b..6e3aed9 100644
--- a/MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs
+++ b/MESApplication/Controllers/BasicData/SentLaboratoryTestingItemsControllor.cs
@@ -98,10 +98,23 @@
}
}
- //[HttpPost("DeleteLaboratoryDetails")]
- //public IActionResult DeleteLaboratoryDetails(string JYDH)
- //{
+ [HttpPost("DeleteLaboratoryDetails")]
+ public IActionResult DeleteLaboratoryDetails(string JYDH)
+ {
+ try
+ {
- //}
+ var result = n.DeleteLaboratory(JYDH);
+
+
+ //return Ok(result);
+ return Ok(result);
+ }
+ catch (Exception ex)
+ {
+ // 鎹曡幏寮傚父骞惰繑鍥為敊璇俊鎭�
+ return StatusCode(500, $"{ex.Message}");
+ }
+ }
}
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index d14c9d7..06e0487 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 ab07b63..a0dca01 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 020303a..7410758 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 8d8045c..2aff4ff 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 b5f0763..0e1a53c 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3