From 1c71308504530e589b753f18862a3f99149229dc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期六, 23 十一月 2024 15:28:57 +0800
Subject: [PATCH] 合并
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs | 23 ++++++++++++++++-------
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs | 4 ++--
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs | 2 +-
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequestChangeLocation.cs | 2 +-
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs | 2 +-
5 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs
index bb406df..56cc6bf 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs
+++ b/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; }
+
}
}
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs
index 43476b3..7bea047 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs
+++ b/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)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs
index a92f1f7..5a7f73a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs
+++ b/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);
}
}
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequestChangeLocation.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequestChangeLocation.cs
index 94326c4..7db9ba8 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequestChangeLocation.cs
+++ b/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)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs
index 7e287d0..ca5323d 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs
+++ b/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
--
Gitblit v1.9.3