From 19fe6936cbe4deef1f18186350a71acff4dff58e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 14 一月 2025 17:06:18 +0800
Subject: [PATCH] # 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 117 insertions(+), 0 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 004a0a9..1a502b0 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,139 @@
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.CacheSite;
+import com.zy.asrs.wms.asrs.entity.Order;
+import com.zy.asrs.wms.asrs.entity.OrderDetl;
+import com.zy.asrs.wms.asrs.entity.Task;
+import com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto;
+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.CacheSiteMapper;
+import com.zy.asrs.wms.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.wms.asrs.mapper.OrderMapper;
+import com.zy.asrs.wms.asrs.mapper.TaskMapper;
+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.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class WaveManagentServiceImpl implements WaveManagentService {
@Autowired
private WaveSeedService waveSeedService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private TaskMapper taskMapper;
+ @Autowired
+ private OrderMapper orderMapper;
+ @Autowired
+ private OrderDetlMapper orderDetlMapper;
+ @Autowired
+ private CacheSiteMapper cacheSiteMapper;
+
@Override
public R getSowSeeds() {
List<SowSeeds> waveSeeds = waveSeedService.selectSeedsList();
return R.ok(waveSeeds);
}
+
+ @Override
+ public R reviewSeeds(WaveSeedReviewParam reviewParam) {
+ waveSeedService.waveSeedReview(reviewParam);
+ return R.ok("鎾澶嶆牳鎴愬姛");
+ }
+
+ @Override
+ public int removeSowSeed(Long id) {
+ if (id == null) {
+ throw new CoolException("鎾ID涓嶈兘涓虹┖锛侊紒");
+ }
+ return waveSeedService.removeSowById(id);
+
+ }
+
+ @Override
+ public R getTask() {
+ List<LargeScreenTaskDto> taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
+ return R.ok(taskDtos);
+ }
+
+ @Override
+ public R getTaskDetl(String taskNo) {
+ List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlByTaskNo(taskNo);
+ return R.ok(taskDetls);
+ }
+
+ /**
+ * 鑾峰彇闈炴眹鎬绘槑缁嗘暟鎹�
+ * @param taskNo
+ * @return
+ */
+ @Override
+ public R getTaskDetlQutify(String taskNo) {
+ 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 -> {
+ List<OrderDetl> detls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));
+ if (detls.isEmpty()) {
+ throw new CoolException("璁㈠崟锛�" + order.getOrderNo() + " 娌℃湁鏄庣粏,璇疯仈绯荤鐞嗗憳锛侊紒");
+ }
+ List<OrderDetl> orderDetls = detls.stream().filter(orderDetl -> {
+ return orderDetl.getAnfme() == (orderDetl.getWorkQty() + orderDetl.getQty());
+ }).collect(Collectors.toList());
+
+ if (!orderDetls.isEmpty() && orderDetls.size() == detls.size()) {
+ order.setOrderStatus("宸插畬鎴�");//宸插畬鎴�
+ } else if (orderDetls.size() < detls.size() && orderDetls.size() != 0) {//閮ㄥ垎瀹屾垚
+ 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