From e4052c419fde5d9c78da9df24b48ff21193a75f4 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Mon, 10 Oct 2022 10:49:52 +0800
Subject: [PATCH] =?UTF-8?q?2022-10-10=20=E6=9D=90=E6=96=99=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx         |  4 ++--
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj               | 11 +++++++----
 .../HJGL/BaseInfo/MaterialCodeLibEdit.aspx            |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
index 667e510b..a21800e9 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/装箱单.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="09/29/2022 10:24:01" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/13/2022 11:00:20" ReportInfo.Modified="10/10/2022 10:08:58" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWREtq56fxZGt/I6jD6E8jjci"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRF1bqXOTY4n2cu4oGPHORXa"/>
     <TableDataSource Name="Data" ReferenceName="Data" DataType="System.Int32" Enabled="true">
       <Column Name="PipelineComponentId" DataType="System.String"/>
       <Column Name="PipelineComponentCode" DataType="System.String"/>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 914dc40b..16730b00 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -73,17 +73,20 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\FineUIPro\Reference BLL\AxInterop.SYNCARDOCXLib.dll</HintPath>
     </Reference>
-    <Reference Include="FastReport">
+    <Reference Include="FastReport, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\FineUIPro\Reference BLL\FastReport.dll</HintPath>
     </Reference>
     <Reference Include="FastReport.Bars, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\FastReport.Bars.dll</HintPath>
+      <HintPath>..\FineUIPro\Reference BLL\FastReport.Bars.dll</HintPath>
     </Reference>
-    <Reference Include="FastReport.Editor">
+    <Reference Include="FastReport.Editor, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\FineUIPro\Reference BLL\FastReport.Editor.dll</HintPath>
     </Reference>
-    <Reference Include="FastReport.Web">
+    <Reference Include="FastReport.Web, Version=2021.3.0.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\FineUIPro\Reference BLL\FastReport.Web.dll</HintPath>
     </Reference>
     <Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx
index b8e8eb50..b75dad06 100644
--- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibEdit.aspx
@@ -22,7 +22,7 @@
             </f:FormRow>
              <f:FormRow>
                 <Items>
-                     <f:TextBox ID="txtMaterialName" runat="server" Label="材料类型"
+                     <f:TextBox ID="txtMaterialName" runat="server" Label="类型"
                         Required="true" MaxLength="50" ShowRedStar="true" LabelWidth="100px">
                     </f:TextBox>
                 </Items>
@@ -36,7 +36,7 @@
             </f:FormRow>
             <f:FormRow>
                 <Items>
-                     <f:TextBox ID="txtMaterialMade" runat="server" Label="材质"
+                     <f:TextBox ID="txtMaterialMade" runat="server" Label="材质" Hidden="true"
                          LabelWidth="100px">
                     </f:TextBox>
                 </Items>