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/impl/PdaOutStockServiceImpl.java | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 150 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..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
@@ -1,19 +1,24 @@
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.entity.params.ContainerWaveParam;
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.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;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -25,6 +30,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 +53,136 @@
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("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
+ }
+ if (task.getTaskStatus().equals(TaskStsType.COMPLETE_OUT.id)){
+ 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::getSplrBatch, taskItem.getBatch())
+ );
+ if (null != orderItem){
+ list.add(orderItem);
+ }
+
+
+ }
+ containerWaveDto.setAsnOrderItems(list);
+ containerWaveDtos.add(containerWaveDto);
+ }
+
+ return R.ok(containerWaveDtos);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R saveWavePick(ContainerWaveParam containerWaveParam, Long loginUserId) {
+ if (null == containerWaveParam || containerWaveParam.getContainerWaveDtos().size() <= 0){
+ return R.error("鍙傛暟閿欒");
+ }
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode,containerWaveParam.getContainer()));
+ if (null == task){
+ return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
+ }
+
+ for (ContainerWaveDto containerWaveDto : containerWaveParam.getContainerWaveDtos()) {
+ //鍋氫竴娆℃牎楠岋紝鍒ゆ柇鍓嶇鎵�鏈夊嚭搴撴暟閲忔槸鍚﹁秴杩囨湰鎵樺嚭搴撴暟閲�
+ double sum = containerWaveDto.getAsnOrderItems().stream().mapToDouble(AsnOrderItem::getDemandQty).sum();
+ BigDecimal total = new BigDecimal(String.valueOf(sum));
+ BigDecimal anfme = new BigDecimal(containerWaveDto.getTaskItem().getAnfme().toString());
+ if (!anfme.equals(total)){
+ 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){
+ throw new CoolException("鎾鏁伴噺澶т簬鍗曟嵁鍑哄簱鏁伴噺锛岃妫�鏌�");
+ }
+ orderItem.setQty(new BigDecimal(orderItem.getQty().toString()).add(orderDemandQty).doubleValue());
+ 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