From 4e8dc60165c061d5bc20fa5f625e6e31ad71cfed Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Fri, 24 Feb 2023 16:02:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=BE=E5=A4=87=E4=BD=8D?=
 =?UTF-8?q?=E5=8F=B7=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CQMS/Material/EquipmentEdit.aspx          |   2 +-
 .../CQMS/Material/EquipmentIn.aspx.cs         |  10 +++++-----
 .../File/Excel/DataIn/设备信息导入模板.xls    | Bin 25600 -> 25600 bytes
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx
index 093c533b..b123b69c 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx
@@ -36,7 +36,7 @@
                         <f:TextBox ID="txtSpecificationAndModel" runat="server" Label="规格型号"
                             MaxLength="70" LabelWidth="100px" >
                         </f:TextBox>
-                        <f:TextBox ID="txtEquipmentCode" runat="server" Label="设备位号" ShowRedStar="true" Required="true"
+                        <f:TextBox ID="txtEquipmentCode" runat="server" Label="设备位号" 
                             MaxLength="70" LabelWidth="100px">
                         </f:TextBox>
                     </Items>
diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs
index a524d1be..cb0d0ca4 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs
@@ -219,11 +219,11 @@ namespace FineUIPro.Web.CQMS.Material
                         //    result += (i + 2).ToString() + "," + "规格型号" + "," + "此项为必填项！" + "|";
                         //}
 
-                        string row5 = pds.Rows[i][5].ToString();
-                        if (string.IsNullOrEmpty(row5))
-                        {
-                            result += (i + 2).ToString() + "," + "设备位号" + "," + "此项为必填项！" + "|";
-                        }
+                        //string row5 = pds.Rows[i][5].ToString();
+                        //if (string.IsNullOrEmpty(row5))
+                        //{
+                        //    result += (i + 2).ToString() + "," + "设备位号" + "," + "此项为必填项！" + "|";
+                        //}
 
                         string row8 = pds.Rows[i][8].ToString();
                         if (!string.IsNullOrEmpty(row8))
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设备信息导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设备信息导入模板.xls
index 2ef1f8baa9c51fc095d61a7580ea267a8f2d7144..cdb9a68e2f460968f6f5946aaf41b6e718e7fd4d 100644
GIT binary patch
delta 696
zcmZoT!PszuaYGIZTfzSMp=utJi&)wipKSiga+i^Xse!3s@+~%J#;VD3?Bd9zWEB&m
zXZ8L%Lk1CsEes3{|LZ3(0x5<zuu6oi0z(E++>8M(yN+GC9!W0?BO_3D4--T$!pu7i
zxWpNNHo{CpR?om7h*g}CfdkF_dXS?*7MP$(z{EMRiZd~YW3_;RfeVMY33l;d22Sh}
z3^rKB85!)cI*5V64z7N)5~q(2<J8UhrY9H~4K`bte_&$GH05ksyII%DpRK;ER_XTk
zbpeO2Uf+_v*h1&nr>-R$ou{>@6shiZniy{2d%I$Kl3>7m^|+<iSD4+3TNs%8mCJ8=
ztiDOj`q&p0b!#ub{*kx$Vs%#ZaiKR`R_%LS`kHn9o8PR*wL1&1NVm=kUb$sX)arYs
zQU06%^0X*iov5QBknUOVKOU4a{xdUd{^@X@5#pZ7XPqJ$H%(S|wqjg6ImtPc^=>c&
zL-6K3&Yt3oj+5D<m-4YOumQC(0!bibo4hmHbyLh9CQgQ_R>0JGlaYDyMHlNu@vH!@
C=E>Lq

delta 697
zcmZoT!PszuaYGIZn?a#lYO?#}B9=DBN1K1L++}3>SO2em@+~%JMxn`a?Bd9zq!1IM
zXZ8L%Lk1CsEes3{|LZ3(0x5<zuu6oi0z(E++>8M(yN+GC9!W0?BO_3D4--T$!pu7i
zxWpNNHo{CpR?om7h*g}CfdkF_dXS?*7MP$(z{EMRiZd~YW3_;RfeVMY33l;d22Sh}
z3^rKB85!)cI*5V64z7N)5~q(2<K)fxrY9H~^)_3We_&$u*(p%4db6&TKU;lO?WHYm
z-^jT#ZF?7V=xX}b?8O#3$3CrFqT#OaKIqicyXBf<j9)7sg;w=uEq*I1bv11LgOXcc
zoeqD$)!O&`y4Bvk_t&KNF5gzFbI@<~E9<!JaUV|Yi!azSNy2?^;0nvBUZ+=XeHFX>
ztI6&24je(UC!3fGr|tRnpB0!c{xdTKcyIpeaF!9`p2_E(A{jSK)^xUFTs=9(Ih6Hw
zFaty2=6%kd;*9o_Iii>HaRI}V0T??Vnu}}l?r7J||DyLXaW)j#0+Z)WM&`*EU91<y
GvjPAGVaUt?