From 4dcb5e299757924aef0edc4d608d2305dbedc780 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 九月 2025 08:59:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGlassShelfMapper.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGlassShelfMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGlassShelfMapper.java
index 4d11413..2b2d297 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGlassShelfMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGlassShelfMapper.java
@@ -17,24 +17,32 @@
List<FinishedGlassShelfInformation> getSelectFinishedGlassShelfInformation(@Param("finishedGlassShelfInformation") FinishedGlassShelfInformation finishedGlassShelfInformation);
- boolean insetFinishedGlassShelfInformation(@Param("finishedGlassShelfInformation") FinishedGlassShelfInformation finishedGlassShelfInformation);
+ Integer getSelectFinishedGlassShelfInformationInventoryArea(@Param("inventoryArea")String inventoryArea);
- boolean insetFinishedGlassShelfLog(@Param("finishedGlassShelfInformation") FinishedGlassShelfInformation finishedGlassShelfInformation);
+ boolean insetFinishedGlassShelfInformation(@Param("finishedGlassShelfInformation") FinishedGlassShelfInformation finishedGlassShelfInformation,String inventoryAreaNumber);
+
+ boolean insetFinishedGlassShelfLog(@Param("finishedGlassShelfInformation") FinishedGlassShelfInformation finishedGlassShelfInformation,Integer quantity);
boolean updateFinishedGlassShelfInformationQuantity(Integer quantity,Long id);
boolean updateFinishedGlassShelfInformation(@Param("finishedGlassShelfInformation") FinishedGlassShelfInformation finishedGlassShelfInformation,Long id);
- List<FinishedGlassShelfInformation> getSelectFinishedGlassShelfInformationDate(@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
+ List<Map<String, Object>> getSelectFinishedGlassShelfInformationDate(@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
Map<String,Integer> getSelectFinishedGlassShelfInformationDatePageTotal(Integer offset, Integer pageSize);
+ List<FinishedGlassShelfInformation> getSelectFinishedGlassShelfInformationDateDetail(@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
+
+
+ Map<String,Integer> getSelectFinishedGlassShelfInformationDateDetailPageTotal(Integer offset, Integer pageSize);
+
FinishedGlassShelfInformation getSelectFinishedGlassShelfInformationById(Long id);
- FinishedGlassShelfInformation getSelectFinishedGlassShelfInformationByGlassShelfnumber(String glassShelfnumber);
- List<Map<String, Object>> getSelectFinishedGlassShelfInformationInId(@Param("ids") List<Long> ids);
+ Map<String, Object> getSelectFinishedGlassShelfInformationInId(@Param("weight") Double weight,
+ @Param("width") Double width,
+ @Param("height") Double height);
boolean deleteFinishedGlassShelfInformationById(Long id);
@@ -55,11 +63,11 @@
boolean insertFinishedGlassShelfEmitDetails(String emitId,Integer emitNumber,
@Param("finishedGlassShelfEmitDetails") FinishedGlassShelfEmitDetails finishedGlassShelfEmitDetails);
- boolean updateInformationAvailableQuantityOut(@Param("finishedGlassShelfEmitDetails") FinishedGlassShelfEmitDetails finishedGlassShelfEmitDetails);
+ boolean updateInformationAvailableQuantityOut(Double maxWeight,Double maxWidth,Double maxHeight,Integer quantity);
- boolean updateInformationAvailableQuantityInt(@Param("finishedGlassShelfEmitDetails") FinishedGlassShelfEmitDetails finishedGlassShelfEmitDetails);
+ boolean updateInformationAvailableQuantityInt(Double maxWeight,Double maxWidth,Double maxHeight,Integer quantity);
- boolean insertFinishedGlassShelfEmitDetailsLog(String emitId,Integer emitNumber,Integer type,String glassShelfNumber,String glassShelfName,Integer quantity,
+ boolean insertFinishedGlassShelfEmitDetailsLog(String emitId,Integer emitNumber,Integer type,Integer quantity,
Double price,Double money,String unit,String remarks,Double maxWeight,Double maxWidth,Double maxHeight);
List<FinishedGlassShelfEmit> getSelectFinishedGlassShelfEmit(@Param("offset") Integer offset,
--
Gitblit v1.8.0