From 9212801fbac08dd12b8205c217bdeb925529ab7c Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 27 二月 2025 09:55:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 df5d53d..fbdc55e 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
@@ -103,15 +103,16 @@
     }
 
     @Override
-    public String UpdateQuantity(RawGlassRequest request) {
+    public String updateQuantity(RawGlassRequest request) {
         RawGlassStorageDetails one = getOne(new LambdaQueryWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, request.getSlot())
                 .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
         if (null == one) {
             RawGlassStorageDetails details = new RawGlassStorageDetails();
             BeanUtils.copyProperties(request, details);
             details.setState(Const.RAW_GLASS_STATE_IN);
+            details.setShelf(request.getSlot());
             save(details);
-        }else{
+        } else {
             update(
                     new LambdaUpdateWrapper<RawGlassStorageDetails>()
                             .set(RawGlassStorageDetails::getRemainQuantity, request.getRemainQuantity())
@@ -120,7 +121,7 @@
                             .set(RawGlassStorageDetails::getPatternThickness, request.getPatternThickness())
                             .set(RawGlassStorageDetails::getFilmsId, request.getFilmsId())
                             .eq(RawGlassStorageDetails::getSlot, request.getSlot())
-                            .eq(RawGlassStorageDetails::getSlot, Const.RAW_GLASS_STATE_IN));
+                            .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
         }
         return "success";
     }

--
Gitblit v1.8.0