From 3b69c53a60ba0bf36c44ff500b9f0ca622fef181 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 05 三月 2025 17:03:47 +0800
Subject: [PATCH] 添加大屏订单数据,添加往ERP传输现补数据功能

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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 7048172..57806a4 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
@@ -8,6 +8,7 @@
 import com.kangaroohy.milo.service.MiloService;
 import com.mes.common.config.Const;
 import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.entity.dto.RawGlassStorageDetailsDTO;
 import com.mes.rawglassdetails.entity.request.RawGlassRequest;
 import com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper;
 import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
@@ -102,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())
@@ -119,16 +121,15 @@
                             .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";
     }
 
     @Override
     public String deleteWarehousing(Long slotId) {
-        update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slotId)
-                .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
-                .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
+        remove(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slotId)
+                .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
         return "success";
     }
 
@@ -212,4 +213,9 @@
         //鐢熸垚涓�鏉¤鎯呮暟鎹�  浠呰褰曟灦瀛愮姸鎬�
         return "success";
     }
+
+    @Override
+    public List<RawGlassStorageDetailsDTO> patternUsage(String width, String height, String thickness, String films){
+        return baseMapper.patternUsage(width, height, thickness, films);
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0