From 375f337b2a91e59beb0b41dc89353de1e92aa6a1 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 22 一月 2026 18:54:50 +0800
Subject: [PATCH] agv工作档增加 is_deleted
---
src/main/java/com/zy/asrs/mapper/MonthlySettleMapper.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/MonthlySettleMapper.java b/src/main/java/com/zy/asrs/mapper/MonthlySettleMapper.java
index 8737987..e31d5c5 100644
--- a/src/main/java/com/zy/asrs/mapper/MonthlySettleMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MonthlySettleMapper.java
@@ -20,14 +20,14 @@
MonthlySettle selectLatestSettle();
/**
- * 缁熻鏈堢粨鏃堕棿鑼冨洿鍐呯殑璁㈠崟鏁伴噺
+ * 缁熻鏈堢粨鏃堕棿鑼冨洿鍐呮湭瀹屾垚鐨勫叆搴撹鍗曟暟閲�
*/
- int countOrdersInRange(@Param("startDate") String startDate, @Param("endDate") String endDate);
+ int countUnfinishedOrdersInRangePakin(@Param("startDate") String startDate, @Param("endDate") String endDate);
/**
- * 缁熻鏈堢粨鏃堕棿鑼冨洿鍐呮湭瀹屾垚鐨勮鍗曟暟閲忥紙鍏ュ簱鍜屽嚭搴擄級
+ * 缁熻鏈堢粨鏃堕棿鑼冨洿鍐呮湭瀹屾垚鐨勫嚭搴撹鍗曟暟閲�
*/
- int countUnfinishedOrdersInRange(@Param("startDate") String startDate, @Param("endDate") String endDate);
+ int countUnfinishedOrdersInRangePakout(@Param("startDate") String startDate, @Param("endDate") String endDate);
/**
* 缁熻鏈堢粨鏃堕棿鑼冨洿鍐呯殑鐗╂枡鍑哄叆搴撴暟閲忥紙浠庡叆搴撹〃鏌ヨ锛�
@@ -65,5 +65,15 @@
* 娓呴櫎鍑哄簱璁㈠崟鐨勬湀缁撲俊鎭�
*/
int clearOrderSettleInfoPakout(@Param("settleId") Long settleId);
+
+ /**
+ * 鏌ヨ鏈堢粨鏄庣粏娴佹按锛堝叆搴撹鍗曟槑缁嗭級
+ */
+ List<com.zy.asrs.entity.result.MonthlySettleDetailFlowVO> selectDetailFlowFromPakin(@Param("settleId") Long settleId);
+
+ /**
+ * 鏌ヨ鏈堢粨鏄庣粏娴佹按锛堝嚭搴撹鍗曟槑缁嗭級
+ */
+ List<com.zy.asrs.entity.result.MonthlySettleDetailFlowVO> selectDetailFlowFromPakout(@Param("settleId") Long settleId);
}
--
Gitblit v1.9.1