From c9c56a1806e847759285d5d40239ee45b5efbd12 Mon Sep 17 00:00:00 2001
From: yf <770153798@qq.com>
Date: Sun, 23 Mar 2025 23:48:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/oms/service/saleorder/SaleOrderServiceImpl.java  | 2 +-
 .../src/views/oms/order/createorder/index.vue               | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
index f0bae57..7b8a18e 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
@@ -1353,7 +1353,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
         boolean order1 = BillStatusEnum.isCanEditOrder(billStatus);
         BillStatusEnum byValue = BillStatusEnum.getByValue(billStatus);
         AssertUtil.isEmpty(byValue, "订单状态异常");
-        if(!StringUtils.isNotBlank(type)){
+        if(StringUtils.isBlank(type)){
             AssertUtil.isTrue(!order1, byValue.getName() + "状态不允许修改");
         }
         return saleOrderDO;
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue
index 3c17205..936342f 100644
--- a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue
@@ -774,12 +774,14 @@ const addNewBill = () => {
 
 }
 
+let copyData = '';
 /** 初始化 **/
 onMounted(() => {
   queryParams.id = '';
   if (route.query) {
     queryParams.id = route.query.id ?? '';
     queryParams.type = route.query._t ?? '';
+    copyData = route.query.type ?? '';
   }
 
 })
@@ -847,9 +849,11 @@ onMounted(async () => {
       ...formData.value,
       id: queryParams.id
     }
-    if(queryParams.type!= undefined){ //复制新增
+    if(copyData){ //复制新增
       formData.value.contractCode = null;
       formData.value.bizdate = null;
+      formData.value.id = '';
+      queryParams.id = '';
       that.tmpFormData.planDate = calculateDateAfterDays(7);
     }