From a599e3205cf2015d9064fbba66a491fdb3a36d5b Mon Sep 17 00:00:00 2001
From: 如洲 陈 <1278080563@qq.com>
Date: 星期三, 25 六月 2025 09:37:29 +0800
Subject: [PATCH] 销售退货通知单当结束标识为空时转为0
---
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/Dto/webApi/ErpReturnWare.cs | 1 +
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/Modes/MesReturnware.cs | 8 ++++++++
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/service/Warehouse/MesReturnwareManager.cs | 3 ++-
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
10 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpReturnWare.cs b/MES.Service/Dto/webApi/ErpReturnWare.cs
index 0e56e67..cf0b6f2 100644
--- a/MES.Service/Dto/webApi/ErpReturnWare.cs
+++ b/MES.Service/Dto/webApi/ErpReturnWare.cs
@@ -14,4 +14,5 @@
public string? CreateBy { get; set; }
public DateTime? CreateDate { get; set; }
public string? Type { get; set; }
+ public decimal? Over { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesReturnware.cs b/MES.Service/Modes/MesReturnware.cs
index c707af0..25a6a1e 100644
--- a/MES.Service/Modes/MesReturnware.cs
+++ b/MES.Service/Modes/MesReturnware.cs
@@ -61,6 +61,14 @@
[SugarColumn(ColumnName="CREATE_DATE" )]
public DateTime? CreateDate { get; set; }
+
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "OVER")]
+ public decimal? Over { 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 d3abeb1..b298ce0 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 c89f342..d9f5a1c 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/Warehouse/MesReturnwareManager.cs b/MES.Service/service/Warehouse/MesReturnwareManager.cs
index 78d7865..c83afa9 100644
--- a/MES.Service/service/Warehouse/MesReturnwareManager.cs
+++ b/MES.Service/service/Warehouse/MesReturnwareManager.cs
@@ -137,7 +137,8 @@
Remarks = dto.Remarks,
CreateBy = dto.CreateBy,
CreateDate = dto.CreateDate,
- Type = dto.Type
+ Type = dto.Type,
+ Over=dto.Over ?? 0
};
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index d3abeb1..b298ce0 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 c89f342..d9f5a1c 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 f4ff9e0..e87bf5a 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 89cf2ad..02cdcc4 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 895fc4b..97c2715 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3