diff --git a/.gitignore b/.gitignore
index b5a74a9..bc2b501 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
@@ -303,3 +304,18 @@ WMS-BS/NFine.Web/File/UPLoadFile/20241215040452NCR数量.xlsx
 WMS-BS/NFine.Web/File/UPLoadFile/20241215040545NCR数量.xlsx
 WMS-BS/NFine.Web/File/UPLoadFile/20241215040546NCR数量.xlsx
 WMS-BS/NFine.Web/File/UPLoadFile/20241215040610NCR数量.xlsx
+=======
+NFine.Data/obj/Debug/NFine.Data.csprojAssemblyReference.cache
+NFine.Domain/obj/Debug/NFine.Domain.csprojAssemblyReference.cache
+.vs/NFine.Framework/v15/Server/sqlite3/storage.ide-wal
+NFine.Application/obj/Debug/NFine.Application.csprojAssemblyReference.cache
+NFine.Mapping/obj/Debug/NFine.Mapping.csprojAssemblyReference.cache
+.vs/NFine.Framework/v15/Server/sqlite3/storage.ide-shm
+.vs/NFine.Framework/v15/Server/sqlite3/storage.ide
+NFine.Code/obj/Debug/NFine.Code.csprojAssemblyReference.cache
+NFine.Repository/obj/Debug/NFine.Repository.csprojAssemblyReference.cache
+NFine.Web/obj/Debug/NFine.Web.csprojAssemblyReference.cache
+.vs/config/applicationhost.config
+.vs/NFine.Framework/v15/.suo
+.vs/NFine.Framework/v15/Server/sqlite3/db.lock
+>>>>>>> d4d5a9317fa5dc110c454a366369c535214b2288
diff --git a/NFine.Web/Areas/PNSRM/Views/CreateItemLot/Index.cshtml b/NFine.Web/Areas/PNSRM/Views/CreateItemLot/Index.cshtml
index e9eabe4..79eaf6f 100644
--- a/NFine.Web/Areas/PNSRM/Views/CreateItemLot/Index.cshtml
+++ b/NFine.Web/Areas/PNSRM/Views/CreateItemLot/Index.cshtml
@@ -980,8 +980,9 @@
 <div class="topPanel" style="height:150px">
     <div class="toolbar" style="display:inline-block;">
         <div class="btn-group">
+            <a id="NF-ALLCreate" authorize="yes" style="margin-left:3px;" class="btn btn-primary" onclick="btnAllCreate()"><i class="fa fa-pencil-square-o"></i>一键生成</a>
             <a id="NF-Create" authorize="yes" style="margin-left:3px;" class="btn btn-primary" onclick="btnCreate()"><i class="fa fa-pencil-square-o"></i>生成条码</a>
-            <a id="NF-PrintOrder" authorize="yes"style="margin-left:3px;" class="btn btn-primary" onclick="btnPrintOrder()"><i class="fa fa-print"></i>订单打印</a>
+            <a id="NF-PrintOrder" authorize="yes" style="margin-left:3px;" class="btn btn-primary" onclick="btnPrintOrder()"><i class="fa fa-print"></i>订单打印</a>
             <a id="NF-Print" authorize="yes" style="margin-left:3px;" class="btn btn-primary" onclick="btnPrint()"><i class="fa fa-pencil-square-o"></i>打印</a>
             <a id="NF-delete" authorize="yes" style="margin-left:3px;" class="btn btn-danger" onclick="btn_delete()"><i class="fa fa-pencil-square-o"></i>删除</a>