From d5a4e5c81ef37c5dc23ba286fffebfaf59e04ba3 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 08:03:37 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
index 1521faa..d0473e7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
@@ -77,7 +77,7 @@
LocAreaMatRela locAreaMatRela = new LocAreaMatRela();
locAreaMatRela
.setAreaMatId(param.getAreaMatId())
- .setAreaId(param.getAreaId())
+// .setAreaId(param.getAreaId())
.setLocId(locId)
.setLocTypeId(typeId)
.setMatnrId(matnrId.getId())
@@ -154,7 +154,7 @@
}
if (!this.remove(new LambdaQueryWrapper<LocAreaMatRela>()
.eq(LocAreaMatRela::getAreaMatId, Long.parseLong(param.get("areaMatId").toString()))
- .eq(LocAreaMatRela::getLocTypeId, Long.parseLong(param.get("locTypeId").toString())))) {
+ .eq(LocAreaMatRela::getLocTypeId, Long.parseLong(param.get("typeId").toString())))) {
throw new CoolException("鍒犻櫎澶辫触锛侊紒");
}
--
Gitblit v1.9.1