From ecdc2cadd4a21b80de4e30e38878fdeb39084e3f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 23 六月 2025 17:05:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
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/pda/PdaOutStockController.java | 10 +++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 47 +++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 3 +
4 files changed, 63 insertions(+), 1 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 131ee53..f4045d5 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
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.api.controller.pda;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -8,6 +9,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
@Api(tags = "PDA鍑哄簱鎿嶄綔鎺ュ彛")
@@ -41,4 +43,12 @@
return pdaOutStockService.getContainerWaveList(map);
}
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/saveWavePick")
+ @ApiOperation("鏍规嵁瀹瑰櫒鐮佹煡璇㈡尝娆″強鍑哄簱鍗�")
+ public R saveWavePick(@RequestBody List<ContainerWaveDto> containerWaveDtos) {
+
+ return pdaOutStockService.saveWavePick(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 5bb3eff..307e229 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
@@ -1,7 +1,9 @@
package com.vincent.rsf.server.api.service;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
+import java.util.List;
import java.util.Map;
public interface PdaOutStockService {
@@ -10,4 +12,6 @@
R getWaveListItem(String barcode);
R getContainerWaveList(Map<String, String> map);
+
+ R saveWavePick(List<ContainerWaveDto> containerWaveDtos);
}
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 abe71d6..feaf4b9 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
@@ -7,11 +7,14 @@
import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.TaskStsType;
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;
@@ -67,6 +70,9 @@
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) {
@@ -82,7 +88,7 @@
AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnId, asnOrder.getId())
.eq(AsnOrderItem::getMatnrCode, taskItem.getMatnrCode())
- .eq(AsnOrderItem::getBatch, taskItem.getBatch())
+ .eq(AsnOrderItem::getSplrBatch, taskItem.getBatch())
);
if (null != orderItem){
list.add(orderItem);
@@ -96,4 +102,43 @@
return R.ok(containerWaveDtos);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R saveWavePick(List<ContainerWaveDto> containerWaveDtos) {
+ if (null == containerWaveDtos || containerWaveDtos.size() <= 0){
+ return R.error("鍙傛暟閿欒");
+ }
+ Task task = taskService.getById(containerWaveDtos.get(0).getTaskItem().getTaskId());
+ if (null == task){
+ return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
+ }
+
+ for (ContainerWaveDto containerWaveDto : containerWaveDtos) {
+ //鍋氫竴娆℃牎楠岋紝鍒ゆ柇鍓嶇鎵�鏈夊嚭搴撴暟閲忔槸鍚﹁秴杩囨湰鎵樺嚭搴撴暟閲�
+ 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()) {
+ 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("鍗曟嵁鏄庣粏鏇存柊澶辫触");
+ }
+ }
+ }
+
+ task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
+ if (!taskService.updateById(task)){
+ throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
+ }
+ return R.ok();
+ }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index c038d91..a763bf4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -276,6 +276,9 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @TableField(exist = false)
+ private Double demandQty = 0.0;
//
public AsnOrderItem() {}
--
Gitblit v1.9.1