From 9060dd329b8500f58709b31aade3c2f48e19c233 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 09 九月 2024 08:45:39 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java | 6 ++
zy-asrs-admin/src/views/order/orderLog/index.vue | 147 +++++++++++++++++++++++++-----------------------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java | 4 +
zy-asrs-admin/src/components/order/index.vue | 11 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java | 6 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java | 4 +
6 files changed, 106 insertions(+), 72 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/index.vue b/zy-asrs-admin/src/components/order/index.vue
index 36bebe3..27966f4 100644
--- a/zy-asrs-admin/src/components/order/index.vue
+++ b/zy-asrs-admin/src/components/order/index.vue
@@ -66,6 +66,13 @@
...getColumnSearchProps('orderSettle$'),
},
{
+ title: formatMessage('db.man_order.ioPri', '浼樺厛绾�'),
+ dataIndex: 'ioPri',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('ioPri'),
+ },
+ {
title: formatMessage('db.man_order.status', '鐘舵��'),
dataIndex: 'status$',
width: 140,
@@ -250,10 +257,10 @@
}
if (info.file.status === 'done') {
let result = info.file.response;
- if(result.code == 200) {
+ if (result.code == 200) {
message.success(`${info.file.name} ${formatMessage('page.upload.success', '涓婁紶鎴愬姛')}`);
getPage()
- }else {
+ } else {
message.error(result.msg);
}
} else if (info.file.status === 'error') {
diff --git a/zy-asrs-admin/src/views/order/orderLog/index.vue b/zy-asrs-admin/src/views/order/orderLog/index.vue
index 8015e58..5c3da94 100644
--- a/zy-asrs-admin/src/views/order/orderLog/index.vue
+++ b/zy-asrs-admin/src/views/order/orderLog/index.vue
@@ -26,76 +26,83 @@
} = useTableSearch();
const columns = [
- {
- title: formatMessage('db.man_order_log.order_no', '璁㈠崟缂栧彿'),
- dataIndex: 'orderNo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('orderNo'),
- },
- {
- title: formatMessage('db.man_order_log.order_time', '鍗曟嵁鏃ユ湡'),
- dataIndex: 'orderTime',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('orderTime'),
- },
- {
- title: formatMessage('db.man_order_log.order_type', '鍗曟嵁绫诲瀷'),
- dataIndex: 'orderType$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('orderType$'),
- },
- {
- title: formatMessage('db.man_order_log.order_settle', '鍗曟嵁鐘舵��'),
- dataIndex: 'orderSettle$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('orderSettle$'),
- },
- {
- title: formatMessage('db.man_order_log.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('status$'),
- },
- {
- title: formatMessage('db.man_order_log.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createTime$'),
- },
- {
- title: formatMessage('db.man_order_log.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createBy$'),
- },
- {
- title: formatMessage('db.man_order_log.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateTime$'),
- },
- {
- title: formatMessage('db.man_order_log.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateBy$'),
- },
- {
- title: formatMessage('db.man_order_log.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('memo'),
- },
+ {
+ title: formatMessage('db.man_order_log.order_no', '璁㈠崟缂栧彿'),
+ dataIndex: 'orderNo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderNo'),
+ },
+ {
+ title: formatMessage('db.man_order_log.order_time', '鍗曟嵁鏃ユ湡'),
+ dataIndex: 'orderTime',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderTime'),
+ },
+ {
+ title: formatMessage('db.man_order_log.order_type', '鍗曟嵁绫诲瀷'),
+ dataIndex: 'orderType$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderType$'),
+ },
+ {
+ title: formatMessage('db.man_order_log.order_settle', '鍗曟嵁鐘舵��'),
+ dataIndex: 'orderSettle$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderSettle$'),
+ },
+ {
+ title: formatMessage('db.man_order_log.ioPri', '浼樺厛绾�'),
+ dataIndex: 'ioPri',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('ioPri'),
+ },
+ {
+ title: formatMessage('db.man_order_log.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_order_log.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.man_order_log.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.man_order_log.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.man_order_log.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.man_order_log.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
{
title: formatMessage('common.operation', '鎿嶄綔'),
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
index 5481229..21cfba6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
@@ -114,6 +114,12 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Integer ioPri;
+
public Order() {}
public Order(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java
index 7670e03..bd53905 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderLog.java
@@ -116,6 +116,12 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Integer ioPri;
+
public OrderLog() {}
public OrderLog(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
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 8ad4656..e050386 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
@@ -9,6 +9,7 @@
import com.zy.asrs.wms.asrs.mapper.OrderMapper;
import com.zy.asrs.wms.asrs.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.wms.utils.OrderUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +32,8 @@
private OrderDetlFieldService orderDetlFieldService;
@Autowired
private OrderNoRuleService orderNoRuleService;
+ @Autowired
+ private OrderUtils orderUtils;
@Override
@Transactional
@@ -60,6 +63,7 @@
order.setOrderNo(orderNo);
order.setOrderType(param.getOrderType());
order.setOrderSettle(param.getOrderSettle());
+ order.setIoPri(orderUtils.getIoPri());
order.setOrderTime(format.format(new Date()));
order.setCreateTime(new Date());
order.setCreateBy(9527L);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java
index 98a6b46..5845506 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/OrderUtils.java
@@ -54,4 +54,8 @@
}
}
+ public Integer getIoPri() {
+ return 11;
+ }
+
}
--
Gitblit v1.9.1