From 0c5c7b1ab367a4df960e566de8379564015b226b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 27 一月 2026 09:51:13 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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 cdbe0d6..179200f 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
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.api.controller.erp.params.dto.CheckDiffDto;
import com.vincent.rsf.server.api.controller.erp.params.dto.TransferInfoDto;
import com.vincent.rsf.server.api.controller.erp.params.dto.WkOrderDto;
+import com.vincent.rsf.server.api.utils.TimeConverterUtils;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
@@ -448,13 +449,14 @@
.setWkType(one.getValue())
.setAnfme(syncOrder.getAnfme())
.setPoCode(syncOrder.getOrderNo())
- .setWorkQty(0.0)
- .setQty(0.0)
+ .setWorkQty(0.0)//鎵ц鏁伴噺
+ .setQty(0.0)//瀹屾垚鏁伴噺
.setPoId(syncOrder.getOrderInternalCode())
.setCode(ruleCode)
.setArrTime(syncOrder.getArrTime())
.setId(null)
- .setCreateTime(new Date())
+ .setCreateTime(new TimeConverterUtils().timestampToDate(syncOrder.getCreateTime()))
+ .setBusinessTime(new TimeConverterUtils().timestampToDate(syncOrder.getBusinessTime()))
.setUpdateTime(new Date())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
@@ -488,6 +490,22 @@
map.put("model", orderItem.getModel());
map.put("stockUnit", orderItem.getUnit());
map.put("purUnit", orderItem.getUnit());
+ map.put("baseUnit", orderItem.getBaseUnitId());
+ map.put("useOrgId", orderItem.getUseOrgId());
+ map.put("useOrgName", orderItem.getUseOrgName());
+ map.put("erpClsId", orderItem.getErpClsId());
+ map.put("priceUnitId", orderItem.getPriceUnitId());
+ map.put("inStockType", orderItem.getInStockType());
+ map.put("ownerTypeId", orderItem.getOwnerTypeId());
+ map.put("ownerId", orderItem.getOwnerId());
+ map.put("ownerName", orderItem.getOwnerName());
+ map.put("keeperTypeId", orderItem.getKeeperTypeId());
+ map.put("keeperId", orderItem.getKeeperId());
+ map.put("keeperName", orderItem.getKeeperName());
+ map.put("targetWarehouseId", orderItem.getTargetWarehouseId());
+ map.put("sourceWarehouseId", orderItem.getSourceWarehouseId());
+ map.put("createBy", loginUserId);
+ map.put("updateBy", loginUserId);
if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
@@ -506,13 +524,18 @@
//缁勬墭
WaitPakinParam pakinParam = new WaitPakinParam();
pakinParam.setBarcode(palletId.get());
- CompletableFuture.runAsync(() -> {
- try {
- asyncMergeItemsWcs(pakinParam, syncOrder.getOrderNo(), loginUserId);
- } catch (Exception e) {
- log.warn("璁㈠崟 {} 寮�濮嬭嚜鍔ㄧ粍鎵�", syncOrder.getOrderNo());
- }
- });
+ 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());
+ }
+ });
+ }
}
});
}
--
Gitblit v1.9.1