From 3c7d672fb7d6c34742fb7da6f66616ccf3be2c9a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 08 十一月 2024 14:50:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
similarity index 78%
rename from hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
index 9d2b255..7362cad 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassstation/service/impl/RawGlassStorageStationServiceImpl.java
@@ -24,11 +24,12 @@
     public List<RawGlassStorageStation> selectStations() {
         return list();
     }
+
     @Override
     public boolean updateRawGlassStorageStation(String slot) {
         UpdateWrapper<RawGlassStorageStation> wrapper = new UpdateWrapper<>();  //杩欎釜绫诲瀷瀹氫箟閿欎簡锛屼笉搴旇鏄痶asking
-        wrapper.set("slot","105")
-                .eq( "slot",slot);
+        wrapper.set("slot", "105")
+                .eq("slot", slot);
         return update(wrapper);
     }
 
@@ -44,16 +45,16 @@
         return this.save(rw);
     }
 
-  @Override
-  public List<RawGlassStorageDetails> listRawGlassDetails() {
+    @Override
+    public List<RawGlassStorageDetails> listRawGlassDetails() {
         return baseMapper.listRawGlassDetails();
     }
 
-  @Override
-  public boolean updateSlotState(Integer slot, Integer enableState) {
-    return update(
-        new LambdaUpdateWrapper<RawGlassStorageStation>()
-            .set(RawGlassStorageStation::getEnableState, enableState)
-            .eq(RawGlassStorageStation::getSlot, slot));
-  }
+    @Override
+    public boolean updateSlotState(Integer slot, Integer enableState) {
+        return update(
+                new LambdaUpdateWrapper<RawGlassStorageStation>()
+                        .set(RawGlassStorageStation::getEnableState, enableState)
+                        .eq(RawGlassStorageStation::getSlot, slot));
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0