From ebe2da6e4eefd59b366ebab3a651b32763b580ed Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 22 六月 2025 14:23:56 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java | 90 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 6 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..68306a7 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,23 +1,32 @@
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.apis.wcs.utils.HttpEssUtils;
+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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
+import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;
+
+@Slf4j
@Service
public class WaveManagentServiceImpl implements WaveManagentService {
@Autowired
@@ -25,9 +34,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() {
@@ -51,9 +68,22 @@
}
@Override
- public R getTask() {
- List<LargeScreenTaskDto> taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
- return R.ok(taskDtos);
+ public R getTask(HttpServletRequest request) {
+ log.info("ip鍦板潃====>锛� {}", getClientIpAddress(request));
+ String locIp = getClientIpAddress(request);
+ List<LargeScreenTaskDto> taskDtos;
+ if (locIp.equals(HttpEssUtils.S2_SITE_NO)) {
+ taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
+ .eq(Task::getTargetSite, "S2")
+ .orderByAsc(Task::getUpdateTime).last("limit 1"));
+ } else {
+ taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
+ .eq(Task::getTargetSite, "S1")
+ .orderByAsc(Task::getUpdateTime).last("limit 1"));
+ }
+ return R.ok(taskDtos);
}
@Override
@@ -72,4 +102,52 @@
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(HttpServletRequest request) {
+ log.info("ip鍦板潃====>锛� {}", getClientIpAddress(request));
+ String locIp = getClientIpAddress(request);
+ List<CacheSite> cacheSites;
+ if (locIp.equals(HttpEssUtils.S2_SITE_NO)) {
+ cacheSites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getChannel, "S2"));
+ } else {
+ cacheSites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getChannel, "S1"));
+ }
+ if (cacheSites.isEmpty()) {
+ return R.error("褰撳墠鎾澧欎俊鎭湭璁剧疆锛侊紒");
+ }
+ return R.ok(cacheSites);
+ }
}
--
Gitblit v1.9.1