From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index 81f1c12..c1aacdc 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.mysql.cj.util.StringUtils;
import com.zy.asrs.wms.asrs.entity.param.StockOutParam;
import com.zy.asrs.framework.exception.CoolException;
@@ -1110,6 +1111,11 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+ wave.setSite(operationPort.getFlag());
+ if (!waveService.updateById(wave)) {
+ throw new CoolException("娉㈡绔欏彛鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+
for (OrderOutMergeDto merge : list) {
LocDetl locDetl = locDetlService.getById(merge.getLocDetlId());
if (locDetl == null) {
@@ -1162,6 +1168,7 @@
if (orders.isEmpty()) {
throw new CoolException("褰撳墠娉㈡璁㈠崟涓嶅瓨鍦紒锛�");
}
+
// List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
// .eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).eq(CacheSite::getChannel, task.getTargetSite()));
@@ -1272,6 +1279,12 @@
if (!locDetlService.updateById(locDetl)) {
throw new CoolException("搴撳瓨鍔犻攣澶辫触锛侊紒");
}
+
+ orderDetlService.update(new LambdaUpdateWrapper<OrderDetl>()
+ .set(OrderDetl::getWareType, 2)
+ .eq(OrderDetl::getMatId, mat.getId())
+ .eq(StringUtils.isNullOrEmpty(outOder.getBatch()), OrderDetl::getBatch, outOder.getBatch())
+ .in(OrderDetl::getOrderId, outOder.getOrderIds()));
});
curLoc.setLocStsId(LocStsType.R.val());
@@ -1640,8 +1653,8 @@
for (LocDetl locDetl : param.getLocDetls()) {
List<OrderOutMergeParam> orders = new ArrayList<>();
LocDetl detl = locDetlService.getOne(new LambdaQueryWrapper<LocDetl>()
- .eq(LocDetl::getMatId, locDetl.getLocId())
- .eq(LocDetl::getBatch, locDetl.getLocId())
+ .eq(LocDetl::getMatId, locDetl.getMatId())
+ .eq(LocDetl::getBatch, locDetl.getBatch())
.eq(LocDetl::getLocNo, locDetl.getLocNo()));
if (Objects.isNull(detl)) {
continue;
--
Gitblit v1.9.1