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; }
}

 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; }
    }
}

 MES.Service/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MES.Service/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 MES.Service/service/SysUpdateManager.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
using MES.Service.DB;
using MES.Service.Dto.@base;
using MES.Service.Dto.service;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.util;
using Microsoft.Data.SqlClient;
using SqlSugar;
using System.Data;
using System.Dynamic;

namespace MES.Service.service
{
    public class SysUpdateManager : Repository<SysUser>
    {

        // èŽ·å–最新版本信息
        public VersionInfo GetLatestVersion(string platform)
        {
            // è¿™é‡Œå¯ä»¥ä»Žæ•°æ®åº“或配置文件中读取
            // ç¤ºä¾‹ä¸­ç›´æŽ¥è¿”回硬编码的版本信息
            return new VersionInfo
            {
                Version = "1.0.1",
                UpdateInfo = "1. ä¿®å¤äº†ä¸€äº›å·²çŸ¥é—®é¢˜\n2. ä¼˜åŒ–了用户体验\n3. æ–°å¢žäº†ä¸€äº›åŠŸèƒ½",
                WgtUrl = "http://192.168.1.223:8085/updates/app_update_1.0.1.wgt",
                IsForceUpdate = false
            };
        }

        // æ¯”较版本号
        public int CompareVersion(string version1, string version2)
        {
            var v1 = new Version(version1);
            var v2 = new Version(version2);
            return v1.CompareTo(v2);
        }
    }
}

 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

                };


 MESApplication/Controllers/Base/UpdateController.cs

@@ -11,6 +11,11 @@
[Route("api/[controller]")]
public class UpdateController : ControllerBase
{


    private readonly SysUpdateManager _sysUpdateManager = new SysUpdateManager();


    [HttpPost]
    [Route("checkUpdate")]
    public ResponseResult CheckUpdate([FromBody] UpdateCheckRequest request)
@@ -18,10 +23,10 @@
        try
        {
            // ä»Žé…ç½®æ–‡ä»¶æˆ–数据库获取最新版本信息
            var latestVersion = GetLatestVersion(request.platform);
            var latestVersion = _sysUpdateManager.GetLatestVersion(request.platform);

            // æ¯”较版本号
            if (CompareVersion(request.version, latestVersion.Version) < 0)
            if (_sysUpdateManager.CompareVersion(request.version, latestVersion.Version) < 0)
            {
                // éœ€è¦æ›´æ–°
                return new ResponseResult
@@ -55,26 +60,6 @@
        }
    }

    // èŽ·å–最新版本信息
    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);
    }
   
}


 MESApplication/bin/Debug/net8.0/MES.Service.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MES.Service.pdb

Binary files differ

 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"
          }
        }
      }
    }

 MESApplication/bin/Debug/net8.0/MESApplication.dll

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.exe

Binary files differ

 MESApplication/bin/Debug/net8.0/MESApplication.pdb

Binary files differ