From 69983d407ce1d271d7c67474490b1b2717558bd0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 18 二月 2025 15:43:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
index 11e0d09..dcb2c43 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
@@ -106,8 +106,11 @@
         update(
                 new LambdaUpdateWrapper<RawGlassStorageDetails>()
                         .set(RawGlassStorageDetails::getRemainQuantity, request.getRemainQuantity())
-                        .eq(RawGlassStorageDetails::getSlot, request.getSlot())
-                        .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
+                        .set(RawGlassStorageDetails::getPatternWidth, request.getPatternWidth())
+                        .set(RawGlassStorageDetails::getPatternHeight, request.getPatternHeight())
+                        .set(RawGlassStorageDetails::getPatternThickness, request.getPatternThickness())
+                        .set(RawGlassStorageDetails::getFilmsId, request.getFilmsId())
+                        .eq(RawGlassStorageDetails::getSlot, request.getSlot()));
         return "success";
     }
 
@@ -190,4 +193,13 @@
         readWriteEntity.setValue(value);
         return readWriteEntity;
     }
+
+    @Override
+    public String shelfReset(Long slot) {
+        update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slot)
+                .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+                .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RESET));
+        //鐢熸垚涓�鏉¤鎯呮暟鎹�  浠呰褰曟灦瀛愮姸鎬�
+        return "success";
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0