From 48d6e95ff9b972ed1a04741fc7a675c8fbf2c82b Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 25 May 2026 19:46:30 +0800 Subject: [PATCH] 1 --- .../版本日志/SGGLDB_V2026-05-25-gf-002.sql | 2 ++ SGGL/BLL/CLGL/TwInOutplandetailService.cs | 4 ++- SGGL/BLL/CLGL/TwInOutplanmasterService.cs | 21 ++++++++++++--- SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx | 3 +++ .../File/Excel/DataIn/材料入库导入模板.xlsx | Bin 9413 -> 9448 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- SGGL/Model/CLGL/Tw_InputDataIn.cs | 4 +++ SGGL/Model/Model.cs | 24 ++++++++++++++++++ 8 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2026-05-25-gf-002.sql 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 e8b790c00f49d428104b300d46de55608dac085d..cb9dff80fc47e1e9907a6d661ab61e4434b613ad 100644 GIT binary patch delta 2504 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 KY#{i53I73AT#g6; delta 2466 zcmV;T30?N+NySO9;s$?rs02Vj0{{TP2LJ#M0001ZY%h0ja%*C5Z)+}iZEU1f-EPw` z6uw8|9U|XniPNTQqorv52^4LpTK98PX>t>Hv6k4uan?)|Z@?``NZj%aNFd&ZUGNqh zCv8V5LS;m)o#W$t`OZ1taSoo9X=2<^nKQwCg!gP@P#%hi@hg8Hot*||8yUGGJR*tU z)JL~8N6)%XpByZNyq*bhZ2$nzeH1H|d6t!jF-=LnCo;;xGZ!)?3QT!r<(Z@;%414Z znplo)x2%*fj%ox??t&raa~9Hp2#b_*Rf9;H5C!z}m}U72Ee&^pONqQLGBXru1`sor zFm+pjA|nmG(G`CelFSkayTq>yfNlYpm7-7`Fc#4TH2Qt$2{UN20lFZVu`m%vnOuYv~#! z%U+RGS1Lh9LUJ{Xn4*!7_Q4bj`mo?4Ll#-DUMdei&QpT2+lIQ{YA z-TmA5_g}wEC(oZBT~1!StZt?O5_rDVG${z0cC z)M>IHH8p?z`u_JcK@`$kX>qKi0r#W95!7QsZlF4#foR#hBS=4PT=GzQ`0}pNv-|sp zhi$Wmn~vFZ9NX*#xMw!{jiA|gTi6czZy*@i@xRDUHg@T#_f zt`sAwGb)Q93d2cI5-w29Fjtpw$SmWOttH)+OqiNPv4R+gU+28iEn7)1p(}}c+*Map zmK9KJc)`udks`08^ZTukifjtl_Ysc>^^OX@5&YuTjawghDmhhB%gp$|9Mmxnw?7MJ z0ihk!aQ_$4;8CF1p4$SRsehukg@nf)S9B(e-$*v;$ZWdQe8CEQP?R z9l$aYYWSY5SWzVCAsT_i|2QXh4laVu$J2T1@6Jj3tMXEokzHX{vVZu^Qnr>8a36l4qG__1|FWdW@4^h$2q4^&5vb^J9Wj{O-Pg_CHEJi60H zmW?Zyip~&<QjmrXF7e0B0+(ip{4|M~OW;$*2IwILdk;%4Gb03 z6|u)5o?AvcX*XBv#w|Rn2M~g#xV0P(1v=3n+x;?J1ba{-Z4e)Z2;4`khKTDvVm(Am z`-qQ2#Hf$B8zRPi#HS%*)<=9EA|`#r{SXoL5pXWpjDh&Oj9A4TB7n-YU0j!{%Hbw6 zoI(d@QW$$WSkqGl$Gng$DVpohHfTk*>-d2OVD z4sG9Zxa=4d)b=`flBRvJCro#JF8`C@92K*x4?+nJ7@4ocJplj!*#ZCn6abU{BNl(8 zlFv%RKoG|7g72{GNe^~w4dgLxEWrptU+7c%sFgnK^KO>R*tT!*xp z%`M{UHeh710EFx-+Xi4C1+?=mXbQJAMQCX<&R)g}5t>3iluFI7FZ1}SSj5Hj^iOUw zUxv|dwYX2Rn~Sw&7?uxr*N=O8O*je_pwMd-EHl)1?D>f`SS#N=pv?UdY zrRV>7^JnB_wkeC?4UAQlP7#d=3P6iWD!oe4Lp~3uD6o!e$%{%uind_UEIU6-M9oBH z;LcPv7^lDno}?`kb&A%`)eK`R)=+XAd58AmvN9!i{%KaY=Hi8auK>q{OmGQ~OYS&s zfnj|lqCHZIBeH%qMF)@qLjfgdXEBW^{_#36rTw#^QwGjbxoz!t+Q%KTrRc?@dt=qn z*fdSljJg;;KgCar+xu?SQ0ewo0#KGn!Gr>IP;9J&Pscc=tFK$D;%QUO7e^CB%96)6jw z+yVdqg9iWr7ytkO0000000000004B8J0nE_hLeFKKn!{n004MwFLQKxY-N)VBo!MN znXkk>0RRBm0ssIM0000000000000000LYX5BPSav_nov>0RRAA0ssIJ0000000000 g0000005_9ABt8MelYS&U0f&>kBqj##ApigX0P)6amjD0& 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;