From 43525a12afaf7368decbed730f0240a6709d8355 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期三, 24 十二月 2025 12:05:58 +0800
Subject: [PATCH] 月结
---
src/main/java/com/zy/asrs/mapper/MonthlySettleMapper.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/MonthlySettleMapper.java b/src/main/java/com/zy/asrs/mapper/MonthlySettleMapper.java
index 1710a27..8737987 100644
--- a/src/main/java/com/zy/asrs/mapper/MonthlySettleMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MonthlySettleMapper.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.MonthlySettle;
-import com.zy.asrs.entity.result.MaterialInOutStatDTO;
+import com.zy.asrs.entity.result.MaterialInOutRawDTO;
import com.zy.asrs.entity.result.PreviousSettleEndingQtyDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -30,9 +30,14 @@
int countUnfinishedOrdersInRange(@Param("startDate") String startDate, @Param("endDate") String endDate);
/**
- * 缁熻鏈堢粨鏃堕棿鑼冨洿鍐呯殑鐗╂枡鍑哄叆搴撴暟閲忥紙鍚堝苟鍏ュ簱鍜屽嚭搴擄級
+ * 缁熻鏈堢粨鏃堕棿鑼冨洿鍐呯殑鐗╂枡鍑哄叆搴撴暟閲忥紙浠庡叆搴撹〃鏌ヨ锛�
*/
- List<MaterialInOutStatDTO> statisticsMaterialInOut(@Param("startDate") String startDate, @Param("endDate") String endDate);
+ List<MaterialInOutRawDTO> statisticsMaterialInOutFromPakin(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+ /**
+ * 缁熻鏈堢粨鏃堕棿鑼冨洿鍐呯殑鐗╂枡鍑哄叆搴撴暟閲忥紙浠庡嚭搴撹〃鏌ヨ锛�
+ */
+ List<MaterialInOutRawDTO> statisticsMaterialInOutFromPakout(@Param("startDate") String startDate, @Param("endDate") String endDate);
/**
* 鑾峰彇涓婁竴涓湀缁撶殑鐗╂枡鏈熸湯搴撳瓨
--
Gitblit v1.9.1