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 | 79 +++++++++++++++++++++++++++++++++------
1 files changed, 67 insertions(+), 12 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 6875b38..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
@@ -1,9 +1,6 @@
package com.example.erp.mapper.mm;
-import com.example.erp.entity.mm.FinishedGlassShelfEmit;
-import com.example.erp.entity.mm.FinishedGlassShelfEmitDetails;
-import com.example.erp.entity.mm.FinishedGlassShelfInformation;
-import com.example.erp.entity.mm.MaterialInventory;
+import com.example.erp.entity.mm.*;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderOtherMoney;
@@ -11,6 +8,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.data.repository.CrudRepository;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -19,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);
@@ -55,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,
- @Param("finishedGlassShelfEmitDetails") FinishedGlassShelfEmitDetails finishedGlassShelfEmitDetails);
+ 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,
@@ -78,4 +92,45 @@
boolean updateFinishedGlassShelfEmitDetailsLog(@Param("emitId") String emitId);
+ FinishedGlassShelfWithdraw getSelectFinishedGlassShelfWithdrawByemitId(@Param("withdrawId") String withdrawId);
+
+ List<FinishedGlassShelfWithdrawDetails> getSelectFinishedGlassShelfWithdrawDetailsBywithdrawId1(@Param("withdrawId") String withdrawId);
+
+ List<Map<String, Object>> getSelectFinishedGlassShelfWithdrawDetailsBywithdrawId(@Param("withdrawId") String withdrawId);
+
+ boolean updateEmitDetailsWithdrawQuantityOut(@Param("finishedGlassShelfWithdrawDetails") FinishedGlassShelfWithdrawDetails finishedGlassShelfWithdrawDetails);
+
+ boolean updateEmitDetailsWithdrawQuantityInt(@Param("finishedGlassShelfWithdrawDetails") FinishedGlassShelfWithdrawDetails finishedGlassShelfWithdrawDetails);
+
+ boolean deleteFinishedGlassShelfWithdrawDetails(@Param("withdrawId") String withdrawId);
+
+ boolean deleteFinishedGlassShelfWithdraw(@Param("withdrawId") String withdrawId);
+
+ boolean updateFinishedGlassShelfWithdraw(@Param("finishedGlassShelfWithdraw") FinishedGlassShelfWithdraw finishedGlassShelfWithdraw,String withdrawId);
+
+ boolean insertFinishedGlassShelfWithdraw(@Param("finishedGlassShelfWithdraw") FinishedGlassShelfWithdraw finishedGlassShelfWithdraw,String withdrawId);
+
+ boolean insertFinishedGlassShelfWithdrawDetails(String withdrawId,Integer withdrawNumber,
+ @Param("finishedGlassShelfWithdrawDetails") FinishedGlassShelfWithdrawDetails finishedGlassShelfWithdrawDetails);
+
+ boolean updateFinishedGlassShelfEmitState(Integer state,@Param("emitId") String emitId);
+
+ List<FinishedGlassShelfWithdraw> getSelectFinishedGlassShelfWithdraw(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize, String startDate, String endDate,
+ @Param("withdraw") FinishedGlassShelfWithdraw finishedGlassShelfWithdraw);
+
+ Map<String,Integer> getSelectFinishedGlassShelfWithdrawPageTotal(Integer offset, Integer pageSize, String startDate, String endDate,
+ @Param("withdraw") FinishedGlassShelfWithdraw finishedGlassShelfWithdraw);
+
+
+ List<FinishedGlassShelfLog> getFinishedGlassShelfLogReport(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
+ @Param("finishedGlassShelfLog") FinishedGlassShelfLog finishedGlassShelfLog,Integer type);
+
+ Map<String,Integer> getFinishedGlassShelfLogReportTotal(@Param("offset") Integer offset,
+ @Param("pageSize") Integer pageSize,String startDate, String endDate,
+ @Param("finishedGlassShelfLog") FinishedGlassShelfLog finishedGlassShelfLog,Integer type);
+
+ List<FinishedGlassShelfLog> exportFinishedGlassShelfLogReport(List<LocalDate> dates, Integer type);
+
}
--
Gitblit v1.8.0