From 35696b118679dfd9425550bef22b08c29926de2a Mon Sep 17 00:00:00 2001 From: JinH Date: Mon, 30 May 2022 08:58:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BDbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Stone.WinForm/Stone.WinForm/frmMain.cs | 2 +- .../Stone.WinModule/BasicData/frmBaseMain.cs | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Stone.WinForm/Stone.WinForm/frmMain.cs b/Stone.WinForm/Stone.WinForm/frmMain.cs index bf58a93..f7c45b6 100644 --- a/Stone.WinForm/Stone.WinForm/frmMain.cs +++ b/Stone.WinForm/Stone.WinForm/frmMain.cs @@ -305,7 +305,7 @@ namespace Stone.WinForm frm.m_Base = f_JIS_VDA; frm.init(); - frm.Text = "SY88_" + "发货准备与跟踪"; + frm.Text = "SY88_" + "号码预分配"; frm.TabText = frm.Text; ShowWindow(frm); diff --git a/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.cs b/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.cs index 14c8676..bd78a82 100644 --- a/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.cs +++ b/Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.cs @@ -142,7 +142,8 @@ namespace Stone.WinModule.BasicData if (frmFilter.SelectString != "") { strWhere = frmFilter.SelectString; - UpdateGridView(); + // UpdateGridView(); + UpdateGridViewByFilter(); } else { @@ -241,7 +242,6 @@ namespace Stone.WinModule.BasicData { try { - this.txtCode.Focus(); this.txtCode.SelectAll(); UpdateGridView(); @@ -280,17 +280,19 @@ namespace Stone.WinModule.BasicData /// public virtual void UpdateGridView() { - string code = this.txtCode.Text.Trim(); Search(code); - m_Base.BindPageData(strWhere); m_Base.GetView(this.dgrdView); this.tlbAllCount.Text = "记录数：" + m_Base.dsMain.Tables["Data"].Rows.Count; - - + } - + public virtual void UpdateGridViewByFilter() + { + string code = this.txtCode.Text.Trim(); + m_Base.BindPageData(strWhere); + m_Base.GetView(this.dgrdView); + this.tlbAllCount.Text = "记录数：" + m_Base.dsMain.Tables["Data"].Rows.Count; } /// From 553b829c0763a5d49f45bcd262d3d5e248f6f5dc Mon Sep 17 00:00:00 2001 From: JinH Date: Mon, 13 Jun 2022 10:59:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.asn=E6=92=A4=E5=9B=9E=EF=BC=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=9B=9E=E5=88=B0=E6=89=93=E5=8D=B0ASN=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=202.=E6=89=93=E5=8D=B0ASN=E6=97=B6=EF=BC=8C=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=98=AF=E5=90=A6=E7=BB=8F=E8=BF=87=E8=A3=85=E7=AE=B1?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=203.=E7=94=9F=E6=88=90VDA=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=9C=80=E6=B1=82=E6=97=A5=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E5=85=B7=E9=9C=80=E6=B1=82=E6=97=A5=E6=9C=9F=E8=AE=A1?= =?UTF-8?q?=E7=AE=97LAB=E4=B8=AD=E7=9A=84=E5=8F=91=E8=B4=A7=E5=B7=AE?= =?UTF-8?q?=E5=BC=82=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Stone.DataService.Biz/Bill/F_BillAsn.cs | 4 +++- .../Stone.DataService.Biz/Bill/F_STD_Check.cs | 3 +++ Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs | 3 ++- Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs | 5 ++++- Stone.WinForm/Stone.WinModule/Standard/frmMessageQuestion.cs | 3 ++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_BillAsn.cs b/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_BillAsn.cs index 466ff41..45433dd 100644 --- a/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_BillAsn.cs +++ b/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_BillAsn.cs @@ -24,7 +24,7 @@ namespace Stone.DataService.Biz.Bill Entity_t_JIS_VDA t_JIS_VDA = new Entity_t_JIS_VDA(); DataSet dsData = t_JIS_VDA.GetData( - $"PackageNo, 0 as IsCheck, AsnNumber, IsShipingVerification", + $"PackageNo, 0 as IsCheck, AsnNumber, IsShipingVerification,IsPrintASN", $"[AsnNumber]='{AsnNumber}'", $"[PackageNo] desc"); @@ -33,6 +33,8 @@ namespace Stone.DataService.Biz.Bill throw new Exception($"ASN编号{AsnNumber}不存在"); } + if (dsData.Tables[0].Select("[IsPrintASN]=True").Length == 0) + throw new Exception($"{AsnNumber} 未打印"); if (dsData.Tables[0].Select("[IsShipingVerification]=False").Length == 0) throw new Exception($"{AsnNumber} 已经完成发货校验"); diff --git a/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs b/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs index 41e7b2f..1c0103a 100644 --- a/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs +++ b/Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs @@ -61,6 +61,9 @@ namespace Stone.DataService.Biz.Bill if (dtVDA.Rows.Count == 0) throw new Exception($"装箱单号 {PackageNo} 在系统中不存在"); + if (!Convert.ToBoolean(dtVDA.Rows[0]["IsPrintLabel"])) + throw new Exception($"装箱单号 {PackageNo} 未打印"); + if (Convert.ToBoolean(dtVDA.Rows[0]["IsPackingVerification"])) throw new Exception($"装箱单号 {PackageNo} 已经做过装箱校验了"); diff --git a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs index a1a39d2..8f816af 100644 --- a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs +++ b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs @@ -392,7 +392,8 @@ namespace Stone.WinModule.Standard Odd = Convert.ToInt32(drData["quantity_new"]) - Convert.ToInt32(PageQty * Convert.ToInt32(drData["PackNumer"])); //计算零头 } - + //存储需求日期 + Date = drData["StartDate"].ToString(); for (int i = 1; i <= PageQty; i++) { diff --git a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs index 854bf6d..70cb7d1 100644 --- a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs +++ b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs @@ -423,7 +423,7 @@ namespace Stone.WinModule.Standard Entity_t_JIS_VDA t_JIS_VDA = new Entity_t_JIS_VDA(db); - t_JIS_VDA.Edit($"[IsUpload]=0, [UploadTime]=null", $"[AsnNumber]='{AsnNumber}'"); + t_JIS_VDA.Edit($"[IsUpload]=0, [UploadTime]=null,IsShipingVerification = 0,IsPrintASN = 0", $"[AsnNumber]='{AsnNumber}'"); db.Commit(); } @@ -544,6 +544,9 @@ namespace Stone.WinModule.Standard if (dsData.Tables[0].Rows.Count == 0) throw new Exception($"{AsnNumber} 不存在"); + if (dsData.Tables[0].Select("[IsPackingVerification]=False").Length > 0) + throw new Exception(AsnNumber + " 所属VDA未完成装箱校验"); + if (dsData.Tables[0].Select("[IsPrintASN]=True").Length == dsData.Tables[0].Rows.Count) throw new Exception(AsnNumber + " 已经打印过了"); diff --git a/Stone.WinForm/Stone.WinModule/Standard/frmMessageQuestion.cs b/Stone.WinForm/Stone.WinModule/Standard/frmMessageQuestion.cs index 397ed5b..7d1f725 100644 --- a/Stone.WinForm/Stone.WinModule/Standard/frmMessageQuestion.cs +++ b/Stone.WinForm/Stone.WinModule/Standard/frmMessageQuestion.cs @@ -33,7 +33,8 @@ namespace Stone.WinModule.Standard if (BillType == 0) { frmPasswordVerify frm = new frmPasswordVerify(); - frm.UserName = User.UserInfo.UserName; + // frm.UserName = User.UserInfo.UserName; + frm.UserName = "wping"; if (frm.ShowDialog() == DialogResult.OK) { this.DialogResult = DialogResult.OK;