From a22208471156a57fc52f000d4184d6c628ac6496 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 十一月 2024 12:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 9ae2e2c..421d50e 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -272,10 +272,13 @@
Page<LocDetlAll> stockStatis = locDetlService.getStockStatisAll(toPage(curr, limit, param, LocDetlAll.class));
for (LocDetlAll locDetlAll : stockStatis.getRecords()) {
+ Double weight = locDetlAll.getWeight();
+
Mat mat = matService.selectByMatnr(locDetlAll.getMatnr());
if (mat != null) {
locDetlAll.sync(mat);
}
+ locDetlAll.setWeight(weight);
}
return R.ok().add(stockStatis);
}
--
Gitblit v1.9.1