From f03aec1e60117209a32cd9b780f881c77dc07b67 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 15:16:51 +0800
Subject: [PATCH] 1、fixbug:原片仓出前后段入参形式不同导致后端接收不到入参报错 2、优化：钢化前/中空大理片笼新增字段是否相同：用于判断进片任务数据是否在笼内已存在玻璃，避免玻璃重复入库
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 d6f8a66..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
@@ -2,10 +2,14 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.common.config.Const;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
+import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
@@ -54,10 +58,13 @@
public void largenScreen() {
log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
JSONObject jsonObject = new JSONObject();
- List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageDetailsService.list(
- new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- );
+ MPJLambdaWrapper<RawGlassStorageDetails> wrapper = new MPJLambdaWrapper<>();
+ wrapper.select(RawGlassStorageStation::getSlot)
+ .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);
+ List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageDetailsService.list(wrapper);
jsonObject.append("rawGlassStorageDetailList", rawGlassStorageDetailList);
List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (CollectionUtil.isNotEmpty(sendwServer)) {
--
Gitblit v1.8.0