diff --git a/app/Logic/ReceiptIssuingOrder/CreateManager.php b/app/Logic/ReceiptIssuingOrder/CreateManager.php
index 87423c0..d42bcc6 100644
--- a/app/Logic/ReceiptIssuingOrder/CreateManager.php
+++ b/app/Logic/ReceiptIssuingOrder/CreateManager.php
@@ -74,6 +74,7 @@ class CreateManager extends ReceiptIssuingOrderManager
 
         // モデル更新
         $order->order_datetime = DateUtil::now();
+        $order->receipt_no = $this->generateReceiptnNo();
         $this->refreshToken();
 
         $contractId = $this->loginUser()->getCurrentContractId();
diff --git a/app/Logic/ReceiptIssuingOrder/UpdateManager.php b/app/Logic/ReceiptIssuingOrder/UpdateManager.php
index bf84e64..0481edd 100644
--- a/app/Logic/ReceiptIssuingOrder/UpdateManager.php
+++ b/app/Logic/ReceiptIssuingOrder/UpdateManager.php
@@ -145,10 +145,9 @@ class UpdateManager extends ReceiptIssuingOrderManager
      */
     public function setConfirm(): static
     {
-        if ($this->order->receipt_no !== null) {
+        if ($this->order->status_receipt_confirm_datetime !== null) {
             throw new LogicException("領収証確定済み変更検知");
         }
-        $this->order->receipt_no = $this->generateReceiptnNo();
         $this->order->status_receipt_confirm_datetime = DateUtil::now();
 
         // イベント登録