From e9543f18fbe81fb492df941fdc6fce59424f8f49 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 二月 2026 08:39:36 +0800
Subject: [PATCH] RCS对接
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index f1a7ffb..9da1c20 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -19,6 +19,7 @@
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +41,7 @@
* @return
* @time 2025/3/7 08:02
*/
+@Slf4j
@Service("outStockServiceImpl")
public class OutStockServiceImpl extends ServiceImpl<AsnOrderMapper, WkOrder> implements OutStockService {
@@ -488,21 +490,83 @@
if (!Objects.isNull(loc)) {
List<LocItem> locItems = new ArrayList<>();
LocItem locItem = locItemService.getById(param.getId());
+
+ if (Objects.isNull(locItem)) {
+ throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紝ID锛�" + param.getId());
+ }
// 淇锛氭瀯寤烘煡璇㈡潯浠讹紝鍏堟瀯寤哄熀纭�鏉′欢锛屽啀鏍规嵁鍊兼槸鍚︿负绌哄姩鎬佹坊鍔�
+ // 浼樺厛浣跨敤渚涘簲鍟嗘壒娆″尮閰嶏紝濡傛灉娌℃湁鍒欎娇鐢ㄥ簱瀛樻壒娆″尮閰�
LambdaQueryWrapper<WkOrderItem> orderItemWrapper = new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, outId)
.eq(WkOrderItem::getMatnrId, locItem.getMatnrId());
- if (StringUtils.isNotBlank(locItem.getBatch())) {
- orderItemWrapper.eq(WkOrderItem::getSplrBatch, locItem.getBatch());
+
+ // 浼樺厛浣跨敤渚涘簲鍟嗘壒娆″尮閰�
+ if (StringUtils.isNotBlank(locItem.getSplrBatch())) {
+ orderItemWrapper.eq(WkOrderItem::getSplrBatch, locItem.getSplrBatch());
+ } else if (StringUtils.isNotBlank(locItem.getBatch())) {
+ // 濡傛灉LocItem鍙湁batch瀛楁锛屽皾璇曞悓鏃跺尮閰峎kOrderItem鐨刡atch鍜宻plrBatch瀛楁
+ // 鍥犱负鏌愪簺鎯呭喌涓婰ocItem鐨刡atch鍙兘瀵瑰簲WkOrderItem鐨剆plrBatch
+ orderItemWrapper.and(wrapper -> wrapper
+ .eq(WkOrderItem::getBatch, locItem.getBatch())
+ .or()
+ .eq(WkOrderItem::getSplrBatch, locItem.getBatch())
+ );
}
+
if (StringUtils.isNotBlank(locItem.getFieldsIndex())) {
orderItemWrapper.eq(WkOrderItem::getFieldsIndex, locItem.getFieldsIndex());
}
WkOrderItem orderItem = outStockItemService.getOne(orderItemWrapper);
+ // 濡傛灉鎵句笉鍒板崟鎹槑缁嗭紝涓擫ocItem鏉ヨ嚜搴撳瓨璋冩暣锛屽垯鑷姩鍒涘缓WkOrderItem
if (Objects.isNull(orderItem)) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ // 妫�鏌ユ槸鍚︽槸搴撳瓨璋冩暣浜х敓鐨勫簱瀛�
+ if (locItem.getWkType() != null &&
+ locItem.getWkType().equals(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type))) {
+ // 鑾峰彇鍑哄簱鍗曚俊鎭�
+ WkOrder outOrder = outStockService.getById(outId);
+ if (Objects.isNull(outOrder)) {
+ throw new CoolException("鍑哄簱鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+
+ log.info("搴撳瓨璋冩暣浜х敓鐨勫簱瀛橈紝鑷姩鍒涘缓WkOrderItem - 鍑哄簱鍗旾D锛歿}锛岀墿鏂橧D锛歿}锛屾壒娆★細{}",
+ outId, locItem.getMatnrId(), locItem.getBatch());
+
+ // 鍒涘缓WkOrderItem
+ orderItem = new WkOrderItem();
+ orderItem.setOrderId(outId)
+ .setOrderCode(outOrder.getCode())
+ .setMatnrId(locItem.getMatnrId())
+ .setMatnrCode(locItem.getMatnrCode())
+ .setMaktx(locItem.getMaktx())
+ .setBatch(StringUtils.isNotBlank(param.getBatch()) ? param.getBatch() : locItem.getBatch())
+ .setSplrBatch(StringUtils.isNotBlank(locItem.getSplrBatch()) ? locItem.getSplrBatch() :
+ (StringUtils.isNotBlank(locItem.getBatch()) ? locItem.getBatch() : null))
+ .setFieldsIndex(locItem.getFieldsIndex())
+ .setAnfme(param.getOutQty())
+ .setWorkQty(0.0)
+ .setStockUnit(locItem.getUnit())
+ .setPurUnit(locItem.getUnit())
+ .setSpec(locItem.getSpec())
+ .setModel(locItem.getModel())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date());
+
+ if (!outStockItemService.save(orderItem)) {
+ throw new CoolException("搴撳瓨璋冩暣鍗曟嵁鏄庣粏鍒涘缓澶辫触锛侊紒");
+ }
+
+ log.info("WkOrderItem鍒涘缓鎴愬姛 - ID锛歿}锛屽嚭搴撳崟ID锛歿}锛岀墿鏂橧D锛歿}",
+ orderItem.getId(), outId, locItem.getMatnrId());
+ } else {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛佸嚭搴撳崟ID锛�" + outId + "锛岀墿鏂橧D锛�" + locItem.getMatnrId() +
+ (StringUtils.isNotBlank(locItem.getSplrBatch()) ? "锛屼緵搴斿晢鎵规锛�" + locItem.getSplrBatch() :
+ StringUtils.isNotBlank(locItem.getBatch()) ? "锛屽簱瀛樻壒娆★細" + locItem.getBatch() : "") +
+ (StringUtils.isNotBlank(locItem.getFieldsIndex()) ? "锛屽瓧娈电储寮曪細" + locItem.getFieldsIndex() : ""));
+ }
}
locItem.setOutQty(param.getOutQty())
--
Gitblit v1.9.1