合并

刘磊

2024-11-23 1c71308504530e589b753f18862a3f99149229dc

合并

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs

@@ -17,16 +17,11 @@

using Magicodes.ExporterAndImporter.Core;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Core.DB.Models;

namespace WIDESEAWCS_Model.Models
{
    [SugarTable(nameof(Dt_StationManager), "任务信息")]
    [SugarTable(nameof(Dt_StationManager), "站台信息")]
    public class Dt_StationManager : BaseEntity
    {
        /// <summary>
@@ -38,7 +33,7 @@
        public int stationID { get; set; }

        /// <summary>
        /// 站台类型
        /// 站台类型  1-入库站台 2-出库站台 3-异常排出站台 4-NG工站放料 5-NG工站取料 6-空框入库 7-空框出库
        /// </summary>
        [ImporterHeader(Name = "站台类型")]
        [ExporterHeader(DisplayName = "站台类型")]
@@ -100,5 +95,19 @@
        [ExporterHeader(DisplayName = "MOM设备编号")]
        [SugarColumn(IsNullable = false, ColumnDescription = "MOM设备编号")]
        public string stationEquipMOM { get; set; }

        /// <summary>
        /// 
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "NG子设备编号")]
        public string stationNGChildCode { get; set; }

        /// <summary>
        /// 
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "NG子设备坐标")]
        public string stationNGLocation { get; set; }
        public string remark { get; set; }

    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs

@@ -36,7 +36,7 @@


                LogFactory.GetLog("分容库位同步").Info(true, $"\r\r--------------------------------------");
                LogFactory.GetLog("分容库位同步）").Info(true, json);
                LogFactory.GetLog("分容库位同步").Info(true, json);
                return content.OK();
            }
            catch (Exception ex)

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs

@@ -122,13 +122,13 @@
                //    TaskState = (int)TaskOutStatusEnum.OutNew,
                //};
                LogFactory.GetLog("分容测试完成通知").Info(true, $"\r\r--------------------------------------");
                LogFactory.GetLog("分容测试完成通知）").Info(true, result);
                LogFactory.GetLog("分容测试完成通知").Info(true, result);
                return content.OK();
            }
            catch (Exception ex)
            {
                LogFactory.GetLog("分容测试完成通知").Info(true, $"\r\r--------------------------------------");
                LogFactory.GetLog("分容测试完成通知）").Info(true, ex.Message);
                LogFactory.GetLog("分容测试完成通知").Info(true, ex.Message);
                return content.Error(ex.Message);
            }
        }

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequestChangeLocation.cs

@@ -29,7 +29,7 @@


                LogFactory.GetLog("分容移库申请").Info(true, $"\r\r--------------------------------------");
                LogFactory.GetLog("分容移库申请）").Info(true, result);
                LogFactory.GetLog("分容移库申请").Info(true, result);
                return content.OK();
            }
            catch (Exception ex)

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs

@@ -30,7 +30,7 @@
                if (info != null)
                {
                    LogFactory.GetLog("分容获取库位托盘").Info(true, $"\r\r--------------------------------------");
                    LogFactory.GetLog("分容获取库位托盘）").Info(true, result);
                    LogFactory.GetLog("分容获取库位托盘").Info(true, result);
                    return new { code = 1, palletBarcode = info.PalletCode };
                }
                else