From 8179d11bf6e45093ceabf0449ddac3fd7a73e818 Mon Sep 17 00:00:00 2001
From: 如洲 陈 <1278080563@qq.com>
Date: 星期四, 29 五月 2025 14:45:16 +0800
Subject: [PATCH] 销售退货通知单子表添加字段REMARKS
---
/dev/null | 80 ----------------------------------------
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.deps.json | 5 ++
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
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
MES.Service/service/Warehouse/MesReturnwareManager.cs | 3 +
MES.Service/Modes/MesReturnwareDetails.cs | 6 +++
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Dto/webApi/ErpReturnWareDetails.cs | 1
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
12 files changed, 13 insertions(+), 82 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpReturnWareDetails.cs b/MES.Service/Dto/webApi/ErpReturnWareDetails.cs
index 8973e9d..0c9e339 100644
--- a/MES.Service/Dto/webApi/ErpReturnWareDetails.cs
+++ b/MES.Service/Dto/webApi/ErpReturnWareDetails.cs
@@ -19,4 +19,5 @@
public string? CustItemNo { get; set; }
public string? CustItemName { get; set; }
public string? CustItemModel { get; set; }
+ public string? Remarks { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesReturnwareDetails.cs b/MES.Service/Modes/MesReturnwareDetails.cs
index 694d0ad..1f37f2c 100644
--- a/MES.Service/Modes/MesReturnwareDetails.cs
+++ b/MES.Service/Modes/MesReturnwareDetails.cs
@@ -104,5 +104,11 @@
///</summary>
[SugarColumn(ColumnName = "CUST_ITEM_MODEL")]
public string? CustItemModel { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛瑙勬牸
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARKS")]
+ public string? Remarks { 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 32dfbf5..8018592 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 996f0a4..a8a6e39 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 a656112..78d7865 100644
--- a/MES.Service/service/Warehouse/MesReturnwareManager.cs
+++ b/MES.Service/service/Warehouse/MesReturnwareManager.cs
@@ -170,7 +170,8 @@
ActualQuantity = dto.ActQuantity,
CustItemNo = dto.CustItemNo,
CustItemName = dto.CustItemName,
- CustItemModel = dto.CustItemModel
+ CustItemModel = dto.CustItemModel,
+ Remarks=dto.Remarks
};
diff --git a/MESApplication/Controllers/Base/UpdateController.cs b/MESApplication/Controllers/Base/UpdateController.cs
deleted file mode 100644
index 9290acf..0000000
--- a/MESApplication/Controllers/Base/UpdateController.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.@base;
-using MES.Service.service;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace MESApplication.Controllers.Base;
-
-[ApiController]
-[Route("api/[controller]")]
-public class UpdateController : ControllerBase
-{
- [HttpPost]
- [Route("checkUpdate")]
- public ResponseResult CheckUpdate([FromBody] UpdateCheckRequest request)
- {
- try
- {
- // 浠庨厤缃枃浠舵垨鏁版嵁搴撹幏鍙栨渶鏂扮増鏈俊鎭�
- var latestVersion = GetLatestVersion(request.platform);
-
- // 姣旇緝鐗堟湰鍙�
- if (CompareVersion(request.version, latestVersion.Version) < 0)
- {
- // 闇�瑕佹洿鏂�
- return new ResponseResult
- {
- status = 0,
- message = "鍙戠幇鏂扮増鏈�",
- data = new
- {
- hasUpdate = true,
- version = latestVersion.Version,
- updateInfo = latestVersion.UpdateInfo,
- wgtUrl = latestVersion.WgtUrl,
- isForceUpdate = latestVersion.IsForceUpdate
- }
- };
- }
- else
- {
- // 涓嶉渶瑕佹洿鏂�
- return new ResponseResult
- {
- status = 0,
- message = "褰撳墠宸叉槸鏈�鏂扮増鏈�",
- data = new { hasUpdate = false }
- };
- }
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- // 鑾峰彇鏈�鏂扮増鏈俊鎭�
- public VersionInfo GetLatestVersion(string platform)
- {
- // 杩欓噷鍙互浠庢暟鎹簱鎴栭厤缃枃浠朵腑璇诲彇
- // 绀轰緥涓洿鎺ヨ繑鍥炵‖缂栫爜鐨勭増鏈俊鎭�
- return new VersionInfo
- {
- Version = "1.0.1",
- UpdateInfo = "1. 淇浜嗕竴浜涘凡鐭ラ棶棰榎n2. 浼樺寲浜嗙敤鎴蜂綋楠孿n3. 鏂板浜嗕竴浜涘姛鑳�",
- WgtUrl = "https://192.168.1.223:8085/updates/app_update_1.0.1.wgt",
- IsForceUpdate = false
- };
- }
-
- // 姣旇緝鐗堟湰鍙�
- private int CompareVersion(string version1, string version2)
- {
- var v1 = new Version(version1);
- var v2 = new Version(version2);
- return v1.CompareTo(v2);
- }
-}
-
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 32dfbf5..8018592 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 996f0a4..a8a6e39 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.deps.json b/MESApplication/bin/Debug/net8.0/MESApplication.deps.json
index a38b276..95a84e5 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.deps.json
+++ b/MESApplication/bin/Debug/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/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 661da81..9882a54 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 689dc15..bbf23e7 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 6228cea..99b2931 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3