diff --git a/PDAForm/PDAForm/PDAForm.csproj b/PDAForm/PDAForm/PDAForm.csproj index 55934a4..9f267cc 100644 --- a/PDAForm/PDAForm/PDAForm.csproj +++ b/PDAForm/PDAForm/PDAForm.csproj @@ -698,6 +698,7 @@ frmBarCodeSelect.cs + Designer frmVDA.cs @@ -705,6 +706,7 @@ frmVDACheck.cs + Designer Designer 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 1c0103a..22bbd8d 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 @@ -64,8 +64,8 @@ namespace Stone.DataService.Biz.Bill if (!Convert.ToBoolean(dtVDA.Rows[0]["IsPrintLabel"])) throw new Exception($"装箱单号 {PackageNo} 未打印"); - if (Convert.ToBoolean(dtVDA.Rows[0]["IsPackingVerification"])) - throw new Exception($"装箱单号 {PackageNo} 已经做过装箱校验了"); + // if (Convert.ToBoolean(dtVDA.Rows[0]["IsPackingVerification"])) + // throw new Exception($"装箱单号 {PackageNo} 已经做过装箱校验了"); if (dtVDA.Rows[0]["PartNumber"].ToString().Trim().ToUpper() != PartNumber) { diff --git a/Stone.WinForm/Stone.WinBiz/BasicData/F_Base.cs b/Stone.WinForm/Stone.WinBiz/BasicData/F_Base.cs index 34422dd..e756086 100644 --- a/Stone.WinForm/Stone.WinBiz/BasicData/F_Base.cs +++ b/Stone.WinForm/Stone.WinBiz/BasicData/F_Base.cs @@ -77,9 +77,9 @@ namespace Stone.WinBiz.BasicData { dgv.DataSource = dsMain.Tables["Data"]; dgv.Columns["ID"].Visible = false; //隐藏ID列 - MyGridViewStyle.GetGridViewState(dgv, "基础资料" + type); + // MyGridViewStyle.GetGridViewState(dgv, "基础资料" + type); MyGridViewStyle.SetDataGridMenuCommon(dgv); - + MyGridViewStyle.SetDataGridRowNumber(dgv); }