From 5b9fd4d0464c1d4673bfebef582badc7a15354e2 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 03 八月 2024 16:32:41 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakinLog.java | 10 ++++++++++
zy-asrs-admin/src/views/in/waitPakinLog/index.vue | 18 +++++++++++++++---
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-admin/src/views/in/waitPakinLog/index.vue b/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
index c7ec893..9bfe4f9 100644
--- a/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
@@ -55,11 +55,18 @@
...getColumnSearchProps('barcode'),
},
{
- title: formatMessage('db.man_wait_pakin_log.detl_id', '鏄庣粏ID'),
- dataIndex: 'detlId$',
+ title: formatMessage('db.man_wait_pakin_log.matnr', '鐗╂枡鍙�'),
+ dataIndex: ['detl$', 'mat$', 'matnr'],
width: 140,
ellipsis: true,
- ...getColumnSearchProps('detlId$'),
+ ...getColumnSearchProps('detl$.matnr'),
+ },
+ {
+ title: formatMessage('db.man_wait_pakin_log.batch', '鎵瑰彿'),
+ dataIndex: ['detl$', 'batch'],
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('detl$.matnr'),
},
{
title: formatMessage('db.man_wait_pakin_log.io_status', '缁勬墭鐘舵��'),
@@ -242,6 +249,11 @@
}}</a-button>
</div>
</template>
+
+ <template v-if="column.dataIndex === 'ioStatus$'">
+ <a-switch :checked="record.ioStatus == 1" :checked-children="formatMessage('waitPakin.switch.open', '鍏ュ簱涓�')"
+ :un-checked-children="formatMessage('waitPakin.switch.close', '寰呭叆搴�')" :disabled="true" />
+ </template>
</template>
</a-table>
</div>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakinLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakinLog.java
index 4437b20..e991c44 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakinLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaitPakinLog.java
@@ -5,6 +5,7 @@
import java.util.Date;
import com.zy.asrs.wms.asrs.service.OrderDetlLogService;
+import com.zy.asrs.wms.asrs.service.OrderDetlService;
import com.zy.asrs.wms.asrs.service.OrderLogService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
@@ -173,6 +174,15 @@
return null;
}
+ public OrderDetlLog getDetl$(){
+ OrderDetlLogService service = SpringUtils.getBean(OrderDetlLogService.class);
+ OrderDetlLog orderDetlLog = service.getById(this.detlId);
+ if (!Cools.isEmpty(orderDetlLog)){
+ return orderDetlLog;
+ }
+ return null;
+ }
+
public String getDetlId$(){
OrderDetlLogService service = SpringUtils.getBean(OrderDetlLogService.class);
OrderDetlLog orderDetlLog = service.getById(this.detlId);
--
Gitblit v1.9.1