From 498f1e36c99529f1a25bd7c6916a762375884bcb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 16:28:02 +0800
Subject: [PATCH] #波次拣货
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/PdaOutStockService.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 8 ++-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 52 ++++++++++++++++++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ContainerWaveParam.java | 18 +++++++++
4 files changed, 73 insertions(+), 8 deletions(-)
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
index f4045d5..fbff6e4 100644
--- 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
@@ -2,7 +2,9 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
+import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
+import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +17,7 @@
@Api(tags = "PDA鍑哄簱鎿嶄綔鎺ュ彛")
@RequestMapping("/pda")
@RestController
-public class PdaOutStockController {
+public class PdaOutStockController extends BaseController {
@Autowired
private PdaOutStockService pdaOutStockService;
@@ -47,8 +49,8 @@
@PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/saveWavePick")
@ApiOperation("鏍规嵁瀹瑰櫒鐮佹煡璇㈡尝娆″強鍑哄簱鍗�")
- public R saveWavePick(@RequestBody List<ContainerWaveDto> containerWaveDtos) {
+ public R saveWavePick(@RequestBody ContainerWaveParam containerWaveParam) {
- return pdaOutStockService.saveWavePick(containerWaveDtos);
+ return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ContainerWaveParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ContainerWaveParam.java
new file mode 100644
index 0000000..93cf2c2
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ContainerWaveParam.java
@@ -0,0 +1,18 @@
+package com.vincent.rsf.server.api.entity.params;
+
+import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ContainerWaveParam", description = "娉㈡鎷ｈ揣瀹屾垚")
+public class ContainerWaveParam {
+
+ private String container;
+
+ private List<ContainerWaveDto> containerWaveDtos;
+}
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 307e229..8baeade 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
@@ -2,6 +2,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
+import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import java.util.List;
import java.util.Map;
@@ -13,5 +14,5 @@
R getContainerWaveList(Map<String, String> map);
- R saveWavePick(List<ContainerWaveDto> containerWaveDtos);
+ R saveWavePick(ContainerWaveParam containerWaveParam,Long loginUserId);
}
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 feaf4b9..ea902c4 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
@@ -5,9 +5,12 @@
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.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.WaveExceStatus;
import com.vincent.rsf.server.manager.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -105,16 +108,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R saveWavePick(List<ContainerWaveDto> containerWaveDtos) {
- if (null == containerWaveDtos || containerWaveDtos.size() <= 0){
+ public R saveWavePick(ContainerWaveParam containerWaveParam, Long loginUserId) {
+ if (null == containerWaveParam || containerWaveParam.getContainerWaveDtos().size() <= 0){
return R.error("鍙傛暟閿欒");
}
- Task task = taskService.getById(containerWaveDtos.get(0).getTaskItem().getTaskId());
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode,containerWaveParam.getContainer()));
if (null == task){
return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
}
- for (ContainerWaveDto containerWaveDto : containerWaveDtos) {
+ for (ContainerWaveDto containerWaveDto : containerWaveParam.getContainerWaveDtos()) {
//鍋氫竴娆℃牎楠岋紝鍒ゆ柇鍓嶇鎵�鏈夊嚭搴撴暟閲忔槸鍚﹁秴杩囨湰鎵樺嚭搴撴暟閲�
double sum = containerWaveDto.getAsnOrderItems().stream().mapToDouble(AsnOrderItem::getDemandQty).sum();
BigDecimal total = new BigDecimal(String.valueOf(sum));
@@ -123,6 +126,9 @@
throw new CoolException("鎾鏁伴噺涓嶇瓑浜庡鍣ㄥ嚭搴撴暟閲忥紝璇锋鏌�");
}
for (AsnOrderItem orderItem : containerWaveDto.getAsnOrderItems()) {
+ if (Double.compare(orderItem.getDemandQty(), 0.0) == 0) {
+ continue;
+ }
BigDecimal num = new BigDecimal(orderItem.getWorkQty().toString()).subtract(new BigDecimal(orderItem.getQty().toString()));
BigDecimal orderDemandQty = new BigDecimal(orderItem.getDemandQty().toString());
if (num.compareTo(orderDemandQty) < 0){
@@ -132,13 +138,51 @@
if (!asnOrderItemService.updateById(orderItem)){
throw new CoolException("鍗曟嵁鏄庣粏鏇存柊澶辫触");
}
+ //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
+ Boolean orderChecked = checkOrderComplete(orderItem);
+ if (orderChecked){
+ AsnOrder asnOrder = asnOrderService.getById(orderItem.getAsnId());
+ if (Cools.isEmpty(asnOrder)){
+ throw new CoolException("鍑哄簱鍗曚富鍗曟湭鎵惧埌");
+ }
+ asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+ if (!asnOrderService.updateById(asnOrder)){
+ throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
+ }
+ }
}
+ //妫�鏌ユ尝娆℃槸鍚﹀畬鎴�
+ Boolean waveChecked = checkWaveComplete(containerWaveDto.getTaskItem());
+ if (waveChecked){
+ Wave wave = waveService.getById(containerWaveDto.getTaskItem().getSourceId());
+ if (null == wave){
+ throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲娉㈡");
+ }
+ wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_DONE.val);
+ if (!waveService.updateById(wave)){
+ throw new CoolException("娉㈡鍗曟洿鏂扮姸鎬佸け璐�");
+ }
+ }
+
}
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
if (!taskService.updateById(task)){
throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
}
+
+
return R.ok();
}
+
+ private Boolean checkWaveComplete(TaskItem taskItem) {
+ Wave wave = waveService.getById(taskItem.getSourceId());
+ List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWaveId, wave.getId()));
+ return asnOrderList.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
+ }
+
+ private Boolean checkOrderComplete(AsnOrderItem orderItem) {
+ List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, orderItem.getAsnCode()));
+ return asnOrderItems.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
+ }
}
--
Gitblit v1.9.1