From 77fa480130597d386c13c72d2ed091212722c130 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 17:19:19 +0800
Subject: [PATCH] 问题清单问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 1 +
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java | 2 ++
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx | 3 ++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 16 +++++++++-------
rsf-admin/src/i18n/zh.js | 4 ++--
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 22420f0..ff79c91 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -749,12 +749,12 @@
},
deviceSite: {
type: "鍏ュ嚭搴撶被鍨�",
- site: "浣滀笟绔欑偣",
+ site: "鍏ュ簱鍙�",
name: "鍚嶇О",
target: "鐩爣绔欑偣",
label: "绔欑偣鏍囩",
device: "绔嬪簱绫诲瀷",
- deviceCode: "璁惧缂栧彿",
+ deviceCode: "鎺ラ┏浣�",
deviceSite: "璁惧绔欑偣",
flagInit: "鏄惁鍒濆鍖�",
wcsCode: "wcs缂栧彿",
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
index f8c157c..d7b9790 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -162,7 +162,7 @@
</>}
rowClick={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'logisNo', 'poId', 'rleStatus$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.asnOrder.code" />
@@ -174,6 +174,7 @@
<NumberField source="qty" label="table.field.asnOrder.qty" />
<DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
<TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
+ <TextField source="logisNo" label="table.field.asnOrder.logisNo" />
{/* <TextField source="ntyStatus$" label="table.field.asnOrder.ntyStatus" /> */}
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index 44c66d2..2775016 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -134,6 +134,7 @@
.setMemo(template.getMemo())
.setArrTime(date)
.setUpdateBy(loginUserId)
+ .setLogisNo(template.getLogicNo())
.setCreateBy(loginUserId)
.setType(OrderType.getTypeVal(template.getType()))
.setWkType(OrderWorkType.getWorkType(template.getWkType()));
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index beaad9f..10e29b7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -362,9 +362,9 @@
PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
if (!Objects.isNull(purchaseItem)) {
purchaseItem.setQty(purchaseItem.getQty() - item.getAnfme());
- }
- if (!purchaseItemService.updateById(purchaseItem)) {
- throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ if (!purchaseItemService.updateById(purchaseItem)) {
+ throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ }
}
});
@@ -372,11 +372,13 @@
Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
.eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
- purchase.setQty(purchase.getQty() - sum)
- .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
+ if (!Objects.isNull(purchase)) {
+ purchase.setQty(purchase.getQty() - sum)
+ .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
- if (!purchaseService.updateById(purchase)) {
- throw new CoolException("PO鍗曟嵁鏇存柊澶辫触锛侊紒");
+ if (!purchaseService.updateById(purchase)) {
+ throw new CoolException("PO鍗曟嵁鏇存柊澶辫触锛侊紒");
+ }
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java
index ed14ec0..972a3f9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java
@@ -17,6 +17,8 @@
public class BaseController {
+
+
public User getLoginUser() {
try {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
--
Gitblit v1.9.1