Merge branch 'master' of http://dev.ccwin-in.com:3000/JinH/JBLEAR-STD

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>

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)
                 {

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