From 97891cd2be28b7cd7075f0f0a89fc385baae9410 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 03 三月 2025 15:22:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
index e22f979..ae005d6 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
@@ -60,7 +60,7 @@
         JSONObject jsonObject = new JSONObject();
         MPJLambdaWrapper<RawGlassStorageDetails> wrapper = new MPJLambdaWrapper<>();
         wrapper.select(RawGlassStorageStation::getSlot)
-                .select(RawGlassStorageDetails::getRemainQuantity)
+                .select("ifnull(remain_quantity, 0) as remain_quantity")
                 .rightJoin(RawGlassStorageStation.class, on -> on.eq(RawGlassStorageStation::getSlot, RawGlassStorageDetails::getSlot)
                         .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN))
                 .orderByAsc(RawGlassStorageStation::getSlot);

--
Gitblit v1.8.0