From cd8e369a7b3b751527090147798c5b81c30bf2d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 26 六月 2025 09:06:55 +0800
Subject: [PATCH] 生成任务工作档优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 4 +++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 41 +++++++++++++++++++++++++++--------------
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 2 +-
rsf-admin/.env | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java | 4 +++-
5 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/.env b/rsf-admin/.env
index 015a76d..42a0829 100644
--- a/rsf-admin/.env
+++ b/rsf-admin/.env
@@ -1,3 +1,3 @@
-VITE_BASE_IP=192.168.4.41
+VITE_BASE_IP=192.168.4.43
# VITE_BASE_IP=47.76.147.249
VITE_BASE_PORT=8080
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java
index 765055c..165262d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.entity.Config;
import com.vincent.rsf.server.system.service.ConfigService;
+import com.vincent.rsf.server.system.utils.SystemAuthUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -74,13 +75,14 @@
if (waveItems.isEmpty()) {
return;
}
+ Long loginUserId = SystemAuthUtils.getLoginUserId();
Map<Long, List<WaveItem>> listMap = waveItems.stream().collect(Collectors.groupingBy(WaveItem::getWaveId));
listMap.keySet().forEach(waveId -> {
List<Long> itemIds = listMap.get(waveId).stream().map(WaveItem::getId).collect(Collectors.toList());
Map<String, Object> params = new HashMap<>();
params.put("wave", waveId);
params.put("waveItem", itemIds);
- waveService.waveToTask(params, waveId);
+ waveService.waveToTask(params, loginUserId);
});
}
}
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 5ad2d1d..62b4973 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
@@ -217,7 +217,9 @@
.setSourceCode(order.getCode())
.setSourceId(order.getId());
} else if (map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
- taskItem.setSourceId(wave.getId()).setSourceCode(wave.getCode());
+ taskItem.setSourceId(wave.getId())
+ .setSourceCode(wave.getCode())
+ .setSource(item.getSource());
} else if (map.getType().equals(Constants.TASK_TYPE_OUT_CHECK) || map.getType().equals(Constants.TASK_TYPE_OUT_STOCK)) {
taskItem.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type))
.setSource(item.getId())
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index ed1130d..e73c78f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -68,7 +68,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R publicTask(Map<String, Object> map, Long loginUserId) {
- List<WaveItem> itemParams = JSONArray.parseArray(JSON.toJSONString(map.get("waveItem")), WaveItem.class);
+ List<WaveItem> itemParams = JSONArray.parseArray(JSON.toJSONString(map.get("waveItem")), WaveItem.class);
if (Objects.isNull(itemParams) || itemParams.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -113,6 +113,7 @@
/**
* 閫夋嫨娉㈡鏄庣粏涓嬪彂浠诲姟
+ *
* @param map
* @param loginUserId
* @return
@@ -162,12 +163,24 @@
throw new CoolException(e.getMessage());
}
- if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
- .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_ING.val)
- .in(WaveItem::getId, waveItems))) {
- throw new CoolException("涓嬪彂鎵ц寮傚父锛岃绋嶅�欓噸璇曪紒");
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSource, waveItems));
+ if (Cools.isEmpty(taskItems)) {
+ throw new CoolException("鏁版嵁閿欒锛氭尝娆℃槑缁嗗凡涓嶅瓨鍦紒锛�");
}
-
+ for (TaskItem item : taskItems) {
+ if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
+ .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_ING.val)
+ .set(WaveItem::getWorkQty, item.getAnfme())
+ .in(WaveItem::getId, waveItems))) {
+ throw new CoolException("涓嬪彂鎵ц寮傚父锛岃绋嶅�欓噸璇曪紒");
+ }
+ }
+ if (!waveService.update(new LambdaUpdateWrapper<Wave>()
+ .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
+ .set(Wave::getWorkQty, taskItems.stream().mapToDouble(TaskItem::getAnfme).sum())
+ .eq(Wave::getId, waveId))) {
+ throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
return R.ok();
}
@@ -248,16 +261,16 @@
}
/**
- * @author Ryan
- * @description 鍙栨秷娉㈡
- * @param
- * @return
- * @time 2025/6/17 10:04
- */
+ * @param
+ * @return
+ * @author Ryan
+ * @description 鍙栨秷娉㈡
+ * @time 2025/6/17 10:04
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public R cancelWave(List<Long> ids) {
-
+
return null;
}
@@ -270,7 +283,7 @@
* @time 2025/4/27 09:26
*/
@Synchronized
- private List<WaveItem> getLocs(List<WaveItem> waveItems) throws Exception {
+ private List<WaveItem> getLocs(List<WaveItem> waveItems) throws Exception {
//TODO 鏍规嵁鐗╂枡缂栫爜锛屾壒娆★紝鍔ㄦ�佸瓧娈� 鏌ヨ绗﹀悎鐨勫簱浣嶏紝鍐嶆牴鎹簱浣嶄腑鐗╂枡鐨勬暟閲忛�夋嫨鏈�閫傚悎鐨勫簱浣�
waveItems.forEach(waveItem -> {
List<LocItem> locItems = locItemService.list(new QueryWrapper<LocItem>()
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
index ed0b31d..7e69732 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -175,7 +175,7 @@
orderOutItemDto.setSiteNo(deviceSite.getSite());
}
- orderOutItemDto.setSource(item.getItemId()).setSource(item.getWaveId());
+ orderOutItemDto.setSource(item.getItemId()).setSourceId(item.getWaveId());
list.add(orderOutItemDto);
--
Gitblit v1.9.1