From bbddd048ae9016ae89136eb0f108b80ca38ed4f4 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 23 一月 2026 19:16:32 +0800
Subject: [PATCH] lsh#明细添加计划跟踪号、行号、批次
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 86 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 77 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index e9b32a7..4509896 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -1,14 +1,13 @@
package com.vincent.rsf.server.api.service.impl;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.*;
@@ -17,34 +16,35 @@
import com.vincent.rsf.server.api.controller.erp.params.dto.WkOrderDto;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
+import com.vincent.rsf.server.manager.controller.params.PakinItem;
+import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
+import com.vincent.rsf.server.manager.service.impl.WarehouseAreasItemServiceImpl;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.DictData;
-import com.vincent.rsf.server.system.entity.DictType;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.service.DictDataService;
import com.vincent.rsf.server.system.service.DictTypeService;
import com.vincent.rsf.server.system.service.FieldsService;
-import com.vincent.rsf.server.system.service.impl.DictDataServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
-
-import static com.vincent.rsf.server.system.utils.SerialRuleUtils.objectToMap;
/**
* @author Ryan
@@ -103,6 +103,10 @@
private DictDataService dictDataService;
@Autowired
private DictTypeService dictTypeService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WarehouseAreasItemServiceImpl warehouseAreasItemService;
/**
@@ -458,12 +462,18 @@
if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)){
wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
}
-
if (!asnOrderService.save(wkOrder)) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
-
+ AtomicReference<String> palletId = new AtomicReference<>();
syncOrder.getOrderItems().forEach(orderItem -> {
+ if (Cools.isEmpty(palletId.get())){
+ palletId.set(orderItem.getPalletId());
+ } else {
+ if (!palletId.get().equals(orderItem.getPalletId())){
+ throw new CoolException("鍚屼竴涓崟鎹槑缁嗕腑鐨勬墭鐩樼爜蹇呴』涓�鑷达紒锛侊紒");
+ }
+ }
Map<String, Object> map = new ObjectMapper().convertValue(orderItem, Map.class);
map.put("orderId", wkOrder.getId());
map.put("poId", wkOrder.getPoId());
@@ -472,6 +482,12 @@
map.put("matnrCode", orderItem.getMatnr());
map.put("platWorkCode", orderItem.getPlanNo());
map.put("platItemId", orderItem.getLineId());
+ map.put("splrBatch", orderItem.getBatch());
+ map.put("batch", orderItem.getBatch());
+ map.put("spec", orderItem.getSpecs());
+ map.put("model", orderItem.getModel());
+ map.put("stockUnit", orderItem.getUnit());
+ map.put("purUnit", orderItem.getUnit());
if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
@@ -484,11 +500,63 @@
if (!asnOrderService.updateById(wkOrder)) {
throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
}
+
+ // 绔嬪嵆瑙﹀彂寮傛浠诲姟锛屼笉绛夊緟缁撴灉
+ if (!Cools.isEmpty(palletId.get()) && StringUtils.isNotBlank(syncOrder.getOrderNo()) && !Cools.isEmpty(syncOrder.getStationId())) {
+ //缁勬墭
+ WaitPakinParam pakinParam = new WaitPakinParam();
+ pakinParam.setBarcode(palletId.get());
+ pakinParam.setStaNo(syncOrder.getStationId());
+
+ boolean itemsCheck = waitPakinService.mergeItemsCheck(pakinParam, loginUserId);
+ if (itemsCheck) {
+ CompletableFuture.runAsync(() -> {
+ try {
+ asyncMergeItemsWcs(pakinParam, syncOrder.getOrderNo(), loginUserId);
+ } catch (Exception e) {
+ log.warn("璁㈠崟 {} 寮�濮嬭嚜鍔ㄧ粍鎵�", syncOrder.getOrderNo());
+ }
+ });
+ }
+ }
});
}
+
return R.ok();
}
+ @Async
+ public void asyncMergeItemsWcs(WaitPakinParam param, String orderNo, Long loginUserId) {
+ try {
+ int i = 0;
+ while (true) {
+ i++;
+ if (i>5) return;
+ Thread.sleep(3000);
+ List<WarehouseAreasItem> list = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>()
+ .eq(WarehouseAreasItem::getAsnCode, orderNo));
+
+ if (list.isEmpty()) {
+ log.warn("璁㈠崟 {} 娌℃湁鎵惧埌搴撳尯椤圭洰锛岃烦杩囩粍鎵�", orderNo);
+ continue;
+ }
+ List<PakinItem> itemList = list.stream().map(item -> {
+ PakinItem pakinItem = new PakinItem();
+ pakinItem.setAsnCode(item.getAsnCode());
+ pakinItem.setId(item.getId());
+ pakinItem.setMatnrId(item.getMatnrId());
+ pakinItem.setReceiptQty(item.getAnfme());
+ return pakinItem;
+ }).collect(Collectors.toList());
+ param.setItems(itemList);
+ break;
+ }
+ waitPakinService.mergeItemsWcs(param, loginUserId);
+ log.info("璁㈠崟 {} 鑷姩缁勬墭瀹屾垚锛屽叡澶勭悊 {} 涓」鐩�", orderNo, param.getItems().size());
+ } catch (Exception e) {
+ log.error("璁㈠崟 {} 鑷姩缁勬墭澶辫触: {}", orderNo, e.getMessage(), e);
+ }
+ }
/**
* @author Ryan
* @date 2025/8/19
--
Gitblit v1.9.1