From 83b51a5a0774ea8ecb9a06304af3b956a21307c8 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期六, 08 三月 2025 09:06:55 +0800
Subject: [PATCH] CUT库条码T开头，截取后10位
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java | 66 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
index 17653bd..b59a34e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
@@ -1,22 +1,28 @@
package com.zy.asrs.wms.apis.wcs.services.Impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mysql.cj.util.StringUtils;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
-import com.zy.asrs.wms.asrs.entity.Task;
+import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto;
+import com.zy.asrs.wms.asrs.entity.enums.OrderPickStatus;
import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
-import com.zy.asrs.wms.asrs.mapper.TaskMapper;
+import com.zy.asrs.wms.asrs.mapper.*;
import com.zy.asrs.wms.asrs.service.TaskService;
import com.zy.asrs.wms.asrs.service.WaveSeedService;
+import org.aspectj.weaver.ast.Or;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class WaveManagentServiceImpl implements WaveManagentService {
@@ -25,9 +31,17 @@
@Autowired
private TaskService taskService;
-
@Autowired
private TaskMapper taskMapper;
+
+ @Autowired
+ private TaskTypeMapper taskTypeMapper;
+ @Autowired
+ private OrderMapper orderMapper;
+ @Autowired
+ private OrderDetlMapper orderDetlMapper;
+ @Autowired
+ private CacheSiteMapper cacheSiteMapper;
@Override
public R getSowSeeds() {
@@ -52,8 +66,9 @@
@Override
public R getTask() {
- List<LargeScreenTaskDto> taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
- return R.ok(taskDtos);
+ List<LargeScreenTaskDto> taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id).orderByAsc(Task::getUpdateTime).last("limit 1"));
+
+ return R.ok(taskDtos);
}
@Override
@@ -72,4 +87,45 @@
List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlQutify(taskNo);
return R.ok(taskDetls);
}
+
+ /**
+ * 鑾峰彇娉㈡涓嬫墍鏈夎鍗�
+ * @param waveNo
+ * @return
+ */
+ @Override
+ public R getAllOrders(String waveNo) {
+ if (StringUtils.isNullOrEmpty(waveNo)) {
+ throw new CoolException("娉㈡缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ List<Order> orders = orderMapper.selectList(new LambdaQueryWrapper<Order>().eq(Order::getWaveNo, waveNo));
+ if (orders.isEmpty()) {
+ throw new CoolException("褰撳墠娉㈡涓嬫病鏈夎鍗�!!");
+ }
+
+ orders.forEach(order -> {
+ if (order.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_DONE.val) {
+ order.setOrderStatus("宸插畬鎴�");//宸插畬鎴�
+ } else if (order.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_SECTION.val) {//閮ㄥ垎瀹屾垚
+ order.setOrderStatus("閮ㄥ垎瀹屾垚");
+ } else {//鏈畬鎴�
+ order.setOrderStatus("鏈畬鎴�");
+ }
+ });
+
+ return R.ok(orders);
+ }
+
+ /**
+ * 鑾蜂簡褰撳墠鎾澧欏簱浣嶄俊鎭�
+ * @return
+ */
+ @Override
+ public R AllSeedLocs() {
+ List<CacheSite> cacheSites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>());
+ if (cacheSites.isEmpty()) {
+ return R.error("褰撳墠鎾澧欎俊鎭湭璁剧疆锛侊紒");
+ }
+ return R.ok(cacheSites);
+ }
}
--
Gitblit v1.9.1