From ef944ce8aaabb423be714f4c7febebc3d47d1b6d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期日, 04 五月 2025 07:50:40 +0800
Subject: [PATCH] #修改 1. 订单页面优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 3645c2f..05870a3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -47,6 +47,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -197,7 +198,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
+ public synchronized R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -267,6 +268,7 @@
Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
orderItem.setQty(itemRcptQty)
.setSplrBatch(dto.getSplrBatch())
+ .setUpdateBy(loginUserId)
.setStockUnit(dto.getStockUnit())
.setProdTime(dto.getProdTime());
@@ -331,15 +333,24 @@
if (!warehouseAreasItemService.saveOrUpdate(item)) {
throw new CoolException("鏀惰揣澶辫触锛侊紒");
}
-
}
-
// if (!warehouseAreasItemService.saveBatch(allOrders)) {
// throw new CoolException("鏀惰揣澶辫触锛侊紒");
// }
-// //鑾峰彇閲囪喘鏁伴噺
+
+ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
+ if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val).setRleStatus(Short.valueOf("1"));
+
+ if (!asnOrderMapper.updateById(order)) {
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+
+ //鑾峰彇閲囪喘鏁伴噺
// double purQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getPurQty).sum();
-//
+
// BigDecimal subtract = BigDecimal.valueOf(receiptQty).subtract(BigDecimal.valueOf(purQty));
// //鍒ゆ柇宸叉敹璐ф暟閲忔槸鍚﹀皬浜庣瓑浜庨噰璐暟閲�
// if (subtract.compareTo(new BigDecimal("0.0")) <= 0) {
@@ -641,7 +652,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R publicToStock(PublicToStockParams params, Long loginUserId) {
+ public synchronized R publicToStock(PublicToStockParams params, Long loginUserId) {
if (Objects.isNull(params.getLocCode()) || StringUtils.isBlank(params.getLocCode())) {
throw new CoolException("搴撲綅涓嶈兘涓虹┖锛侊紒");
}
@@ -773,7 +784,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R taskGetLocs(String code) throws Exception {
+ public synchronized R taskGetLocs(String code) throws Exception {
if (StringUtils.isBlank(code)) {
throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�");
}
@@ -911,7 +922,7 @@
* @description 鐢熸垚浠诲姟鍒楄〃
*/
@Override
- public R generateTask(Map<String, Object> map, Long loginUserId) {
+ public synchronized R generateTask(Map<String, Object> map, Long loginUserId) {
String barcode = map.get("barcode").toString();
List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
if (waitPakins.isEmpty()) {
--
Gitblit v1.9.1