1

DataBase/版本日志/SGGLDB_V2026-05-25-gf-002.sql

@@ -0,0 +1,2 @@
+alter table Tw_InOutPlanDetail add DeliveryDate datetime null
+GO

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

SGGL/BLL/CLGL/TwInOutplanmasterService.cs

@@ -275,9 +275,9 @@ namespace BLL
             {
                 //if (temeplateDtoIns.Count == 0)
                 //{
-                    responeData.code = 0;
+                responeData.code = 0;
-                    responeData.message = errorWarehouseCode + "仓库不存在！";
+                responeData.message = errorWarehouseCode + "仓库不存在！";
-                    return responeData;
+                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 =

SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx

@@ -176,6 +176,9 @@
                                         <f:RenderField Width="100px" ColumnID="PlanNum" DataField="PlanNum" SortField="PlanNum"
                                             FieldType="String" HeaderText="数量" TextAlign="Left" HeaderTextAlign="Center">
                                         </f:RenderField> 
+                                        <f:RenderField Width="100px" ColumnID="DeliveryDate" DataField="DeliveryDate" SortField="DeliveryDate" Renderer="Date"
+                                            RendererArgument="yyyy-MM-dd" FieldType="Date" HeaderText="到货时间" TextAlign="Left" HeaderTextAlign="Center">
+                                        </f:RenderField>
                                     </Columns> 
                                 </f:Grid>
                             </Items>

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -17034,7 +17034,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

SGGL/Model/CLGL/Tw_InputDataIn.cs

@@ -48,6 +48,10 @@ namespace Model
         /// 类型
         /// </summary>
         [ExcelColumnIndex("J")] public string TypeString { get; set; }
+        /// <summary>
+        /// 到货时间
+        /// </summary>
+        [ExcelColumnIndex("K")] public string DeliveryDate { get; set; }
 
     }
 }

SGGL/Model/Model.cs

@@ -275636,6 +275636,8 @@ namespace Model
 		
 		private string _BatchNo;
 		
+		private System.Nullable<System.DateTime> _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<System.DateTime> 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<System.DateTime> 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;