From 2fb1e4fec9fd815c71291f65317c25c8f89de060 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 23 一月 2026 15:29:50 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 1dd4ab7..9a1ea89 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
@@ -44,6 +44,8 @@
import java.util.*;
import java.util.stream.Collectors;
+import static com.vincent.rsf.server.system.utils.SerialRuleUtils.objectToMap;
+
/**
* @author Ryan
* @version 1.0
@@ -405,13 +407,13 @@
public R syncCheckOrder(List<SyncOrderParams> syncOrders, Long loginUserId) {
if (!syncOrders.isEmpty()) {
syncOrders.forEach(syncOrder -> {
- WkOrder wkOrder = new WkOrder();
+ WkOrder wkOrder = new WkOrder(syncOrder);
DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
.eq(DictData::getValue, syncOrder.getWkType()), false);
if (Objects.isNull(one)) {
throw new CoolException("鍗曟嵁锛�" + syncOrder.getOrderNo() + ", 涓氬姟绫诲瀷涓嶅瓨鍦紒锛�");
}
- WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
.eq(!Objects.isNull(syncOrder.getOrderId()), WkOrder::getPoId, syncOrder.getOrderId())
.eq(WkOrder::getPoCode, syncOrder.getOrderNo()));
if (!Objects.isNull(order)) {
@@ -430,14 +432,21 @@
rule = SerialRuleCode.SYS_OUT_STOCK_CODE;
}
- String ruleCode = SerialRuleUtils.generateRuleCode(rule, null);
+ //閾跺骇鐗逛緵
+ String orderNs = null;
+ if (rule.equals(SerialRuleCode.SYS_ASN_ORDER) || rule.equals(SerialRuleCode.SYS_OUT_STOCK_CODE) ){
+ StringBuffer buffer = new StringBuffer();
+ Object poCode = syncOrder.getOrderNo();
+ orderNs = poCode == null ? "" : buffer.append(poCode).toString();
+ }
+ String ruleCode = orderNs;
wkOrder.setType(syncOrder.getType())
.setWkType(one.getValue())
.setAnfme(syncOrder.getAnfme())
.setPoCode(syncOrder.getOrderNo())
.setWorkQty(0.0)
.setQty(0.0)
- .setPoId(syncOrder.getOrderId())
+ .setPoId(syncOrder.getOrderInternalCode())
.setCode(ruleCode)
.setArrTime(syncOrder.getArrTime())
.setId(null)
@@ -461,6 +470,10 @@
map.put("poCode", wkOrder.getPoCode());
map.put("order_code", wkOrder.getCode());
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());
if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
--
Gitblit v1.9.1