From 30792bfffb9fe606ff8c4ad1639059dd8153c24d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 20 六月 2025 17:07:20 +0800
Subject: [PATCH] #
---
/dev/null | 28 ---------
rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java | 4 +
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java | 12 ++--
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 44 ++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 68 ++++++++++++++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java | 19 ++++++
6 files changed, 134 insertions(+), 41 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java
index 771c1bc..6a6da7e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java
@@ -84,13 +84,13 @@
}
param.setType(Constants.TASK_TYPE_OUT_STOCK);
- try {
- locItemService.generateTask(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, param, getLoginUserId());
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
+// try {
+// locItemService.generateTask(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, param, getLoginUserId());
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
- return R.ok("浠诲姟鐢熸垚鎴愬姛");
+ return R.ok(param);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
new file mode 100644
index 0000000..131ee53
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -0,0 +1,44 @@
+package com.vincent.rsf.server.api.controller.pda;
+
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.service.PdaOutStockService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@Api(tags = "PDA鍑哄簱鎿嶄綔鎺ュ彛")
+@RequestMapping("/pda")
+@RestController
+public class PdaOutStockController {
+
+ @Autowired
+ private PdaOutStockService pdaOutStockService;
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @GetMapping("/outStockTaskItem/{barcode}")
+ @ApiOperation("蹇�熸嫞璐ф煡璇�")
+ public R getOutStockTaskItem(@PathVariable String barcode) {
+
+ return pdaOutStockService.getOutStockTaskItem(barcode);
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/getWaveList")
+ @ApiOperation("鏌ヨ娉㈡鍒楄〃")
+ public R getWaveListItem(@RequestBody Map<String, String> map) {
+
+ return pdaOutStockService.getWaveListItem(map.get("barcode"));
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/getContainerWaveList")
+ @ApiOperation("鏍规嵁瀹瑰櫒鐮佹煡璇㈡尝娆″強鍑哄簱鍗�")
+ public R getContainerWaveList(@RequestBody Map<String, String> map) {
+
+ return pdaOutStockService.getContainerWaveList(map);
+ }
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/pdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/pdaOutStockController.java
deleted file mode 100644
index 8d42824..0000000
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/pdaOutStockController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.vincent.rsf.server.api.controller.pda;
-
-import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.api.service.PdaOutStockService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Api(tags = "PDA鍑哄簱鎿嶄綔鎺ュ彛")
-@RequestMapping("/pda")
-@RestController
-public class pdaOutStockController {
-
- @Autowired
- private PdaOutStockService pdaOutStockService;
-
- @PreAuthorize("hasAuthority('manager:task:list')")
- @GetMapping("/outStockTaskItem/{barcode}")
- @ApiOperation("蹇�熸嫞璐ф煡璇�")
- public R getOutStockTaskItem(@PathVariable String barcode) {
-
- return pdaOutStockService.getOutStockTaskItem(barcode);
- }
-}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java
new file mode 100644
index 0000000..aced56a
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java
@@ -0,0 +1,19 @@
+package com.vincent.rsf.server.api.entity.dto;
+
+import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.TaskItem;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ContainerWaveDto", description = "PDA娉㈡鎷ｈ揣")
+public class ContainerWaveDto {
+
+ private TaskItem taskItem;
+ private List<AsnOrderItem> asnOrderItems;
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
index 068d155..5bb3eff 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java
@@ -6,4 +6,8 @@
public interface PdaOutStockService {
R getOutStockTaskItem(String barcode);
+
+ R getWaveListItem(String barcode);
+
+ R getContainerWaveList(Map<String, String> map);
}
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