From f747281591f95777bb9dd205cd8cf56b8b85c827 Mon Sep 17 00:00:00 2001
From: JinH <hao.jin@ccwin-in.com>
Date: Mon, 31 Oct 2022 16:40:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A3=85=E7=AE=B1=E5=8D=95=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PDAForm/PDAForm/PDAForm.csproj                                | 2 ++
 .../Stone.DataService.Biz/Bill/F_STD_Check.cs                 | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

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 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Bill\VDA\frmBarCodeSelect.resx">
       <DependentUpon>frmBarCodeSelect.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Bill\VDA\frmVDA.resx">
       <DependentUpon>frmVDA.cs</DependentUpon>
@@ -705,6 +706,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Bill\VDA\frmVDACheck.resx">
       <DependentUpon>frmVDACheck.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Bill\Verify\frmVerify.resx">
       <SubType>Designer</SubType>
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)
                 {

From a0625b421d170cc7ef1d59bf5e01b5ce728719be Mon Sep 17 00:00:00 2001
From: JinH <hao.jin@ccwin-in.com>
Date: Tue, 26 Dec 2023 08:55:40 +0800
Subject: [PATCH 2/2] 1

---
 Stone.WinForm/Stone.WinBiz/BasicData/F_Base.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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);
         }