From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGlassShelfMapper.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 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 9607970..1b86d52 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,22 +17,35 @@
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);
- List<Map<String, Object>> getSelectFinishedGlassShelfInformationInId(@Param("ids") List<Long> ids);
+
+ Map<String, Object> getSelectFinishedGlassShelfInformationInId(@Param("glassShelfName") String glassShelfName,
+ @Param("price") Double price,
+ @Param("unit") String unit,
+ @Param("weight") Double weight,
+ @Param("width") Double width,
+ @Param("height") Double height);
boolean deleteFinishedGlassShelfInformationById(Long id);
@@ -53,12 +66,15 @@
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,
+ Double price,String unit,String glassShelfName);
- boolean updateInformationAvailableQuantityInt(@Param("finishedGlassShelfEmitDetails") FinishedGlassShelfEmitDetails finishedGlassShelfEmitDetails);
+ boolean updateInformationAvailableQuantityInt(Double maxWeight,Double maxWidth,Double maxHeight,Integer quantity,
+ Double price,String unit,String glassShelfName);
- boolean insertFinishedGlassShelfEmitDetailsLog(String emitId,Integer emitNumber,Integer type,String glassShelfNumber,String glassShelfName,Integer quantity,
- Double price,Double money,String unit,String remarks);
+ boolean insertFinishedGlassShelfEmitDetailsLog(String emitId,Integer emitNumber,Integer type,Integer quantity,
+ Double price,Double money,String unit,String remarks,
+ Double maxWeight,Double maxWidth,Double maxHeight,String glassShelfName,String operator);
List<FinishedGlassShelfEmit> getSelectFinishedGlassShelfEmit(@Param("offset") Integer offset,
@Param("pageSize") Integer pageSize, String startDate, String endDate,
--
Gitblit v1.8.0