From 335095c9fdb8bc93340feb72397befc9ea10c890 Mon Sep 17 00:00:00 2001
From: crz <1278080563@qq.com>
Date: 星期二, 11 三月 2025 08:51:13 +0800
Subject: [PATCH] 补充字段
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MESApplication.deps.json | 5
MESApplication/bin/Release/net8.0/MESApplication.xml | 36 +++++++
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Dto/webApi/ErpORDER.cs | 20 ++-
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MES.Service/Dto/webApi/ErpDETAIL.cs | 25 ++++-
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
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/Release/net8.0/publish/MESApplication.xml | 36 +++++++
MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json | 5
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesSalesOrderDetail.cs | 70 ++++++++++---
MESApplication/MESApplication.csproj.user | 2
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 4
MES.Service/Modes/MesSalesOrder.cs | 28 ++--
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/MesSalesOrderManager.cs | 63 +++++++-----
30 files changed, 219 insertions(+), 75 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpDETAIL.cs b/MES.Service/Dto/webApi/ErpDETAIL.cs
index 8570d33..210fd77 100644
--- a/MES.Service/Dto/webApi/ErpDETAIL.cs
+++ b/MES.Service/Dto/webApi/ErpDETAIL.cs
@@ -9,17 +9,32 @@
public class ErpDETAIL
{
public string ? F_UNW_Text_xsddh { get; set; }
- public string? LineNumber { get; set; }
+ public string? FOrderNumber { get; set; }
+ //public string? LineNumber { get; set; }
+ public string? FOrderType { get; set; }
+ /*ProductCode FMaterialId*/
public string ? FMaterialId { get; set;}
public string ? FMaterialName { get; set;}
public string ? FMaterialModel { get; set;}
+ public string? FWarehouse { get; set; }
public string ? FMinPlanDeliveryDate { get; set;}
- public string ? FQty { get; set;}
+ public decimal? FQty { get; set;}
public string ? FUnitID { get; set;}
- public string ? FPrice { get; set;}
- public string ? FAmount { get; set;}
- public string ? FDeliCommitQty { get; set;}
+ public decimal? FGiftQuantity { get; set; }
+ public decimal? FDeliveredGiftQuantity { get; set; }
+ public decimal? FUnsettledBorrowedQty { get; set; }
+ //public string? FConfigurationMode { get; set; }
+ public string? FConfigurationPlan { get; set; }
+ public decimal? FDeliCommitQty { get; set;}
+
+ public string FIsClosed { get; set; }
public string ? FEntryNote { get; set;}
+ public string? FDeviceModel { get; set; }
+
+ public string? FCustomerProductId { get; set; }
+ public string? FCustomerProductName { get; set; }
+ public string? FCustomerSpec { get; set; }
+ public string? FCustomerOrderId { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpORDER.cs b/MES.Service/Dto/webApi/ErpORDER.cs
index 49490d8..b9615d4 100644
--- a/MES.Service/Dto/webApi/ErpORDER.cs
+++ b/MES.Service/Dto/webApi/ErpORDER.cs
@@ -3,20 +3,24 @@
public class ErpORDER
{
public string ? FBillNo { get; set; }
-
+ //public string ? FBillName { get; set; }
public string? Type { get; set; }
public string ? FBillTypeID { get; set; }
- public string ? F_UNW_Date_KHXQ { get; set; }
- public string ? FVersionNo { get; set; }
+ //public string ? F_UNW_Date_KHXQ { get; set; }
+ //public string ? FVersionNo { get; set; }
public string ? FDate { get; set; }
public string ? FCustId { get; set; }
- public string ? F_UNW_Text_KHDD { get; set; }
- public string ? FSaleDeptId { get; set; }
+ public string? FOrderDate { get; set; }
+ public string? FDeliveryDate { get; set; }
+ //public string ? F_UNW_Text_KHDD { get; set; }
+ //public string ? FSaleDeptId { get; set; }
public string ? FNote { get; set; }
- public string ? F_UNW_LargeText_TBKHBZ { get; set; }
- public string ? FApproveDate { get; set; }
+ //public string ? F_UNW_LargeText_TBKHBZ { get; set; }
+ //public string ? FApproveDate { get; set; }
public string ? FApproverId { get; set; }
-
+
+ public string? FDebugDate { get; set; }
+ public string? FDeliverAddress { get; set; }
}
}
diff --git a/MES.Service/Modes/MesSalesOrder.cs b/MES.Service/Modes/MesSalesOrder.cs
index dae2cd2..7a50e9f 100644
--- a/MES.Service/Modes/MesSalesOrder.cs
+++ b/MES.Service/Modes/MesSalesOrder.cs
@@ -28,7 +28,7 @@
public string OrderType { get; set; }
/// <summary>
- /// 鍙楄鏃ユ湡
+ /// 璁㈠崟鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "ORDER_DATE")]
public DateTime? OrderDate { get; set; }
@@ -46,16 +46,10 @@
public string CustomerId { get; set; }
/// <summary>
- /// 瀹㈡埛绠�绉�
+ /// 浜よ揣鏃ユ湡
/// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_NAME")]
- public string CustomerName { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_ORDER_ID")]
- public string CustomerOrderId { get; set; }
+ [SugarColumn(ColumnName = "DELIVERY_DATE")]
+ public DateTime? DeliveryDate { get; set; }
/// <summary>
@@ -72,8 +66,14 @@
public string Approver { get; set; }
/// <summary>
- /// ERPID
+ /// 瀹夎璋冭瘯瀹屾垚鏃ユ湡
/// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
-}
\ No newline at end of file
+ [SugarColumn(ColumnName = "DEBUG_DATE")]
+ public DateTime? DebugDate { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鍦板潃
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVER_ADDRESS")]
+ public string DeliverAddress { get; set; }
+}
diff --git a/MES.Service/Modes/MesSalesOrderDetail.cs b/MES.Service/Modes/MesSalesOrderDetail.cs
index e491ac8..cd21dd2 100644
--- a/MES.Service/Modes/MesSalesOrderDetail.cs
+++ b/MES.Service/Modes/MesSalesOrderDetail.cs
@@ -24,8 +24,14 @@
/// <summary>
/// 搴忓彿
/// </summary>
- [SugarColumn(ColumnName = "LINE_NUMBER")]
- public string? LineNumber { get; set; }
+ [SugarColumn(ColumnName = "ORDER_NUMBER")]
+ public string OrderNumber { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍗曞埆
+ /// </summary>
+ [SugarColumn(ColumnName = "ORDER_TYPE")]
+ public string? OrderType { get; set; }
/// <summary>
/// 浜у搧缂栫爜
@@ -46,6 +52,12 @@
public string ProductSpec { get; set; }
/// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "WAREHOUSE")]
+ public string Warehouse { get; set; }
+
+ /// <summary>
/// 棰勪氦璐ф棩鏈�
/// </summary>
[SugarColumn(ColumnName = "SCHEDULED_DELIVERY_DATE")]
@@ -64,22 +76,28 @@
public string Unit { get; set; }
/// <summary>
- /// 鍗曚环
+ /// 璧犲搧閲�
/// </summary>
- [SugarColumn(ColumnName = "UNIT_PRICE")]
- public decimal? UnitPrice { get; set; }
+ [SugarColumn(ColumnName = "GIFT_QUANTITY")]
+ public decimal? GiftQuantity { get; set; }
/// <summary>
- /// 閲戦
+ /// 璧犲搧宸蹭氦閲�
/// </summary>
- [SugarColumn(ColumnName = "AMOUNT")]
- public decimal? Amount { get; set; }
+ [SugarColumn(ColumnName = "DELIVERED_GIFT_QUANTITY")]
+ public decimal? DeliveredGiftQuantity { get; set; }
/// <summary>
- /// 瀹㈡埛浜у搧缂栫爜
+ /// 鍊熷嚭鏈攢鏁伴噺
/// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_PRODUCT_CODE")]
- public string CustomerProductCode { get; set; }
+ [SugarColumn(ColumnName = "UNSETTLED_BORROWED_QTY")]
+ public decimal? UnsettledBorrowedQty { get; set; }
+
+ /// <summary>
+ /// 閰嶇疆鏂规
+ /// </summary>
+ [SugarColumn(ColumnName = "CONFIGURATION_PLAN")]
+ public string ConfigurationPlan { get; set; }
/// <summary>
/// 宸蹭氦璐ф暟
@@ -100,14 +118,32 @@
public string Remarks { get; set; }
/// <summary>
- /// ERPID
+ /// 鏈哄瀷
/// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
+ [SugarColumn(ColumnName = "DEVICE_MODEL")]
+ public string DeviceModel { get; set; }
/// <summary>
- /// ERP澶碔D
+ /// 瀹㈡埛鍝佸彿
/// </summary>
- [SugarColumn(ColumnName = "ERP_HEAD_ID")]
- public string ErpHeadId { get; set; }
+ [SugarColumn(ColumnName = "CUSTOMER_PRODUCT_ID")]
+ public string CustomerProductId { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍝佸悕
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_PRODUCT_NAME")]
+ public string CustomerProductName { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_SPEC")]
+ public string CustomerSpec { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_ORDER_ID")]
+ public string CustomerOrderId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 1f38dfc..4c117f8 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 53a8e81..31ec636 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 06e33bc..5110f8b 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 6d8f205..392bed0 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/MesSalesOrderManager.cs b/MES.Service/service/MesSalesOrderManager.cs
index c58baac..d938127 100644
--- a/MES.Service/service/MesSalesOrderManager.cs
+++ b/MES.Service/service/MesSalesOrderManager.cs
@@ -36,6 +36,7 @@
case "3":
return UpdateData(db, mesSalesOrder, mesSalesOrderDetails) ? 1 : 0;
case "2":
+ case "4":
return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDetails)
? 1
: 0;
@@ -61,12 +62,12 @@
if (mesSalesOrderDetails.Count > 0)
{
- var mesSalesOrderDetail = mesSalesOrderDetails.Select(s => new { s.OrderId, s.LineNumber }).ToList();
+ var mesSalesOrderDetail = mesSalesOrderDetails.Select(s => new { s.OrderId, s.OrderType }).ToList();
db.Deleteable<MesSalesOrderDetail>()
.Where(it => mesSalesOrderDetails
.Any(p => p.OrderId == it.OrderId
- && p.LineNumber == it.LineNumber))
+ && p.OrderType == it.OrderType))
.ExecuteCommand();
};
@@ -88,9 +89,10 @@
it.OrderType == mesSalesOrder.OrderType)
.ExecuteCommand() > 0;
- var mesSalesOrderDetail = mesSalesOrderDetails.Select(s => new { s.OrderId, s.LineNumber }).ToList();
+ var mesSalesOrderDetail = mesSalesOrderDetails.Select(s => new { s.OrderId, s.OrderType }).ToList();
- var insertOrUpdate = db.Deleteable<MesSalesOrderDetail>().Where(it => mesSalesOrderDetail.Any(p => p.OrderId == it.OrderId && p.LineNumber==it.LineNumber)).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<MesSalesOrderDetail>().
+ Where(it => mesSalesOrderDetail.Any(p => p.OrderId == it.OrderId && p.OrderType == it.OrderType)).ExecuteCommand() > 0;
if (update && insertOrUpdate) return true;
@@ -103,14 +105,14 @@
{
OrderId = dto.FBillNo,
OrderType = dto.FBillTypeID,
- DocumentDate = DateTime.TryParseExact(dto.FDate, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime documentDate) ? (DateTime?)documentDate : null,
+ DocumentDate = !string.IsNullOrEmpty(dto.FDate) && DateTime.TryParseExact(dto.FDate, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime documentDate) ? (DateTime?)documentDate : null,
CustomerId = dto.FCustId,
- CustomerOrderId= dto.F_UNW_Text_KHDD,
- DepartmentId= dto.FSaleDeptId,
- TotalQuantity = long.TryParse(dto.FNote, out long quantity) ? (long?)quantity : null,
- Remarks =dto.F_UNW_LargeText_TBKHBZ,
- ApprovalDate = DateTime.TryParse(dto.FApproveDate, out DateTime approveDate) ? (DateTime?)approveDate : null,
- Approver = dto.FApproverId
+ OrderDate = !string.IsNullOrEmpty(dto.FOrderDate) && (DateTime.TryParseExact(dto.FOrderDate, "yyyyMMdd", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime orderDate) || DateTime.TryParseExact(dto.FOrderDate, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out orderDate)) ? (DateTime?)orderDate : null,
+ DeliveryDate = !string.IsNullOrEmpty(dto.FDeliveryDate) && (DateTime.TryParseExact(dto.FDeliveryDate, "yyyyMMdd", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime deliveryDate) || DateTime.TryParseExact(dto.FDeliveryDate, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out deliveryDate)) ? (DateTime?)deliveryDate : null,
+ Remarks = dto.FNote,
+ Approver = dto.FApproverId,
+ DebugDate = !string.IsNullOrEmpty(dto.FDebugDate) && (DateTime.TryParseExact(dto.FDebugDate, "yyyyMMdd", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime debugDate) || DateTime.TryParseExact(dto.FDebugDate, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out debugDate)) ? (DateTime?)debugDate : null,
+ DeliverAddress = dto.FDeliverAddress
};
return entity;
}
@@ -118,24 +120,33 @@
private List<MesSalesOrderDetail> MapErpDETAILtoMesSalesOrderDetail(List<ErpDETAIL> dtoList)
{
var detailList = new List<MesSalesOrderDetail>();
-
+
foreach (var dto in dtoList)
{
var mesSalesOrderDetail = new MesSalesOrderDetail
{
-
- OrderId= dto.F_UNW_Text_xsddh,
- LineNumber = dto.LineNumber,
- ProductCode =dto.FMaterialId,
- ProductName =dto.FMaterialName,
- ProductSpec=dto.FMaterialModel,
- ScheduledDeliveryDate = DateTime.TryParse(dto.FMinPlanDeliveryDate, out DateTime scheduledDeliveryDate) ? (DateTime?)scheduledDeliveryDate : null,
- OrderQuantity = long.TryParse(dto.FQty, out long quantity) ? (long?)quantity : null,
- Unit = dto.FUnitID,
- UnitPrice = long.TryParse(dto.FPrice, out long price) ? (long?)price : null,
- Amount = long.TryParse(dto.FAmount, out long amount) ? (long?)amount : null,
-
-
+ OrderId = dto.F_UNW_Text_xsddh,
+ OrderType = dto.FOrderType,
+ OrderNumber = dto.FOrderNumber,
+ ProductCode = dto.FMaterialId,
+ ProductName = dto.FMaterialName,
+ ProductSpec = dto.FMaterialModel,
+ Warehouse = dto.FWarehouse,
+ GiftQuantity=dto.FGiftQuantity,
+ UnsettledBorrowedQty=dto.FUnsettledBorrowedQty,
+ ConfigurationPlan=dto.FConfigurationPlan,
+ ScheduledDeliveryDate = !string.IsNullOrEmpty(dto.FMinPlanDeliveryDate) && (DateTime.TryParseExact(dto.FMinPlanDeliveryDate, "yyyyMMdd", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime scheduledDeliveryDate) || DateTime.TryParseExact(dto.FMinPlanDeliveryDate, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out scheduledDeliveryDate)) ? (DateTime?)scheduledDeliveryDate : null,
+ OrderQuantity = dto.FQty,
+ DeliveredGiftQuantity = dto.FDeliveredGiftQuantity,
+ Remarks = dto.FEntryNote,
+ DeviceModel = dto.FDeviceModel,
+ CustomerProductId = dto.FCustomerProductId,
+ CustomerProductName = dto.FCustomerProductName,
+ CustomerSpec = dto.FCustomerSpec,
+ CustomerOrderId = dto.FCustomerOrderId,
+ Unit=dto.FUnitID,
+ DeliveredQuantity=dto.FDeliCommitQty,
+ IsClosed=dto.FIsClosed
};
detailList.Add(mesSalesOrderDetail);
}
@@ -155,7 +166,7 @@
var insertOrUpdate = db.Deleteable<MesSalesOrderDetail>()
.Where(it => it.OrderId == data.FBillNo
- && it.LineNumber == data.FBillTypeID)
+ && it.OrderType == data.FBillTypeID)
.ExecuteCommand() > 0;
diff --git a/MESApplication/MESApplication.csproj.user b/MESApplication/MESApplication.csproj.user
index 66f91bf..6ff63cb 100644
--- a/MESApplication/MESApplication.csproj.user
+++ b/MESApplication/MESApplication.csproj.user
@@ -5,6 +5,6 @@
</PropertyGroup>
<PropertyGroup>
<ActiveDebugProfile>IIS Express</ActiveDebugProfile>
- <NameOfLastUsedPublishProfile>F:\F鐩樻闈笓灞瀄娑﹁揪椤圭洰\娑﹁揪椤圭洰api\StandardPda\MESApplication\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>E:\Desktop\鏂板缓鏂囦欢澶筡RD_MES_Api\MESApplication\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index 2eef0b8..5dcaec7 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,8 +4,8 @@
-->
<Project>
<PropertyGroup>
- <_PublishTargetUrl>F:\F鐩樻闈笓灞瀄娑﹁揪椤圭洰\娑﹁揪椤圭洰api\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2024-12-24T07:39:58.5366570Z;True|2024-11-26T18:32:03.9568766+08:00;True|2024-11-21T02:11:35.8050745+08:00;True|2024-09-21T16:35:22.6651659+08:00;True|2024-09-21T16:14:11.3450387+08:00;True|2024-09-19T17:16:11.7338751+08:00;True|2024-09-19T17:11:21.0116707+08:00;True|2024-09-19T13:54:25.7455472+08:00;True|2024-09-15T13:55:51.7095153+08:00;True|2024-09-12T17:10:20.4734556+08:00;True|2024-09-10T15:54:07.7463519+08:00;True|2024-09-06T14:40:56.3762241+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>
+ <_PublishTargetUrl>E:\Desktop\鏂板缓鏂囦欢澶筡RD_MES_Api\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
+ <History>True|2025-03-10T08:49:08.3476948Z||;True|2024-12-24T15:39:58.5366570+08:00||;True|2024-11-26T18:32:03.9568766+08:00||;True|2024-11-21T02:11:35.8050745+08:00||;True|2024-09-21T16:35:22.6651659+08:00||;True|2024-09-21T16:14:11.3450387+08:00||;True|2024-09-19T17:16:11.7338751+08:00||;True|2024-09-19T17:11:21.0116707+08:00||;True|2024-09-19T13:54:25.7455472+08:00||;True|2024-09-15T13:55:51.7095153+08:00||;True|2024-09-12T17:10:20.4734556+08:00||;True|2024-09-10T15:54:07.7463519+08:00||;True|2024-09-06T14:40:56.3762241+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 1f38dfc..4c117f8 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 53a8e81..31ec636 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 4b810a9..022c527 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 c06bdad..07b19ec 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 86dfcdb..c8cfe27 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/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 06e33bc..5110f8b 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 6d8f205..392bed0 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.deps.json b/MESApplication/bin/Release/net8.0/MESApplication.deps.json
index a38b276..95a84e5 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.deps.json
+++ b/MESApplication/bin/Release/net8.0/MESApplication.deps.json
@@ -1412,7 +1412,10 @@
"SqlSugarCore": "5.1.4.158"
},
"runtime": {
- "MES.Service.dll": {}
+ "MES.Service.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.0.0"
+ }
}
}
}
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index 18d48b3..2dda0e9 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 dad02c5..07b19ec 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 61cb530..55577fe 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/MESApplication.xml b/MESApplication/bin/Release/net8.0/MESApplication.xml
index d3e5c89..0696b68 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -822,6 +822,42 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.Add(MES.Service.Modes.MesSalesOrder)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.InsertReturnIdentity(MES.Service.Modes.MesSalesOrder)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.Update(MES.Service.Modes.MesSalesOrder)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
<summary>
鑾峰彇鎵�鏈�
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index 06e33bc..5110f8b 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 6d8f205..392bed0 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.deps.json b/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
index e23a3b1..6cd3c2a 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json
@@ -1160,7 +1160,10 @@
"SqlSugarCore": "5.1.4.158"
},
"runtime": {
- "MES.Service.dll": {}
+ "MES.Service.dll": {
+ "assemblyVersion": "1.0.0",
+ "fileVersion": "1.0.0.0"
+ }
}
}
}
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index 18d48b3..2dda0e9 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 dad02c5..07b19ec 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 61cb530..55577fe 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
index d3e5c89..0696b68 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -822,6 +822,42 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.Add(MES.Service.Modes.MesSalesOrder)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.InsertReturnIdentity(MES.Service.Modes.MesSalesOrder)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesSalesOrderController.Update(MES.Service.Modes.MesSalesOrder)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
<summary>
鑾峰彇鎵�鏈�
--
Gitblit v1.9.3