From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 6a804db..c8e20c1 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -24,17 +24,17 @@
public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
// // 搴撲綅Map
- @Select("select distinct row1 from asr_loc_mast order by row1 asc")
+ @Select("select distinct row1 from asr_loc_mast_man_node_merge order by row1 asc")
List<Integer> getViewLocRowTotal();
- @Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc")
+ @Select("select distinct lev1 from asr_loc_mast_man_node_merge where row1=#{row1} order by lev1 desc")
public List<String> getViewLocLevCount(@Param("row1") int row1);
//
- @Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1")
+ @Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast_man_node_merge where row1=#{row1} and lev1=#{lev1} order by bay1")
public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1);
// 搴撲綅Map
- @Select("select distinct bay1 from asr_loc_mast where row1=#{row1} order by bay1")
+ @Select("select distinct bay1 from asr_loc_mast_man_node_merge where row1=#{row1} order by bay1")
public List<String> getViewLocBayCount(@Param("row1") int row1);
@Select("select lev1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
@@ -64,6 +64,15 @@
//楗肩姸鍥�
@Select("select * from asr_loc_use_view")
public LocChartPie getLocUseRate();
+
+ //绔嬪簱鏁版嵁
+ @Select("select * from asr_loc_use_view_L")
+ public LocChartPie getLocUseRateL();
+
+ //骞冲簱鏁版嵁
+ @Select("select * from asr_loc_use_view_P")
+ public LocChartPie getLocUseRateP();
+
//鏇茬嚎鍥�
@Select("select ymd,SUM(sto_qty) inqty,SUM(ret_qty) outqty from asr_sta_inout_view "
+ "where ymd>CONVERT(char(10), DATEADD(DAY,-12,GETDATE()), 120) group by ymd order by ymd")
--
Gitblit v1.9.1