From a1dd07f6884d2bf2fc1431927a557c8f3cdff870 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 30 四月 2025 14:43:44 +0800 Subject: [PATCH] #报检 --- rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 1 + rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 13 +++++++++++++ rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx index aca166f..4644ed6 100644 --- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx +++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx @@ -169,6 +169,7 @@ <TextField source="logisNo" label="table.field.asnOrder.logisNo" /> <DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime /> <TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} /> + <TextField source="ntyStatus$" label="table.field.asnOrder.ntyStatus" /> <TextField source="updateBy$" label="common.field.updateBy" /> <DateField source="updateTime" label="common.field.updateTime" showTime /> <TextField source="createBy$" label="common.field.createBy" /> diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java index 11a779c..0a0ad7a 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java @@ -130,7 +130,7 @@ longSet.add(Long.parseLong(set)); }); - List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getNtyStatus, longSet)); + List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getPoDetlId, longSet)); if (asnOrderItems.isEmpty()) { throw new CoolException("ASN鍗曟嵁涓嶅瓨鍦紒锛�"); } @@ -139,7 +139,7 @@ /************************** 淇敼ASN鏄庣粏鍗曠姸鎬� ******************************/ - if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>().in(AsnOrderItem::getId, list).set(AsnOrderItem::getStatus, 1))) { + if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>().in(AsnOrderItem::getId, list).set(AsnOrderItem::getNtyStatus, 1))) { throw new CoolException("ASN鏄庣粏鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java index c79a9b6..46aaaef 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java @@ -309,5 +309,18 @@ return null; } } + public String getNtyStatus$(){ + if (null == this.ntyStatus){ return "error"; } + switch (this.ntyStatus){ + case 0: + return "鏈笂鎶�"; + case 1: + return "宸蹭笂鎶�"; + case 2: + return "閮ㄥ垎涓婃姤"; + default: + return "error"; + } + } } -- Gitblit v1.9.1