From 98413d99ce96377458515e855ef7605f7f46bacf Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 12 Dec 2024 16:40:33 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E5=8D=95=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=A0=8F=E5=92=8C=E8=A1=A8=E5=A4=B4=E6=8C=89=E9=92=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=20?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BA=BA=E5=92=8C=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PurchaseOrderServiceImpl.java        |  3 ++-
 .../purchaseStorage/purchaseStorage.html      | 20 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
index d2dac28c..e31db347 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
@@ -1339,7 +1339,8 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
         purchaseStorage.setWarehouseDeptType(purchaseOrderChild.getWarehouseDept());
         purchaseStorage.setWarehouseQualityStatus("0");
         purchaseStorage.setWarehouseOrderType("0");
-
+        purchaseStorage.setCreateBy(ShiroUtils.getLoginName());
+        purchaseStorage.setCreateTime(DateUtils.getNowDate());
 
         purchaseStorage.setArrivedTime(purchaseOrder.getArrivedTime());
         purchaseStorage.setRelatedOrderCode(purchaseOrder.getPurchaseOrderCode());
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
index 1131ddcd..7e38774a 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
@@ -77,16 +77,16 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="purchase:purchaseStorage:add">
-                <i class="fa fa-plus"></i> 添加
-            </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="purchase:purchaseStorage:edit">
-                <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="purchase:purchaseStorage:remove">
-                <i class="fa fa-remove"></i> 删除
-            </a>
-            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="purchase:purchaseStorage:export">
+<!--            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="purchase:purchaseStorage:add">-->
+<!--                <i class="fa fa-plus"></i> 添加-->
+<!--            </a>-->
+<!--            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="purchase:purchaseStorage:edit">-->
+<!--                <i class="fa fa-edit"></i> 修改-->
+<!--            </a>-->
+<!--            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="purchase:purchaseStorage:remove">-->
+<!--                <i class="fa fa-remove"></i> 删除-->
+<!--            </a>-->
+            <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="purchase:purchaseStorage:export">
                 <i class="fa fa-download"></i> 导出
             </a>
         </div>