From b966230e9c3f80330c5aab7609a90c7538400956 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 29 十一月 2024 11:12:10 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java | 3 ++-
zy-asrs-admin/src/components/order/order/edit.vue | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/edit.vue b/zy-asrs-admin/src/components/order/order/edit.vue
index 0ca5b9a..d7e85b0 100644
--- a/zy-asrs-admin/src/components/order/order/edit.vue
+++ b/zy-asrs-admin/src/components/order/order/edit.vue
@@ -142,7 +142,7 @@
optionLabelProp="label">
</a-select>
</a-form-item>
- <a-form-item :label="formatMessage('db.man_order.order_settle', '鍗曟嵁鐘舵��')" name="orderSettle">
+ <a-form-item v-if="!isSave" :label="formatMessage('db.man_order.order_settle', '鍗曟嵁鐘舵��')" name="orderSettle">
<a-select v-model:value="formData.orderSettle" :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
style="width: 100%" show-search :options="orderSettleQueryList" optionFilterProp="label"
optionLabelProp="label">
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
index 6defe8e..1db9f8b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
@@ -4,6 +4,7 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
import com.zy.asrs.wms.asrs.entity.param.CreateOrderParam;
import com.zy.asrs.wms.asrs.entity.param.UpdateOrderParam;
import com.zy.asrs.wms.asrs.mapper.OrderMapper;
@@ -63,7 +64,7 @@
Order order = new Order();
order.setOrderNo(orderNo);
order.setOrderType(param.getOrderType());
- order.setOrderSettle(param.getOrderSettle());
+ order.setOrderSettle(OrderSettleType.INIT.val());
order.setIoPri(orderUtils.getIoPri());
order.setOrderTime(format.format(new Date()));
order.setCreateTime(new Date());
--
Gitblit v1.9.1