From 9d15d18079f99199f84f4e12ad6b55e30738f1c3 Mon Sep 17 00:00:00 2001 From: "xueyu.liu" Date: Thu, 28 Apr 2022 18:42:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E8=AE=BE=E7=BD=AE=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=9F=BA=E7=A1=80=E6=98=BE=E7=A4=BA=E3=80=82=20?= =?UTF-8?q?=E8=BF=98=E6=9C=89=E9=9C=80=E8=A6=81=E4=BC=98=E5=8C=96=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Stone.Common.Dlls/Stone.Entity.dll | Bin 23040 -> 23040 bytes .../Stone.Entity/Entity_t_ErrTypeLevel.cs | 27 +++++ .../Stone.Entity/Stone.Entity.csproj | 1 + .../Stone.WinBiz/BasicData/F_ErrTypeLevel.cs | 93 ++++++++++++++++++ .../Stone.WinBiz/Stone.WinBiz.csproj | 1 + Stone.WinForm/Stone.WinForm/frmMain.cs | 10 ++ .../BasicData/frmErrTypeLevel.Designer.cs | 36 +++++++ .../BasicData/frmErrTypeLevel.cs | 26 +++++ .../Stone.WinModule/Standard/frmJISVDA.cs | 27 ++++- .../Stone.WinModule/Stone.WinModule.csproj | 6 ++ 10 files changed, 223 insertions(+), 4 deletions(-) create mode 100644 Stone.WinForm/Stone.Entity/Entity_t_ErrTypeLevel.cs create mode 100644 Stone.WinForm/Stone.WinBiz/BasicData/F_ErrTypeLevel.cs create mode 100644 Stone.WinForm/Stone.WinModule/BasicData/frmErrTypeLevel.Designer.cs create mode 100644 Stone.WinForm/Stone.WinModule/BasicData/frmErrTypeLevel.cs diff --git a/Stone.WinForm/Stone.Common.Dlls/Stone.Entity.dll b/Stone.WinForm/Stone.Common.Dlls/Stone.Entity.dll index 4bb8033d576a4f97e34c1ec5b39cc3532f34465a..8e06d41badc1da853614556ab4345971c64ca8a8 100644 GIT binary patch delta 5413 zcmchbd2|)k9ml`-<>kIb$cFEcgd}8v>I5v@G}bpaI)Xj@xrs|9T>rAH}hq0)N#o8OR|@sIxN%X#0-=YGF) ze|PS@H*@E0d0uRJUfj3MwP)qv-AS&}zQL#Ficgdf8R7fZ00}C^m8*J0hO4Sg-7YrA z#rA<;jifGw9guTq;IQ+K!}R%AibjgL>j3wgCUWl){#zAuaGWKzOf-1VkhZSH7U`mbt~y1^##Wn*nM}C|YU}DicRmnBZD|c%O?CAD zhJ5vIa{lNV+N9oair!1q=#)frzncouOX8fX+aobI%+f?xz!QmEJXU+XYg4$y3D&1s ztHZ1oA8RV>LT)c~mD9eFtoL!t2G@=-i3^?}b&rfC#w77~w~~cc2@7tnm#{ zna|`;JbvVdTiXv%RN|R1YlnNeB>~p@gQ*&PWvp9h+`@bx5$G8rZ1Sh7|(RVYk5ATGCjh*_%V^` z4yJ36$#ha$$x+B*YV`$7!qLcQ^lC}jGE%SU1|Q#4Z)%9wJQqEW$gYnat(462!~ zaKSOCVLHv;wV1*55f3|nnKsd2OfMa66Jr7II2J8TCYOlC9HwF(cO2T8cCr_bE~ZBI z#-W=ji4P(H3z!O+60w-+1}>k3rA(&<4cnwCypC}jN0YIf={cqp+{AR4k0KSTm;|ij zO~YEIMO=OY)-j!BZz67H`hqDP8<`X*GjJQzJ|;60CgXmNX5n_GqfFTtV2a>q4z@9! z;lbo$JJSJ=HJCiy!}K~+J_eZ*`FIPklj(8mcrghNGP!uR3r#%C_!dWt@EB7AM~m?U z(_=grld+p=0S~PNKV|wgcTO@_!o6O%pAOmu0_ zlyoQP(`blH>~uu4@PzgxvhYhyhRDK4j$}5@Ymb%z@DvOW#t_-aX0prYpj3PGeak_+ zMnmMla71&lReKV-cubQaa&g3w%)<%oNxJ;~O_L$=a1AXGhfh;J#xmKb$;?NwMnmLd zt|MB2W!jS{z-CQ`D8Md9auS}_o}_E)o0<$UiPxvYq6oJ;lEt`3dlJQXN|Paqang~TjQ6!C>0WMrrO^B%=Cu`5HXxh}Pogj%Y1j(`1NReCkL}#~0d@v`~*M z9hs-;C}Oe)Is;R+CuspV-y-vB`5D;ch}PjQN3;%mG#R1}#~sOf{6>4U?#Bg9hN#Dw zvXOb3iSbPKJk3NUlW8CQOe}Up8*q~&+JHMW8KMDu9mz%<)Sg5m-qB=;Mttc=Hi16F z^s>u0A;Bh-Z#hkv#%NDe2+fXY2+K7YB80mg$!0vDJ&9&Kr^yh__^l(^f-~Baw50y; zRigW!AzF}JJ~C0WkjrF`bQT&l8DbVzIFhrmL3WI$8DQ(h| zEzWB)#9TyFjm*&A(~jgK z{84)ni*Q+!Ar@gA{U|hieO!zTCVQS1V}>R}EQWc#Bf13r+LTy=do&qh2@W`t-=ppY zj?wQB0!8$bgNvqhWP5{eWZTMw;s3P+)rz95YO4qL)l883anXv@+RJXYdI-Pj=1@}5 z)7*$=4!u)!r%=ho(sa@F&j+tZAez+rp}0D{x{p~&_ep9$>p4dQ+N(B}Y!j!Owdkd*WiLIy_hRMH(FP@B zfWVou;#KGWRkQQbmk$Lp<{TfoZuT};?w*x5Ewd`P=$%04?D!gbw*l=Pbsfb!jvSbg zvTF7V-y{_sp8Q_#P;8r5M2za=5wWEAsr>eMS8U(zP`en4==?g&HKlMUy8Cl6ILY%r D0F_KJ delta 5246 zcmc(jdvq1m6~@1Plbo9yAPIpa1OiD2ArJBnNyrNb2_(4$$P*Ht3$&)7VuVbUB{HCm zqAn@%2-H`VspFod-fzJ^N0U?S^4hyo$oud z&z!l;J#)7|McbdE-8+4Q?R_^-@onnvdw3}&Yohe9vm1d#o#M;Zos{mox=CM0+Y;Kk zA+LH?AHvWx8|cXgNLRO%_BZ)nA5E9*p}fB>v3Hd>kPh)^;7*W>lmF87o-%unYBv4$l9s{@j>d+ZLHVpdsz?Zzq20I z#S?<`N4=f(EBzbRBpsLF)LqM3rypfqqrXVlL;Lit6NB`Gev9>2I(1Tz-q9ObKiAK) zj@6-wK`PTrSljiTtn2lMtk>)O$b$D@6-28YKUs@m%0SfGxx^MJ4=$fT=>=LJ>$4dPX_kC}aqgONG&xA@r&Lg3aa_oX@sFaJ`g>N2AbWiB7;0 zp>5(Nphc)qyoqQR3YUpaLWfX-P$E_cwMhBNSS@sdoM}(NTA@u&(&i<+SnzHcn2au= zm*gx`utA9644jI~h3ceyD!PTvh&K(Jg+3EX!}o-)mE?465!x%1j;%tEOVZAOEqFvQ z6W0k1%Dl7CD|A{WGXpz??(#d6$;K^0hlFylOUN(da?vMrubgilZWr>&Wy;4sp{FES zVB=1~I*AtI9-$j$EsAiT&y4Nu0REMy6}F=SCTe&I>xV8D0^IXG*`q8yCk&D`*1%0;}8dztK96dANA7fU_SJghUG zLLRmmvM3MxJ;{6=G@e2}jvKNlAOG+q3ovLr1-_MzFBn;<0+b553ss03<0%wkjUkH) zah)ewgk8o{D8j>rEGoilp5#pY$#{ytrtQxSS~L?A3P%>I7}JE@g(}8eLlza|B2Tge zR~S#B1h*Kns05FBlBIagc#8K0Z`uYeD#d?1(OC#98eSQNSx7Nt(Ja&ox$9JhCgUlT z;W9%OmEi}TWI66Kp5l$jGe!1r35&|{wkKMFzj~q-@XZ`aRv=BtEnkTO<0({Pks*sJ z(d|iAVXN^J?|gp9>(57ZZ#z|Z-V>dTW1i@2{Kb$(v!RNe$++d`AV$c&OmmQH$f7xD z_9W+GmGKmBwYD&EeYgBv-0g{0^84JZQ+GTD&d2YK$6I=QV#uQT7*{&7P79DEhXpli|X-jPqG308RnN;z5$6Y+47as zfH{KhLIttV6AhxvkVQe<>`5-fUgIe&#FK_BT8KY*l8rcRJjJ`^{|*s<|5?FRlU#yd8c*@|{JmkaxjgUI%SXyLVT_Pl zz6qIzENVidC)tb+<0&+w$B;$M*yl;M;C|yNeja$qkZn;5&Um7&_?IyiS`kq(eAO&! zMUIernc7fhJcTy28?vYkS9_A}_`dNJKY-k4$g-&&M?KM{c-@%%(29=?S+o?9l_Tr4 z3=@Uiby|iJLl!MVrzhEg?-)<<6VDDq7TFzmz!UAny2U_LZVrM2};1#6;}iw!$5veM5RFMdLUI{3+a@wLCl> z`*Ec|2XEk1XrUNYtiKH`lyvH`|&Kc(1V;g zq#S*l#~#2beWW8P=ymp6BBn^&dfiPK6$GlA*70|A7A-Pe|)P z$t}JM0ll}RF@jfb=%uM5wx3EDhU!rjqx&~jJQUVHuDZ?N-&^0OqCY!%@sHk|xU1&o za~n=lq}tt|v1F$&d$4`OI%l+x{}TC1gkHga%|J_QZEM)Q?^K)_ShL{C!@KmRuZ!CH wPc?^AOnvuIHGW&?w3GW%;(Tr0_eZvpPVRWQKeFx15MNJz|JaU?sW0FEf4F2BhyVZp diff --git a/Stone.WinForm/Stone.Entity/Entity_t_ErrTypeLevel.cs b/Stone.WinForm/Stone.Entity/Entity_t_ErrTypeLevel.cs new file mode 100644 index 0000000..f233d32 --- /dev/null +++ b/Stone.WinForm/Stone.Entity/Entity_t_ErrTypeLevel.cs @@ -0,0 +1,27 @@ +using Gm_WMS.DataAccess.DataService; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Stone.Entity +{ + public class Entity_t_ErrTypeLevel : EntityBase + + { + public static string TableNameNew = "t_ErrTypeLevel"; + + public Entity_t_ErrTypeLevel() + { + base.TableName = TableNameNew; + base.Init(); + } + + public Entity_t_ErrTypeLevel(LocalDBService myDB) + { + base.db = myDB; + base.TableName = TableNameNew; + base.Init(); + } + } +} diff --git a/Stone.WinForm/Stone.Entity/Stone.Entity.csproj b/Stone.WinForm/Stone.Entity/Stone.Entity.csproj index 90124c5..8f1c03a 100644 --- a/Stone.WinForm/Stone.Entity/Stone.Entity.csproj +++ b/Stone.WinForm/Stone.Entity/Stone.Entity.csproj @@ -62,6 +62,7 @@ + diff --git a/Stone.WinForm/Stone.WinBiz/BasicData/F_ErrTypeLevel.cs b/Stone.WinForm/Stone.WinBiz/BasicData/F_ErrTypeLevel.cs new file mode 100644 index 0000000..d73fe89 --- /dev/null +++ b/Stone.WinForm/Stone.WinBiz/BasicData/F_ErrTypeLevel.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using System.Data; +using Stone.Entity; +using Gm_WMS.DataAccess.DataService; +using Stone.Common; + +namespace Stone.WinBiz.BasicData +{ + public class F_ErrTypeLevel : F_Base + { + public F_ErrTypeLevel() + { + this.type = "PartOutQty"; + this.name = "基础资料_累计发货数量"; + this.entity = new Entity_t_ErrTypeLevel(); + //this.entityView = new Entity_v_Product(); + } + + public override void GetView(DataGridView dgv) + { + base.GetView(dgv); + + dgv.Columns["Code"].HeaderText = "类型编码"; + dgv.Columns["ErrTypeDesc"].HeaderText = "预警类型"; + dgv.Columns["ErrLevel"].HeaderText = "级别"; + dgv.Columns["ToPerson"].HeaderText = "邮件通知人"; + + } + + public override void Checking(DataRow drData, bool isNew) + { + //base.Checking(drData, isNew); + + + //if ((new F_CarModel()).GetData("Code='" + drData["CarModelCode"].ToString() + "'") == null) + // throw new Exception("车型代码 " + drData["CarModelCode"].ToString() + " 不存在！"); + + //if ((new F_Color()).GetData("Code='" + drData["ColorCode"].ToString() + "'") == null) + // throw new Exception("颜色代码 " + drData["ColorCode"].ToString() + " 不存在！"); + + + //if (MyStrings.GetLength(drData["Name"].ToString()) > 255) throw new Exception("名称不能超过255个字符！"); + } + + + public override void InputData(DataSet dsData, LocalDBService db) + { + //Entity_t_Product t_Input = new Entity_t_Product(db); + //DataRow drInput = null; + + //foreach (DataRow drData in dsData.Tables[0].Rows) + //{ + + // drInput = t_Input.Table.NewRow(); + // drInput["Code"] = drData["存货代码"].ToString().Trim(); + // drInput["Name"] = drData["存货名称"].ToString().Trim(); + // drInput["CarModelCode"] = drData["车型代码"].ToString().Trim(); + // drInput["ColorCode"] = drData["颜色代码"].ToString().Trim(); + // drInput["Model"] = drData["规格型号"].ToString().Trim(); + // drInput["Deploy"] = drData["配置"].ToString().Trim(); + // drInput["BarCode"] = drData["条码号"].ToString(); + // drInput["PackNumer"] = drData["装箱数量"].ToString(); + // drInput["IsStandard"] = drData["是否STD件"].ToString(); + // drInput["State"] = drData["启用"].ToString(); + + // if (drInput["Code"].ToString().Trim() == "") + // throw new Exception("代码不能为空!"); + + + // if (t_Input.GetData("", "Code='" + drInput["Code"].ToString() + "'", "id asc").Tables[0].Rows.Count > 0) + // throw new Exception("代码 " + drInput["Code"].ToString() + " 已经存在！"); + + + // if ((new Entity_t_CarModel(db)).GetData("", "Code='" + drInput["CarModelCode"].ToString() + "'", "id asc").Tables[0].Rows.Count == 0) + // throw new Exception("车型代码 " + drInput["CarModelCode"].ToString() + " 不存在！"); + + // if ((new Entity_t_Color(db)).GetData("", "Code='" + drInput["ColorCode"].ToString() + "'", "id asc").Tables[0].Rows.Count == 0) + // throw new Exception("颜色代码 " + drInput["ColorCode"].ToString() + " 不存在！"); + + + // if (MyStrings.GetLength(drInput["Name"].ToString()) > 255) throw new Exception("名称不能超过255个字符！"); + + // //Checking(drInput, true); + // t_Input.Add(drInput); + + //} + } + } +} diff --git a/Stone.WinForm/Stone.WinBiz/Stone.WinBiz.csproj b/Stone.WinForm/Stone.WinBiz/Stone.WinBiz.csproj index e38ea14..bda6f04 100644 --- a/Stone.WinForm/Stone.WinBiz/Stone.WinBiz.csproj +++ b/Stone.WinForm/Stone.WinBiz/Stone.WinBiz.csproj @@ -81,6 +81,7 @@ + diff --git a/Stone.WinForm/Stone.WinForm/frmMain.cs b/Stone.WinForm/Stone.WinForm/frmMain.cs index 2f2df49..f51a972 100644 --- a/Stone.WinForm/Stone.WinForm/frmMain.cs +++ b/Stone.WinForm/Stone.WinForm/frmMain.cs @@ -107,6 +107,16 @@ namespace Stone.WinForm ShowWindow(frm); } + + if (e.Node.Text == "预警设置") + { + Stone.WinModule.BasicData.frmErrTypeLevel frm = new Stone.WinModule.BasicData.frmErrTypeLevel(); + frm.m_Base = new WinBiz.BasicData.F_ErrTypeLevel(); + frm.init(); + + ShowWindow(frm); + } + #endregion #region 基础资料管理 diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmErrTypeLevel.Designer.cs b/Stone.WinForm/Stone.WinModule/BasicData/frmErrTypeLevel.Designer.cs new file mode 100644 index 0000000..0844f64 --- /dev/null +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmErrTypeLevel.Designer.cs @@ -0,0 +1,36 @@ +namespace Stone.WinModule.BasicData +{ + partial class frmErrTypeLevel + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows 窗体设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + } + + #endregion + } +} diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmErrTypeLevel.cs b/Stone.WinForm/Stone.WinModule/BasicData/frmErrTypeLevel.cs new file mode 100644 index 0000000..346daf8 --- /dev/null +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmErrTypeLevel.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace Stone.WinModule.BasicData +{ + public partial class frmErrTypeLevel : Stone.WinModule.BasicData.frmBaseMain + { + public frmErrTypeLevel() + { + InitializeComponent(); + } + + public override void Search(string code) + { + base.Search(code); + + strWhere += " or [Code] like '%" + code + "%'"; + + } + } +} diff --git a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs index 336768f..cc89fe7 100644 --- a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs +++ b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs @@ -323,7 +323,10 @@ namespace Stone.WinModule.Standard string Date = MyDateTime.GetServerDateTime().ToString("yyyy-MM-dd"); string AsnNumbers = ""; - + List lsPartOutQty = new List(); + + var lstSql = new List(); + var strsql = ""; foreach (DataRow drData in dtData.Rows) { @@ -387,9 +390,14 @@ namespace Stone.WinModule.Standard drVDA["OrderNumber"] = drData["OrderNumber"].ToString(); drVDA["LocationCode"] = drData["LocationCode"].ToString(); drVDA["releaseId"] = drData["releaseId"].ToString(); + t_JIS_VDA.Add(drVDA); + //增加已发货数量 - + strsql = "Update t_PartOutQty" + + " set PartOutQty += " + decimal.Parse(drData["PackNumer"].ToString()) + "" + + " where Code = '" + drData["PartNumber"].ToString() + "'"; + db.Exec_NonQuery(strsql); PackageNos += drVDA["PackageNo"].ToString() + ","; } @@ -408,12 +416,17 @@ namespace Stone.WinModule.Standard drVDA["LocationCode"] = drData["LocationCode"].ToString(); drVDA["releaseId"] = drData["releaseId"].ToString(); t_JIS_VDA.Add(drVDA); - + + //增加已发货数量 + strsql = "Update t_PartOutQty" + + " set PartOutQty += " + Odd + "" + + " where Code = '" + drData["PartNumber"].ToString() + "'"; + db.Exec_NonQuery(strsql); PackageNos += drVDA["PackageNo"].ToString() + ","; } } - + //MyMessageBox.ShowInfoMessage($"ASN编号：{AsnNumber}\r\n装箱单号：{PackageNos} 生成完成!"); MyMessageBox.ShowInfoMessage($"装箱单号：{PackageNos} 生成完成!"); @@ -660,5 +673,11 @@ namespace Stone.WinModule.Standard // partOutQty.GetData()[] // partOutQty.Edit(part, qty); //} + + struct PartOutQty + { + string partcode; + int qty; + } } } diff --git a/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj b/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj index ad58418..0daf151 100644 --- a/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj +++ b/Stone.WinForm/Stone.WinModule/Stone.WinModule.csproj @@ -172,6 +172,12 @@ frmJISLimitsList.cs + + Form + + + frmErrTypeLevel.cs + Form