diff --git a/DataBase/版本日志/SGGLDB_V2026-05-25-gf-002.sql b/DataBase/版本日志/SGGLDB_V2026-05-25-gf-002.sql new file mode 100644 index 00000000..37c51ebd --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-05-25-gf-002.sql @@ -0,0 +1,2 @@ +alter table Tw_InOutPlanDetail add DeliveryDate datetime null +GO \ No newline at end of file diff --git a/SGGL/BLL/CLGL/TwInOutplandetailService.cs b/SGGL/BLL/CLGL/TwInOutplandetailService.cs index 0b88df79..618579b3 100644 --- a/SGGL/BLL/CLGL/TwInOutplandetailService.cs +++ b/SGGL/BLL/CLGL/TwInOutplandetailService.cs @@ -51,6 +51,7 @@ namespace BLL MaterialName = mat.MaterialName, MaterialDef = mat.MaterialDef, StockNum = stock.StockNum ?? 0, + DeliveryDate = x.DeliveryDate, } ; @@ -123,7 +124,8 @@ namespace BLL ActNum = item.ActNum, SortIndex = sortIndex, HeatNo = item.HeatNo, - BatchNo = item.BatchNo + BatchNo = item.BatchNo, + DeliveryDate = item.DeliveryDate }; sortIndex++; details.Add(table); diff --git a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs index 679af536..00a63c23 100644 --- a/SGGL/BLL/CLGL/TwInOutplanmasterService.cs +++ b/SGGL/BLL/CLGL/TwInOutplanmasterService.cs @@ -275,9 +275,9 @@ namespace BLL { //if (temeplateDtoIns.Count == 0) //{ - responeData.code = 0; - responeData.message = errorWarehouseCode + "仓库不存在!"; - return responeData; + responeData.code = 0; + responeData.message = errorWarehouseCode + "仓库不存在!"; + return responeData; //} } var typeString = temeplateDtoIns.Select(x => x.TypeString).Distinct().ToList(); //获取导入文件的类型 @@ -293,7 +293,20 @@ namespace BLL responeData.message = errorWarehouseCode + "每次只能导入一种类型!"; return responeData; } - + var dateTypeString = temeplateDtoIns.Select(x => x.DeliveryDate).Distinct().ToList(); //获取导入文件的类型 + foreach (var item in dateTypeString) + { + try + { + DateTime date = Convert.ToDateTime(item); + } + catch (Exception) + { + responeData.code = 0; + responeData.message = errorWarehouseCode + "到货时间[" + item + "]格式错误!"; + return responeData; + } + } //var materialCodeList = temeplateDtoIns.Select(x => x.MaterialCode).Distinct().ToList(); //获取导入文件的材料编码 //var IsExitMaterialCode = diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx index 8912c95a..69886fb7 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx @@ -176,6 +176,9 @@ + + diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx index e8b790c0..cb9dff80 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/材料入库导入模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 8bc11dec..4637a5cb 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -17034,7 +17034,7 @@ - + diff --git a/SGGL/Model/CLGL/Tw_InputDataIn.cs b/SGGL/Model/CLGL/Tw_InputDataIn.cs index 712d5080..c681a0b7 100644 --- a/SGGL/Model/CLGL/Tw_InputDataIn.cs +++ b/SGGL/Model/CLGL/Tw_InputDataIn.cs @@ -48,6 +48,10 @@ namespace Model /// 类型 /// [ExcelColumnIndex("J")] public string TypeString { get; set; } + /// + /// 到货时间 + /// + [ExcelColumnIndex("K")] public string DeliveryDate { get; set; } } } \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 57c7ffbe..8e6ba4ee 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -275636,6 +275636,8 @@ namespace Model private string _BatchNo; + private System.Nullable _DeliveryDate; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -275658,6 +275660,8 @@ namespace Model partial void OnHeatNoChanged(); partial void OnBatchNoChanging(string value); partial void OnBatchNoChanged(); + partial void OnDeliveryDateChanging(System.Nullable value); + partial void OnDeliveryDateChanged(); #endregion public Tw_InOutPlanDetail() @@ -275845,6 +275849,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeliveryDate", DbType="DateTime")] + public System.Nullable DeliveryDate + { + get + { + return this._DeliveryDate; + } + set + { + if ((this._DeliveryDate != value)) + { + this.OnDeliveryDateChanging(value); + this.SendPropertyChanging(); + this._DeliveryDate = value; + this.SendPropertyChanged("DeliveryDate"); + this.OnDeliveryDateChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged;