From 1af222e201ad79526abca68c71207286ddf49188 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 19:53:34 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 40 ++++++++++++--------
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 2
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | 21 +++++++---
3 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index 7218a76..0201f0e 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -109,6 +109,13 @@
empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
+ sx={{
+ flexGrow: 1,
+ transition: (theme) =>
+ theme.transitions.create(['all'], {
+ duration: theme.transitions.duration.enteringScreen,
+ }),
+ }}
actions={(
<TopToolbar>
<FilterButton />
@@ -174,13 +181,13 @@
<NumberField source="anfme" label="table.field.warehouseAreasItem.anfme" />,
<NumberField source="workQty" label="table.field.warehouseAreasItem.workQty" />,
<NumberField source="qty" label="table.field.warehouseAreasItem.qty" />,
- <MyField source="isptQty" label="table.field.qlyIsptItem.anfme"
- onClick={(event, record, val) => {
- event.stopPropagation();
- setItemInfo(record)
- setDrawerVal(!!drawerVal && drawerVal === val ? null : val);
- }}
- />,
+ // <MyField source="isptQty" label="table.field.qlyIsptItem.anfme"
+ // onClick={(event, record, val) => {
+ // event.stopPropagation();
+ // setItemInfo(record)
+ // setDrawerVal(!!drawerVal && drawerVal === val ? null : val);
+ // }}
+ // />,
<TextField source="splrBatch" label="table.field.warehouseAreasItem.splrBtch" />,
<TextField source="batch" label="table.field.warehouseAreasItem.batch" />,
<TextField source="unit" label="table.field.warehouseAreasItem.unit" />,
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index 98df1ce..45e1fee 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -128,7 +128,7 @@
// }
if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getQty, order.getQty())
+ .set(AsnOrder::getQty, order.getAnfme())
.set(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
.eq(AsnOrder::getId, order.getId()))) {
throw new CoolException("鏀惰揣鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
index ddf7c51..d78953b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
@@ -110,17 +110,23 @@
if (Objects.isNull(orderItem)) {
throw new CoolException("鏀惰揣鍗曟嵁涓嶅瓨鍦紒锛�");
}
- Double sum = item.getDisQty() + item.getSafeQty();
+
+ Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty();
+ Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty();
+
+ Double sum = disQty + safeQty;
orderItem.setIsptQty(sum);
- if (!warehouseAreasItemService.updateById(orderItem)) {
- throw new CoolException("鏀惰揣鍖哄簱瀛樹俊鎭洿鏂板け璐ワ紒锛�");
- }
+ if (sum.compareTo(0.0) > 0) {
+ if (!warehouseAreasItemService.updateById(orderItem)) {
+ throw new CoolException("鏀惰揣鍖哄簱瀛樹俊鎭洿鏂板け璐ワ紒锛�");
+ }
- if (Objects.isNull(orderItem.getIsptResult())) {
- operateReceipt(item, orderItem);
- } else {
+ if (Objects.isNull(orderItem.getIsptResult())) {
+ operateReceipt(item, orderItem);
+ } else {
+ }
}
}
@@ -146,19 +152,21 @@
* @version 1.0
*/
private void operateReceipt(QlyIsptItem item, WarehouseAreasItem orderItem) {
- Double sum = item.getDisQty() + item.getSafeQty();
+ Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty();
+ Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty();
+ Double sum = disQty + safeQty;
if (sum.compareTo(orderItem.getAnfme()) >= 0) {
//瀹屾垚璐ㄦ,鍋氭洿鏂版搷浣�
- if (item.getSafeQty().compareTo(0.0) > 0) {
- orderItem.setIsptQty(item.getSafeQty());
+ if (safeQty.compareTo(0.0) > 0) {
+ orderItem.setIsptQty(safeQty);
orderItem.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
if (!warehouseAreasItemService.updateById(orderItem)) {
throw new CoolException("鏀惰揣鍖哄簱瀛樻槑缁嗘洿鏂板け璐ワ紒锛�");
}
}
- if (item.getDisQty().compareTo(0.0) > 0) {
- orderItem.setIsptQty(item.getDisQty())
+ if (disQty.compareTo(0.0) > 0) {
+ orderItem.setIsptQty(disQty)
.setId(null)
.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
@@ -167,8 +175,8 @@
}
} else {
//鏈畬鎴愬仛娣诲姞鎿嶄綔
- if (item.getSafeQty().compareTo(0.0) > 0) {
- orderItem.setIsptQty(item.getSafeQty())
+ if (safeQty.compareTo(0.0) > 0) {
+ orderItem.setIsptQty(safeQty)
.setId(null)
.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
@@ -176,8 +184,8 @@
}
}
- if (item.getDisQty().compareTo(0.0) > 0) {
- orderItem.setIsptQty(item.getDisQty())
+ if (disQty.compareTo(0.0) > 0) {
+ orderItem.setIsptQty(disQty)
.setId(null)
.setIsptResult(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
if (!warehouseAreasItemService.saveOrUpdate(orderItem)) {
--
Gitblit v1.9.1