From ef944ce8aaabb423be714f4c7febebc3d47d1b6d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期日, 04 五月 2025 07:50:40 +0800
Subject: [PATCH] #修改 1. 订单页面优化
---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/AsnExceStatus.java | 10 +++++++---
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 13 ++++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 19 +++++++++++++++----
4 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index d630d1a..5ac578b 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -155,7 +155,7 @@
<NumberField source="purQty" label="table.field.asnOrderItem.purQty" />
<TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />
<NumberField source="qty" label="table.field.asnOrderItem.qty" />
- <TextField source="isptResult" label="table.field.asnOrderItem.isptResult" />
+ <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />
<TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
<TextField source="splrName" label="table.field.asnOrderItem.splrName" />
<TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 1a6b0ce..05870a3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -47,6 +47,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -267,6 +268,7 @@
Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
orderItem.setQty(itemRcptQty)
.setSplrBatch(dto.getSplrBatch())
+ .setUpdateBy(loginUserId)
.setStockUnit(dto.getStockUnit())
.setProdTime(dto.getProdTime());
@@ -331,15 +333,24 @@
if (!warehouseAreasItemService.saveOrUpdate(item)) {
throw new CoolException("鏀惰揣澶辫触锛侊紒");
}
-
}
-
// if (!warehouseAreasItemService.saveBatch(allOrders)) {
// throw new CoolException("鏀惰揣澶辫触锛侊紒");
// }
-// //鑾峰彇閲囪喘鏁伴噺
+
+ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
+ if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val).setRleStatus(Short.valueOf("1"));
+
+ if (!asnOrderMapper.updateById(order)) {
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+
+ //鑾峰彇閲囪喘鏁伴噺
// double purQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getPurQty).sum();
-//
+
// BigDecimal subtract = BigDecimal.valueOf(receiptQty).subtract(BigDecimal.valueOf(purQty));
// //鍒ゆ柇宸叉敹璐ф暟閲忔槸鍚﹀皬浜庣瓑浜庨噰璐暟閲�
// if (subtract.compareTo(new BigDecimal("0.0")) <= 0) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/AsnExceStatus.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/AsnExceStatus.java
index ca2141f..7bb8737 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/AsnExceStatus.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/AsnExceStatus.java
@@ -12,9 +12,13 @@
//璐ㄦ鐘舵��
ASN_EXCE_STATUS_UN_EXCE("0", "鏈墽琛�"),
ASN_EXCE_STATUS_EXCE_ING("1", "鎵ц涓�"),
- ASN_EXCE_STATUS_TASK_DONE("2", "宸插畬鎴�"),
- ASN_EXCE_STATUS_TASK_CANCEL("3", "鍙栨秷"),
- ASN_EXCE_STATUS_TASK_CLOSE("4", "宸插叧闂�"),
+ ASN_EXCE_STATUS_RECEIPT_DONE("2", "鏀惰揣瀹屾垚"),
+ ASN_EXCE_STATUS_TASK_DONE("3", "宸插畬鎴�"),
+ ASN_EXCE_STATUS_TASK_CANCEL("4", "鍙栨秷"),
+ ASN_EXCE_STATUS_TASK_CLOSE("5", "宸插叧闂�"),
+
+
+
OUT_STOCK_STATUS_TASK_INIT("5", "鍒濆鍖�"),
OUT_STOCK_STATUS_TASK_EXCE("6", "寰呭鐞�"),
OUT_STOCK_STATUS_TASK_WAVE("7", "鐢熸垚娉㈡"),
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 4e104f5..f28f4d0 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -29,7 +29,18 @@
pack_name,
nty_status,
`status`,
- ispt_result,
+ case ispt_result
+ when 0 then
+ '鏈'
+ when 1 then
+ '鍚堟牸'
+ when 2 then
+ '涓嶅悎鏍�'
+ when 3 then
+ '寰呭畾'
+ when 4 then
+ '閮ㄥ垎鍚堟牸'
+ end as isptResult$,
deleted,
tenant_id,
create_by,
--
Gitblit v1.9.1