From 8a7e936b92038a9e5c7de3e1314c43f1346202c1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 01 八月 2024 15:02:29 +0800
Subject: [PATCH] 大理片笼出片逻辑调整:1、尺寸限制 2、fixbug:玻璃重复进出,造成按照历史任务查询笼内玻璃尺寸返回多条记录sql查询异常 3、对列表在新增数据前先按照玻璃id对历史数据进行删除后新增,保证对列表数据唯一,防止大理片笼进片异常

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
index 56a0fdd..cbcb1ff 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -141,7 +141,7 @@
 
 
     @Override
-    public int updateFlowCardIdAndCount(String flowCardId, int workstationId, int layer) {
+    public void updateFlowCardIdAndCount(String flowCardId, int workstationId, int layer) {
         int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId, layer);
         QueryWrapper<Damage> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("process_id", flowCardId);
@@ -154,8 +154,9 @@
                 .set("layer", layer)
                 .set("other_number", otherNumber)
                 .eq("workstation_id", workstationId);
+
         this.update(updateWrapper);
-        return 1;
+
     }
 
     @Override
@@ -190,4 +191,23 @@
     }
 
 
+    @Override
+    public boolean updateDownWorkstationstate(DownWorkstation downWorkstation) {
+
+        DownWorkstation downWork = baseMapper.selectById(downWorkstation.getId());
+
+        if (downWork != null) {
+
+            downWork.setEnableState(downWorkstation.getEnableState());
+
+            baseMapper.updateById(downWork);
+
+            return true;
+        } else {
+
+            return false;
+        }
+    }
+
+
 }

--
Gitblit v1.8.0