1

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.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 =