From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
index d9a19eb..24de776 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
@@ -4,13 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
+import com.zy.asrs.wms.apis.wcs.services.WcsApiService;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto;
import com.zy.asrs.wms.asrs.entity.enums.OrderPickStatus;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.asrs.mapper.*;
-import com.zy.asrs.wms.asrs.service.OrderDetlService;
-import com.zy.asrs.wms.asrs.service.WaveSeedService;
+import com.zy.asrs.wms.asrs.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,14 +24,17 @@
public class WaveSeedServiceImpl extends ServiceImpl<WaveSeedMapper, WaveSeed> implements WaveSeedService {
@Autowired
- private OrderMapper orderMapper;
+ private OrderService orderMapper;
@Autowired
private OrderDetlMapper orderDetlMapper;
@Autowired
- private TaskDetlMapper taskDetlMapper;
-
+ private TaskDetlService taskDetlMapper;
+ @Autowired
+ private TaskService taskService;
@Autowired
private CacheSiteMapper cacheSiteMapper;
+ @Autowired
+ private WcsApiService wcsApiService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -57,7 +60,8 @@
throw new CoolException("鎾鏁版嵁涓嶅瓨鍦�");
}
- List<CacheSite> sites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, waveSeed.getOrderNo()));
+ List<CacheSite> sites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>()
+ .eq(CacheSite::getOrderNo, waveSeed.getOrderNo()));
if (sites.isEmpty()) {
throw new CoolException("褰撳墠璁㈠崟鏈粦瀹氭挱绉嶅簱浣嶏紝璇蜂娇鐢≒DA->鍦版爣缁戝畾,鍔熻兘缁戝畾鍚庡啀鎿嶄綔锛侊紒");
}
@@ -66,9 +70,11 @@
if (stock - param.getReviewNum() < 0) {
throw new CoolException("鎾鏁伴噺宸叉弧");
}
- waveSeed.setWorkQty(waveSeed.getWorkQty() + param.getReviewNum());
+ //璁剧疆鐘舵�佷负鎵ц涓�
+ waveSeed.setWorkQty(waveSeed.getWorkQty() + param.getReviewNum())
+ .setExceStatus(1);
- TaskDetl taskDetl = taskDetlMapper.selectOne(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getId, waveSeed.getTaskDetlId()));
+ TaskDetl taskDetl = taskDetlMapper.getOne(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getId, waveSeed.getTaskDetlId()));
if (Objects.isNull(taskDetl)) {
throw new CoolException("褰撳墠鎾浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -101,19 +107,18 @@
return ord.getPickStatus() != OrderPickStatus.ORDER_PICK_STATUS_DONE.val;
}).collect(Collectors.toList());
- int update;
if (detlList.isEmpty()) {
- update = orderMapper.update(new LambdaUpdateWrapper<Order>()
+ if (!orderMapper.update(new LambdaUpdateWrapper<Order>()
.eq(Order::getOrderNo, orderDetl.getOrderNo())
- .set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_DONE.val));
+ .set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_DONE.val))) {
+ throw new CoolException("鍘熷璁㈠崟涓诲崟鎷ｈ揣鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
} else {
- update = orderMapper.update(new LambdaUpdateWrapper<Order>()
+ if (!orderMapper.update(new LambdaUpdateWrapper<Order>()
.eq(Order::getOrderNo, orderDetl.getOrderNo())
- .set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_SECTION.val));
- }
-
- if (update < 1) {
- throw new CoolException("鍘熷璁㈠崟涓诲崟鎷ｈ揣鐘舵�佹洿鏂板け璐ワ紒锛�");
+ .set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_SECTION.val))) {
+ throw new CoolException("鍘熷璁㈠崟涓诲崟鎷ｈ揣鐘舵�佹洿鏂板け璐�");
+ }
}
waveSeed.setUpdateTime(new Date());
--
Gitblit v1.9.1