From 30792bfffb9fe606ff8c4ad1639059dd8153c24d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 20 六月 2025 17:07:20 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 68 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 80f0f4d..abe71d6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -1,19 +1,18 @@
package com.vincent.rsf.server.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
import com.vincent.rsf.server.api.service.PdaOutStockService;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
-import com.vincent.rsf.server.manager.entity.Task;
-import com.vincent.rsf.server.manager.entity.TaskItem;
-import com.vincent.rsf.server.manager.service.AsnOrderService;
-import com.vincent.rsf.server.manager.service.OutStockService;
-import com.vincent.rsf.server.manager.service.TaskItemService;
-import com.vincent.rsf.server.manager.service.TaskService;
+import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -25,6 +24,12 @@
private TaskService taskService;
@Resource
private TaskItemService taskItemService;
+ @Autowired
+ private WaveService waveService;
+ @Autowired
+ private AsnOrderService asnOrderService;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -42,4 +47,53 @@
return R.ok(taskItems);
}
+
+ @Override
+ public R getWaveListItem(String barcode) {
+ LambdaQueryWrapper<Wave> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(!Cools.isEmpty(barcode),Wave::getCode,barcode);
+ List<Wave> waveList = waveService.list(lambdaQueryWrapper);
+ return R.ok(waveList);
+ }
+
+ @Override
+ public R getContainerWaveList(Map<String, String> map) {
+ String barcode = map.get("barcode");
+
+ if (Cools.isEmpty(barcode) ){
+ throw new CoolException("鍙傛暟鏈夎");
+ }
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, barcode));
+ if (null == task){
+ throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
+ }
+ ArrayList<ContainerWaveDto> containerWaveDtos = new ArrayList<>();
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ for (TaskItem taskItem : taskItems) {
+ ContainerWaveDto containerWaveDto = new ContainerWaveDto();
+ containerWaveDto.setTaskItem(taskItem);
+ Wave wave = waveService.getById(taskItem.getSourceId());
+ if (null == wave){
+ throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲娉㈡");
+ }
+ ArrayList<AsnOrderItem> list = new ArrayList<>();
+ List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWaveId, wave.getId()));
+ for (AsnOrder asnOrder : asnOrderList) {
+ AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>()
+ .eq(AsnOrderItem::getAsnId, asnOrder.getId())
+ .eq(AsnOrderItem::getMatnrCode, taskItem.getMatnrCode())
+ .eq(AsnOrderItem::getBatch, taskItem.getBatch())
+ );
+ if (null != orderItem){
+ list.add(orderItem);
+ }
+
+
+ }
+ containerWaveDto.setAsnOrderItems(list);
+ containerWaveDtos.add(containerWaveDto);
+ }
+
+ return R.ok(containerWaveDtos);
+ }
}
--
Gitblit v1.9.1