From ef58728d9806760b43b5558f59e074c3f1b73311 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 10 七月 2024 16:47:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

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

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
index 88effb1..14e96bf 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
@@ -59,7 +59,7 @@
         if (Details.size() > 0) {
             DownStorageCageDetails downStorageCageDetails = Details.get(0);
             String flowCardId = downStorageCageDetails.getFlowCardId();
-            int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId);
+            int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId,1);
             DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, null));
             List<DownWorkstation> downWorkstations = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
                     .eq(DownWorkstation::getEnableState, 1));
@@ -286,7 +286,7 @@
                     downGlassInfoService.insertDownGlassInfo(newdownGlassInfo);
                     log.info("鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃");
                     DownWorkstation downWorkstation1 = downWorkstationService.selectByFlowCardId(downGlassInfo.getFlowCardId());
-                    downWorkstationService.updateracksnumber(downGlassInfo.getFlowCardId(), downWorkstation1.getRacksnumber() + 1);
+                    downWorkstationService.updateracksnumber(downGlassInfo.getFlowCardId(), downWorkstation1.getRacksNumber() + 1);
                     log.info("鏇存柊钀芥灦鏁伴噺");
 //                    LambdaQueryWrapper<DownGlassTask> wrapper = new LambdaQueryWrapper<>();
 //                    wrapper.eq(DownGlassTask::getGlassId, newdownGlassInfo.getGlassId());

--
Gitblit v1.8.0