From 3eb25a0bb9b4bd0b914cf2cba60ecb8cc404fac9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 16:01:56 +0800
Subject: [PATCH] 任务取消功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 5 ++---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 3 +--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 3 ---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java | 9 ---------
rsf-server/src/main/resources/application.yml | 2 +-
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 2 +-
rsf-server/src/main/resources/application-dev.yml | 2 +-
7 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index fb818a2..18ccdf1 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -298,6 +298,6 @@
}
return (
- <ConfirmButton label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onConfirm={taskEvent} size={"small"} />
+ record.exceStatus == 10 ? <ConfirmButton label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onConfirm={taskEvent} size={"small"} /> : <></>
)
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
index 8a88226..4eb3587 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
@@ -223,15 +223,6 @@
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
-// @TableField(exist = false)
-// private Long waveId;
-//
-// @TableField(exist = false)
-// private Long waveItemId;
-//
-// @TableField(exist = false)
-// private String waveCode;
-
@TableField(exist = false)
private Long sourceId;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index 6e7fa3a..634da61 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -204,9 +204,6 @@
.setBatch(item.getBatch())
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
- .setSource(item.getSource())
- .setSourceId(item.getSourceId())
- .setSourceCode(item.getSourceCode())
.setCreateTime(new Date())
.setUpdateTime(new Date())
.setOrderType(OrderType.ORDER_OUT.type)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 5e2785c..81d96c0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -413,7 +413,7 @@
throw new CoolException("绛栫暐鍙傛暟涓虹┖");
}
if (Cools.isEmpty(param.getOrderId())) {
- throw new CoolException("鍗曟嵁id涓虹┖");
+ throw new CoolException("鍗曟嵁ID涓虹┖");
}
WaveRule waveRule = waveRuleService.getOne(new LambdaQueryWrapper<WaveRule>().eq(WaveRule::getId, param.getWaveId()));
if (Cools.isEmpty(waveRule)) {
@@ -549,8 +549,7 @@
private List<OrderOutItemDto> getOutOrderList(Long orderId, WaveRule waveRule) {
List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, orderId)
- );
+ .eq(AsnOrderItem::getAsnId, orderId));
List<OrderOutItemDto> list = new ArrayList<>();
Set<ExistDto> existDtos = new HashSet<>();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index ae66da5..aaa683a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -790,8 +790,7 @@
if (!taskItems.isEmpty()) {
for (TaskItem item : taskItems) {
if (item.getOrderType().equals(OrderType.ORDER_OUT.type)) {
-
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getId, item.getSourceId()));
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
if (Objects.isNull(loc)) {
throw new CoolException("鏁版嵁閿欒锛氬簱浣嶄俊鎭笉瀛樺湪锛侊紒");
}
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 4944870..203032b 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -16,7 +16,7 @@
username: root
url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# username: rsf
- password: 1234
+ password: 34821015
type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: 5
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index db51329..ac31a5b 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -25,7 +25,7 @@
# global-config:
# field-strategy: 0
configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
call-setters-on-nulls: true
--
Gitblit v1.9.1