添加AGV的响应

tjx

2025-11-13 7669bf01b27e194873a62fe1a101412485cdbe42

添加AGV的响应

 StandardPda/MES.Service/Dto/service/RackingTaskResponse.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
namespace MES.Service.Dto.service;

/// <summary>
/// ç«‹ä½“仓库任务响应类
/// </summary>
public class RackingTaskResponse
{
    /// <summary>
    /// è¿”回状态：200代表成功，500代表失败
    /// </summary>
    public string Code { get; set; }

    /// <summary>
    /// æ¶ˆæ¯å†…容
    /// </summary>
    public string? JsonMessage { get; set; }

    /// <summary>
    /// åé¦ˆç»“果补充说明
    /// </summary>
    public string? CodeMessage { get; set; }

    /// <summary>
    /// åˆ›å»ºæˆåŠŸå“åº”
    /// </summary>
    public static RackingTaskResponse Success()
    {
        return new RackingTaskResponse
        {
            Code = "200",
            JsonMessage = null,
            CodeMessage = null
        };
    }

    /// <summary>
    /// åˆ›å»ºå¤±è´¥å“åº”
    /// </summary>
    /// <param name="codeMessage">错误消息</param>
    public static RackingTaskResponse Fail(string codeMessage)
    {
        return new RackingTaskResponse
        {
            Code = "500",
            JsonMessage = null,
            CodeMessage = codeMessage
        };
    }
}

 StandardPda/MES.Service/Dto/service/TaskCompleteReportDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
namespace MES.Service.Dto.service;

/// <summary>
/// ä»»åŠ¡å®Œæˆä¸ŠæŠ¥è¯·æ±‚参数
/// </summary>
public class TaskCompleteReportDto
{
    /// <summary>
    /// ä»»åŠ¡ç±»åž‹ï¼š1-物料出库 / 2-物料入库 / 3-空托盘出库 / 7-腾挪库位
    /// </summary>
    public string TaskType { get; set; }

    /// <summary>
    /// ä»»åŠ¡å·ï¼ˆä½œä¸šç¼–号），全局唯一，用于防重
    /// </summary>
    public string TaskCode { get; set; }

    /// <summary>
    /// æ‰˜ç›˜ç¼–码
    /// </summary>
    public string PalletCode { get; set; }

    /// <summary>
    /// åº“位编码，格式如"010203"，代表1排2层3列
    /// </summary>
    public string? LocCode { get; set; }
}

 StandardPda/MES.Service/Dto/service/TaskErrorReportDto.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
namespace MES.Service.Dto.service;

/// <summary>
/// å¼‚常任务上报请求参数
/// </summary>
public class TaskErrorReportDto
{
    /// <summary>
    /// ä»»åŠ¡ç±»åž‹ï¼š1-物料出库 / 2-物料入库 / 3-空托盘出库 / 7-腾挪库位
    /// </summary>
    public string TaskType { get; set; }

    /// <summary>
    /// ä»»åŠ¡å·ï¼ˆä½œä¸šç¼–号），全局唯一，用于防重
    /// </summary>
    public string? TaskCode { get; set; }

    /// <summary>
    /// æ‰˜ç›˜ç¼–码
    /// </summary>
    public string PalletCode { get; set; }

    /// <summary>
    /// å¼‚常代码
    /// </summary>
    public string ErrorCode { get; set; }

    /// <summary>
    /// å¼‚常描述，如"入库未检出MES入库任务"
    /// </summary>
    public string ErrorMessage { get; set; }
}

 StandardPda/MES.Service/Modes/XbRackingTaskSyxtLog.cs

@@ -11,115 +11,114 @@
    /// <summary>
    ///     ä¸»é”®ID
    /// </summary>
    [SugarColumn(IsPrimaryKey = true, IsNullable = false,
        ColumnDataType = "NUMBER(20)")]
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 30, ColumnDataType = "VARCHAR2")]
    public string CreateBy { get; set; }
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }

    /// <summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    [SugarColumn(IsNullable = true, ColumnDataType = "DATE")]
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }

    /// <summary>
    ///     ä»»åŠ¡å·
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
    public string TaskCode { get; set; }
    [SugarColumn(ColumnName = "TASKCODE")]
    public string? TaskCode { get; set; }

    /// <summary>
    ///     ä»»åŠ¡ä¸‹å‘类型
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
    public string TaskType { get; set; }
    [SugarColumn(ColumnName = "TASKTYPE")]
    public string? TaskType { get; set; }

    /// <summary>
    ///     æ‰˜ç›˜
    /// </summary>
    [SugarColumn(IsNullable = false, Length = 50, ColumnDataType = "VARCHAR2")]
    public string PalletCode { get; set; }
    [SugarColumn(ColumnName = "PALLETCODE")]
    public string? PalletCode { get; set; }

    /// <summary>
    ///     è´§ç‰©ç±»åž‹
    /// </summary>
    [SugarColumn(IsNullable = true, ColumnDataType = "NUMBER(20)")]
    [SugarColumn(ColumnName = "WIDTHTYPE")]
    public decimal? WidthType { get; set; }

    /// <summary>
    ///     ç‰©æ–™åç§°
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 100, ColumnDataType = "VARCHAR2")]
    public string MaterialName { get; set; }
    [SugarColumn(ColumnName = "MATERIALNAME")]
    public string? MaterialName { get; set; }

    /// <summary>
    ///     ç‰©æ–™ç¼–码
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
    public string MaterialCode { get; set; }
    [SugarColumn(ColumnName = "MATERIALCODE")]
    public string? MaterialCode { get; set; }

    /// <summary>
    ///     æ‰¹å·
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
    public string BatchNo { get; set; }
    [SugarColumn(ColumnName = "BATCHNO")]
    public string? BatchNo { get; set; }

    /// <summary>
    ///     æ•°é‡
    /// </summary>
    [SugarColumn(IsNullable = true, ColumnDataType = "NUMBER(20)")]
    [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }

    /// <summary>
    ///     ä»»åŠ¡ä¸‹å‘接收数据
    /// </summary>
    [SugarColumn(IsNullable = true, ColumnDataType = "CLOB")]
    public string WarehousingJson { get; set; }
    [SugarColumn(ColumnName = "WAREHOUSINGJSON")]
    public string? WarehousingJson { get; set; }

    /// <summary>
    ///     å·¥ä½ç‚¹
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
    public string Station { get; set; }
    [SugarColumn(ColumnName = "STATION")]
    public string? Station { get; set; }

    /// <summary>
    ///     ä»»åŠ¡ä¸ŠæŠ¥ç±»åž‹
    ///     200代表成功500代表失败
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
    public string TaskReporting { get; set; }
    [SugarColumn(ColumnName = "CODE")]
    public string? Code { get; set; }

    /// <summary>
    ///     åº“位
    ///     æ¶ˆæ¯å†…容
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 20, ColumnDataType = "VARCHAR2")]
    public string LocCode { get; set; }
    [SugarColumn(ColumnName = "JSON_MESSAGE")]
    public string? JsonMessage { get; set; }

    /// <summary>
    ///     å¼‚常代码
    ///  åé¦ˆç»“果补充说明
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
    public string ErrorCode { get; set; }
    [SugarColumn(ColumnName = "CODE_MESSAGE")]
    public string? CodeMessage { get; set; }

    /// <summary>
    ///     å¼‚常描述
    ///     è¡¥å……
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 200, ColumnDataType = "VARCHAR2")]
    public string ErrorMessage { get; set; }
    [SugarColumn(ColumnName = "DATA")]
    public string? Data { get; set; }

    /// <summary>
    ///     ä»»åŠ¡ä¸ŠæŠ¥æŽ¥æ”¶æ•°æ®
    ///     åº“位编码
    /// </summary>
    [SugarColumn(IsNullable = true, ColumnDataType = "CLOB")]
    public string MissionAccomplishedJson { get; set; }
    [SugarColumn(ColumnName = "LOCCODE")]
    public string? LocCode { get; set; }

    /// <summary>
    ///     ä¸šåŠ¡ç±»åž‹
    ///     åº“位中文名称
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 50, ColumnDataType = "VARCHAR2")]
    public string BusinessType { get; set; }
    [SugarColumn(ColumnName = "LOCCODECHINESE")]
    public string? LocCodeChinese { get; set; }
}

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

Binary files differ

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

Binary files differ

 StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs

@@ -13,7 +13,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("MES.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+57662120d41592f254774481da29564b13bea668")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2f4699ff377f0e5ea3640bb3670b2fbfbd56e3fb")]
[assembly: System.Reflection.AssemblyProductAttribute("MES.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("MES.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

 StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache

@@ -1 +1 @@
5eae2084e55f96a3076bd26c01f56fc0fab68bf99259ce5863a14d2759ac4463
c3f4f60d7b6bc5390bec43453c02cc2c29f88ae1aeb63688e1ced88dd7b1f25e

 StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
a0b3039662d1bcbbbfc359fabc1d47d26d83a488101d74ab9555387ee29ea216
90c59daba423ab99b975f1b940bfb188cb86bd529d474e078c4429165ad694ea

 StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll

Binary files differ

 StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb

Binary files differ

 StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll

Binary files differ

 StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll

Binary files differ

 StandardPda/MES.Service/service/Warehouse/XbRackingTaskSyxtLogManager.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,134 @@
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;

namespace MES.Service.service.Warehouse;

public class XbRackingTaskSyxtLogManager : Repository<XbRackingTaskSyxtLog>
{
    /// <summary>
    /// ä»»åŠ¡å®Œæˆä¸ŠæŠ¥
    /// </summary>
    /// <param name="dto">任务完成上报参数</param>
    /// <returns>统一响应结果</returns>
    public RackingTaskResponse TaskCompleteReport(TaskCompleteReportDto dto)
    {
        try
        {
            // æ­¥éª¤1：验证任务号是否存在
            var task = Context.Queryable<XbRackingTaskSyxtLog>()
                .Where(t => t.TaskCode == dto.TaskCode)
                .First();

            if (task == null)
            {
                return RackingTaskResponse.Fail($"任务号[{dto.TaskCode}]不存在");
            }

            // æ­¥éª¤2：验证托盘编码是否匹配
            if (task.PalletCode != dto.PalletCode)
            {
                return RackingTaskResponse.Fail($"托盘编码不匹配，期望[{task.PalletCode}]，实际[{dto.PalletCode}]");
            }

            // æ­¥éª¤3：转换库位编码为中文
            string? locCodeChinese = null;
            if (!string.IsNullOrEmpty(dto.LocCode))
            {
                // éªŒè¯åº“位编码格式
                if (dto.LocCode.Length != 6 || !dto.LocCode.All(char.IsDigit))
                {
                    return RackingTaskResponse.Fail("库位编码格式错误，应为6位数字");
                }

                // è½¬æ¢åº“位编码
                locCodeChinese = ConvertLocCodeToChinese(dto.LocCode);
            }

            // æ­¥éª¤4：更新任务日志表
            var updateResult = Context.Updateable<XbRackingTaskSyxtLog>()
                .SetColumns(t => t.LocCode == dto.LocCode)
                .SetColumns(t => t.LocCodeChinese == locCodeChinese)
                .SetColumns(t => t.Code == "200")
                .SetColumns(t => t.JsonMessage == "任务完成")
                .SetColumns(t => t.CodeMessage == "任务完成")
                .Where(t => t.TaskCode == dto.TaskCode)
                .ExecuteCommand();

            if (updateResult <= 0)
            {
                return RackingTaskResponse.Fail("更新任务日志失败");
            }

            return RackingTaskResponse.Success();
        }
        catch (Exception ex)
        {
            return RackingTaskResponse.Fail($"更新任务日志失败：{ex.Message}");
        }
    }

    /// <summary>
    /// å°†åº“位编码转换为中文描述
    /// </summary>
    /// <param name="locCode">库位编码，格式如"010203"</param>
    /// <returns>中文描述，格式如"1排2层3列"</returns>
    private string ConvertLocCodeToChinese(string locCode)
    {
        // è§£æžæŽ’号（前两位）
        int row = int.Parse(locCode.Substring(0, 2));
        // è§£æžå±‚号（中间两位）
        int level = int.Parse(locCode.Substring(2, 2));
        // è§£æžåˆ—号（后两位）
        int column = int.Parse(locCode.Substring(4, 2));

        return $"{row}排{level}层{column}列";
    }


    /// <summary>
    /// å¼‚常任务上报
    /// </summary>
    /// <param name="dto">异常任务上报参数</param>
    /// <returns>统一响应结果</returns>
    public RackingTaskResponse TaskErrorReport(TaskErrorReportDto dto)
    {
        try
        {
            // æ­¥éª¤1：验证任务号是否存在
            var task = Context.Queryable<XbRackingTaskSyxtLog>()
                .Where(t => t.TaskCode == dto.TaskCode)
                .First();

            if (task == null)
            {
                return RackingTaskResponse.Fail($"任务号[{dto.TaskCode}]不存在");
            }

            // æ­¥éª¤2：验证托盘编码是否匹配
            if (task.PalletCode != dto.PalletCode)
            {
                return RackingTaskResponse.Fail($"托盘编码不匹配，期望[{task.PalletCode}]，实际[{dto.PalletCode}]");
            }

            // æ­¥éª¤3：更新任务日志表
            var updateResult = Context.Updateable<XbRackingTaskSyxtLog>()
                .SetColumns(t => t.Code == "500")
                .SetColumns(t => t.JsonMessage == dto.ErrorMessage)
                .SetColumns(t => t.CodeMessage == dto.ErrorMessage)
                .Where(t => t.TaskCode == dto.TaskCode)
                .ExecuteCommand();

            if (updateResult <= 0)
            {
                return RackingTaskResponse.Fail("更新任务日志失败");
            }

            return RackingTaskResponse.Success();
        }
        catch (Exception ex)
        {
            return RackingTaskResponse.Fail($"更新任务日志失败：{ex.Message}");
        }
    }
}

 StandardPda/MESApplication/Controllers/Warehouse/XbRackingTaskSyxtLogController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,276 @@
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;

namespace MESApplication.Controllers.Warehouse;

[ApiController]
[Route("api/[controller]")]
public class XbRackingTaskSyxtLogController : ControllerBase
{
    private readonly MessageCenterManager _manager = new();

    private readonly XbRackingTaskSyxtLogManager m = new();

    private readonly string METHOD = "POST";

    private readonly string TableName = "xb_racking_task_syxt_log";

    private readonly string URL = "http://localhost:10054/api/XbRackingTaskSyxtLog/";


    /***进入模版管理可以修改模版***/

    /// <summary>
    ///     èŽ·å–所有
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetList")]
    public ResponseResult GetList()
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetList();
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }


    /// <summary>
    ///     æ ¹æ®ä¸»é”®èŽ·å–
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetById")]
    public ResponseResult GetById(decimal id)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetById(id);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     æ ¹æ®ä¸»é”®åˆ é™¤
    /// </summary>
    /// <returns></returns>
    [HttpPost("DeleteByIds")]
    public ResponseResult DeleteByIds([FromBody] object[] ids)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.DeleteByIds(ids);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     æ·»åŠ 
    /// </summary>
    /// <returns></returns>
    [HttpPost("Insert")]
    public ResponseResult Add([FromBody] XbRackingTaskSyxtLog data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.Insert(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     æ·»åŠ è¿”回自增
    /// </summary>
    /// <returns></returns>
    [HttpPost("InsertReturnIdentity")]
    public ResponseResult InsertReturnIdentity(
        [FromBody] XbRackingTaskSyxtLog data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.InsertReturnIdentity(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     ä¿®æ”¹
    /// </summary>
    /// <returns></returns>
    [HttpPost("Update")]
    public ResponseResult Update([FromBody] XbRackingTaskSyxtLog data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.Update(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     ä»»åŠ¡å®Œæˆä¸ŠæŠ¥
    /// </summary>
    /// <returns></returns>
    [HttpPost("TaskCompleteReport")]
    public ResponseResult TaskCompleteReport(TaskCompleteReportDto dto)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "TaskCompleteReport";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(dto);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var result = m.TaskCompleteReport(dto);
            resultInfos.tbBillList = result;

            entity.Result = 0;
            if (result.Code == "200") entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);

            if (result.Code == "200")
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };

            return new ResponseResult
            {
                status = 1,
                message = result.CodeMessage,
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);

            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     å¼‚常任务上报
    /// </summary>
    /// <returns></returns>
    [HttpPost("TaskErrorReport")]
    public ResponseResult TaskErrorReport(TaskErrorReportDto dto)
    {
        var entity = new MessageCenter();
        entity.TableName = TableName;
        entity.Url = URL + "TaskErrorReport";
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(dto);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var result = m.TaskErrorReport(dto);
            resultInfos.tbBillList = result;

            entity.Result = 0;
            if (result.Code == "200") entity.Result = 1;
            entity.DealWith = 1;
            _manager.save(entity);

            if (result.Code == "200")
                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos
                };

            return new ResponseResult
            {
                status = 1,
                message = result.CodeMessage,
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            entity.Result = 0;
            entity.DealWith = 0;
            entity.ResultData = ex.Message;
            _manager.save(entity);

            return ResponseResult.ResponseError(ex);
        }
    }
}

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml

@@ -651,7 +651,7 @@
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.Save(MES.Service.Dto.webApi.ErpSalesOrder)">
            <summary>
            é”€å”®è®¢å•ï¼ˆU9预测订单）
                é”€å”®è®¢å•ï¼ˆU9预测订单）
            </summary>
            <param name="salesOrder"></param>
            <returns></returns>
@@ -694,7 +694,7 @@
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.Save(MES.Service.Dto.webApi.ErpSalesRerurn)">
            <summary>
            é€€è´§é€šçŸ¥å•
                é€€è´§é€šçŸ¥å•
            </summary>
            <param name="salesOrder"></param>
            <returns></returns>
@@ -773,44 +773,44 @@
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Save(MES.Service.Dto.webApi.ErpSalesDelivery)">
            <summary>
            é”€å”®äº¤ä»˜é€šçŸ¥ï¼ˆU9标准销售）
                é”€å”®äº¤ä»˜é€šçŸ¥ï¼ˆU9标准销售）
            </summary>
            <param name="salesOrder"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetList">
            <summary>
            èŽ·å–所有
                èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetById(System.Int32)">
            <summary>
            æ ¹æ®ä¸»é”®èŽ·å–
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.DeleteByIds(System.Object[])">
            <summary>
            æ ¹æ®ä¸»é”®åˆ é™¤
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
            æ·»åŠ  
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
            æ·»åŠ è¿”回自增
                æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
            ä¿®æ”¹
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
@@ -1193,34 +1193,70 @@
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.womdaaController.GetTickeInfo(MES.Service.Dto.service.CCLoginDto)">
             <summary>
            æ ¹æ®äº§æµ‹ç™»å½•å·èŽ·å–产线相关工单信息
             </summary>
             <returns></returns>
            <summary>
                æ ¹æ®äº§æµ‹ç™»å½•å·èŽ·å–产线相关工单信息
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.womdaaController.AddAsnInfo(MES.Service.Dto.service.AsnInfo)">
             <summary>
            å­˜å‚¨äº§æµ‹è¿‡ç«™ä¿¡æ¯
             </summary>
             <returns></returns>
            <summary>
                å­˜å‚¨äº§æµ‹è¿‡ç«™ä¿¡æ¯
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.womdaaController.SetMediumBoxCode(MES.Service.Dto.service.MesMiddleBox)">
             <summary>
            è®¾ç½®ä¸­ç®±ç 
             </summary>
             <returns></returns>
            <summary>
                è®¾ç½®ä¸­ç®±ç 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.womdaaController.SetStackCode(MES.Service.Dto.service.MesPalletBinding)">
             <summary>
            è®¾ç½®æ ˆæ¿ç 
             </summary>
             <returns></returns>
            <summary>
                è®¾ç½®æ ˆæ¿ç 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.womdaaController.UnbindAsnInfo(MES.Service.Dto.service.UnbindAsnInfoDto)">
             <summary>
            è§£ç»‘sn码
             </summary>
             <returns></returns>
            <summary>
                è§£ç»‘sn码
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.GetList">
            <summary>
                èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.GetById(System.Decimal)">
            <summary>
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.DeleteByIds(System.Object[])">
            <summary>
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.Add(MES.Service.Modes.XbRackingTaskSyxtLog)">
            <summary>
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.InsertReturnIdentity(MES.Service.Modes.XbRackingTaskSyxtLog)">
            <summary>
                æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.Update(MES.Service.Modes.XbRackingTaskSyxtLog)">
            <summary>
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomcaaController.GetList">
            <summary>

 StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json

@@ -11,7 +11,8 @@
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 122.226.249.238 )(PORT = 5936))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xb_prd; Password=xbprd",
    "U9IP": "192.168.1.66:45798" //U9服务器IP地址,小步正式
    "U9IP": "192.168.1.66:45798"
    //U9服务器IP地址,小步正式
    //"U9IP": "192.168.1.66:45797" //U9服务器IP地址,小步测试
  }
}

 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs

@@ -13,7 +13,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("MESApplication")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+57662120d41592f254774481da29564b13bea668")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2f4699ff377f0e5ea3640bb3670b2fbfbd56e3fb")]
[assembly: System.Reflection.AssemblyProductAttribute("MESApplication")]
[assembly: System.Reflection.AssemblyTitleAttribute("MESApplication")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache

@@ -1 +1 @@
b2fccb4cd2cdf4462bf862716ec574fbc0a777d08afc11e61b581f8f5a67250e
8c5dd14083bb7d88e6dc7583bcc3d8f10f5799e6f6c66b02a99f949f47aa977a

 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache

Binary files differ

 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
e69ebffd9b97996fa0fc7420689e44ace2d59bf02a826037d68dfbce1e6e2f0a
f223c14a236ed82552fd69736622a648752037047e48466dd45ac3f12f630ca2

 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll

Binary files differ

 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb

Binary files differ

 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml

@@ -651,7 +651,7 @@
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesOrderController.Save(MES.Service.Dto.webApi.ErpSalesOrder)">
            <summary>
            é”€å”®è®¢å•ï¼ˆU9预测订单）
                é”€å”®è®¢å•ï¼ˆU9预测订单）
            </summary>
            <param name="salesOrder"></param>
            <returns></returns>
@@ -694,7 +694,7 @@
        </member>
        <member name="M:MESApplication.Controllers.BasicData.SalesReturnNoticeController.Save(MES.Service.Dto.webApi.ErpSalesRerurn)">
            <summary>
            é€€è´§é€šçŸ¥å•
                é€€è´§é€šçŸ¥å•
            </summary>
            <param name="salesOrder"></param>
            <returns></returns>
@@ -773,44 +773,44 @@
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Save(MES.Service.Dto.webApi.ErpSalesDelivery)">
            <summary>
            é”€å”®äº¤ä»˜é€šçŸ¥ï¼ˆU9标准销售）
                é”€å”®äº¤ä»˜é€šçŸ¥ï¼ˆU9标准销售）
            </summary>
            <param name="salesOrder"></param>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetList">
            <summary>
            èŽ·å–所有
                èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.GetById(System.Int32)">
            <summary>
            æ ¹æ®ä¸»é”®èŽ·å–
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.DeleteByIds(System.Object[])">
            <summary>
            æ ¹æ®ä¸»é”®åˆ é™¤
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Add(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
            æ·»åŠ  
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.InsertReturnIdentity(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
            æ·»åŠ è¿”回自增
                æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.SalesDeliveryNoticeController.Update(MES.Service.Modes.SalesDeliveryNotice)">
            <summary>
            ä¿®æ”¹
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
@@ -1193,34 +1193,70 @@
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.womdaaController.GetTickeInfo(MES.Service.Dto.service.CCLoginDto)">
             <summary>
            æ ¹æ®äº§æµ‹ç™»å½•å·èŽ·å–产线相关工单信息
             </summary>
             <returns></returns>
            <summary>
                æ ¹æ®äº§æµ‹ç™»å½•å·èŽ·å–产线相关工单信息
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.womdaaController.AddAsnInfo(MES.Service.Dto.service.AsnInfo)">
             <summary>
            å­˜å‚¨äº§æµ‹è¿‡ç«™ä¿¡æ¯
             </summary>
             <returns></returns>
            <summary>
                å­˜å‚¨äº§æµ‹è¿‡ç«™ä¿¡æ¯
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.womdaaController.SetMediumBoxCode(MES.Service.Dto.service.MesMiddleBox)">
             <summary>
            è®¾ç½®ä¸­ç®±ç 
             </summary>
             <returns></returns>
            <summary>
                è®¾ç½®ä¸­ç®±ç 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.womdaaController.SetStackCode(MES.Service.Dto.service.MesPalletBinding)">
             <summary>
            è®¾ç½®æ ˆæ¿ç 
             </summary>
             <returns></returns>
            <summary>
                è®¾ç½®æ ˆæ¿ç 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.womdaaController.UnbindAsnInfo(MES.Service.Dto.service.UnbindAsnInfoDto)">
             <summary>
            è§£ç»‘sn码
             </summary>
             <returns></returns>
            <summary>
                è§£ç»‘sn码
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.GetList">
            <summary>
                èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.GetById(System.Decimal)">
            <summary>
                æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.DeleteByIds(System.Object[])">
            <summary>
                æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.Add(MES.Service.Modes.XbRackingTaskSyxtLog)">
            <summary>
                æ·»åŠ 
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.InsertReturnIdentity(MES.Service.Modes.XbRackingTaskSyxtLog)">
            <summary>
                æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.XbRackingTaskSyxtLogController.Update(MES.Service.Modes.XbRackingTaskSyxtLog)">
            <summary>
                ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomcaaController.GetList">
            <summary>

 StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe

Binary files differ

 StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll

Binary files differ

 StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll

Binary files differ