From d3c60e8025ba75428a6e152893f4643d5ad340d0 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Fri, 10 Jun 2022 15:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E5=9C=A8=E5=86=8C=E8=B5=84=E4=BA=A7=EF=BC=9A=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=98=8E=E7=BB=86=E7=BC=96=E5=8F=B7=EF=BC=8C=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=BA=8F=E5=8F=B7=E4=B8=BA5=E4=BD=8D?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=B6=B3=E7=9A=840=E4=BB=A3=E6=9B=BF?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Ass_AssetsInfoItem/Form.cshtml           |  4 ++--
 .../Ass_AssetsInfo/Ass_AssetsInfoService.cs        | 14 +++++++-------
 .../Ass_AssetsInfoApplyService.cs                  | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml
index 2698030e8..83a11a01a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml	
@@ -42,8 +42,8 @@
         <input id="AICodeNumJY" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
-        <div class="lr-form-item-title">资产名称</div>
-        <input id="AIASSName" type="text" class="form-control" />
+        <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
+        <input id="AIASSName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItem">
         <div class="lr-form-item-title">部门</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs
index 0e5d53689..28ff56fd0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs	
@@ -227,7 +227,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                         {
                             codeNum++;
                             infoItem.AId = assInfoEntity.AId;
-                            infoItem.AICode = assInfoEntity.ACode + "_" + codeNum.ToString();
+                            infoItem.AICode = assInfoEntity.ACode + "_" + codeNum.ToString().PadLeft(5, '0');
                             infoItem.AICodeNum = codeNum;
                         }
 
@@ -301,8 +301,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                             Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格
                             Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性
                             Ass_AssetsInfoItem.AICodeNum = i + 1;
-                            Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum;
-                            Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum;
+                            Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0');
+                            Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0');
                             Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId;
                             Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition;
                             Ass_AssetsInfoItem.AIIsInStorage = true;
@@ -326,8 +326,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                         Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格
                         Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性
                         Ass_AssetsInfoItem.AICodeNum = 1;
-                        Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum;
-                        Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum;
+                        Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0');
+                        Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0');
                         Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId;
                         Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition;
                         Ass_AssetsInfoItem.AIIsInStorage = false;
@@ -351,8 +351,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     Ass_AssetsInfoItem.AISpecification = entity.ASpecification;//规格
                     Ass_AssetsInfoItem.AIAssType = entity.AAssType;//属性
                     Ass_AssetsInfoItem.AICodeNum = 1;
-                    Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum;
-                    Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum;
+                    Ass_AssetsInfoItem.AICode = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5,'0');
+                    Ass_AssetsInfoItem.AICodeNumJY = entity.ACode + "_" + Ass_AssetsInfoItem.AICodeNum.ToString().PadLeft(5, '0');
                     Ass_AssetsInfoItem.AIIStorageId = entity.AIIStorageId;
                     Ass_AssetsInfoItem.AIIStoragePosition = entity.AIIStoragePosition;
                     Ass_AssetsInfoItem.AIIsInStorage = entity.AStock > 0;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs
index 1400a9021..939443024 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs	
@@ -320,8 +320,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                                     insertassinfoitem.Create();
                                     insertassinfoitem.AId = assinfoitem.AId;
                                     insertassinfoitem.AICodeNum = Ass_AssetsInfoItemMaxNum + 1 + i;
-                                    insertassinfoitem.AICode = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString();
-                                    insertassinfoitem.AICodeNumJY = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString();//金隅编号
+                                    insertassinfoitem.AICode = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0');
+                                    insertassinfoitem.AICodeNumJY = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0');//金隅编号
                                     insertassinfoitem.AIAssValue = assinfoitem.APrice;//价值
                                     insertassinfoitem.AIUnits = assinfoitem.AUnit;//单位
                                     insertassinfoitem.AISpecificationtype = assinfoitem.AModel;//型号
@@ -426,8 +426,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                                     insertassinfoitem.Create();
                                     insertassinfoitem.AId = insertAss_AssetsInfo.AId;
                                     insertassinfoitem.AICodeNum = i + 1;
-                                    insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString();
-                                    insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString();
+                                    insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0');
+                                    insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0');
                                     insertassinfoitem.AIAssValue = assitemapp.AAIPrice;//价值
                                     insertassinfoitem.AIUnits = assitemapp.AAIUnit;//单位
                                     insertassinfoitem.AISpecificationtype = assitemapp.AAIModel;//型号
@@ -489,8 +489,8 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                                 insertassinfoitem.Create();
                                 insertassinfoitem.AId = insertAss_AssetsInfo.AId;
                                 insertassinfoitem.AICodeNum = 1;
-                                insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString();
-                                insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString();
+                                insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0');
+                                insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString().PadLeft(5, '0');
                                 insertassinfoitem.AIAssValue = assitemapp.AAIPrice;//价值
                                 insertassinfoitem.AIUnits = assitemapp.AAIUnit;//单位
                                 insertassinfoitem.AISpecificationtype = assitemapp.AAIModel;//型号