From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 97f97ff..8b917c4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -437,11 +437,11 @@
                             .setRow(dto.getRow())
                             .setLev(dto.getLev())
                             .setId(null)
-                            .setAreaId(41L)
-                            .setWarehouseId(27L)
+                            .setAreaId(42L)
+                            .setWarehouseId(29L)
                             .setBarcode(string)
                             .setCol(dto.getBay())
-                            .setType(dto.getLocType())
+                            .setType(dto.getLocType().equals("16") ? "17" : "15")
                             .setStatus(dto.getStatusBool())
                             .setUseStatus(LocStsType.getLocSts(dto.getLocSts()));
                     if (!locService.save(loc)) {

--
Gitblit v1.9.1