From e2cbff1a68fd184b16d86f575b74467ed551e5d3 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 25 十二月 2024 09:53:20 +0800
Subject: [PATCH] #日出入库修复
---
src/main/resources/mapper/ViewInOutMapper.xml | 56 ++++++++++++++++++++++++++++----------------------------
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 4 ++--
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 0e89236..c731135 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -147,8 +147,8 @@
list = reportQueryMapper.queryViewInOutListYear(bean);
count = reportQueryMapper.getViewInOutCountYear(bean);
}else {
- list = reportQueryMapper.queryViewInOutList(bean);
- count = reportQueryMapper.getViewInOutCount(bean);
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ count = reportQueryMapper.getViewInOutCountDay(bean);
}
// List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
Page<ViewInOutBean> page = new Page<>();
diff --git a/src/main/resources/mapper/ViewInOutMapper.xml b/src/main/resources/mapper/ViewInOutMapper.xml
index fda9e96..8ee1e04 100644
--- a/src/main/resources/mapper/ViewInOutMapper.xml
+++ b/src/main/resources/mapper/ViewInOutMapper.xml
@@ -26,19 +26,19 @@
select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid
from (
SELECT ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
- FROM (SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ FROM (SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast AS asr_wrk_mast_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)
UNION ALL
- SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast_log
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)) AS a
WHERE (ymd IS NOT NULL)
@@ -63,19 +63,19 @@
select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid
from (
SELECT ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
- FROM (SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ FROM (SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast AS asr_wrk_mast_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)
UNION ALL
- SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast_log
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)) AS a
WHERE (ymd IS NOT NULL)
@@ -100,19 +100,19 @@
select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid
from (
SELECT ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
- FROM (SELECT wrk_no, CONVERT(char(7), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ FROM (SELECT wrk_no, CONVERT(char(7), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(7), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(7), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast AS asr_wrk_mast_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)
UNION ALL
- SELECT wrk_no, CONVERT(char(7), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ SELECT wrk_no, CONVERT(char(7), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast_log
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(7), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(7), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)) AS a
WHERE (ymd IS NOT NULL)
@@ -137,19 +137,19 @@
select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid
from (
SELECT ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
- FROM (SELECT wrk_no, CONVERT(char(4), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ FROM (SELECT wrk_no, CONVERT(char(4), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(4), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(4), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast AS asr_wrk_mast_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)
UNION ALL
- SELECT wrk_no, CONVERT(char(4), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ SELECT wrk_no, CONVERT(char(4), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast_log
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(4), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(4), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)) AS a
WHERE (ymd IS NOT NULL)
@@ -182,19 +182,19 @@
<select id="getViewInOutCountDay" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="Integer">
select count(1) from (
SELECT ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
- FROM (SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ FROM (SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast AS asr_wrk_mast_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)
UNION ALL
- SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast_log
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(10), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)) AS a
WHERE (ymd IS NOT NULL)
@@ -211,19 +211,19 @@
<select id="getViewInOutCountMonth" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="Integer">
select count(1) from (
SELECT ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
- FROM (SELECT wrk_no, CONVERT(char(7), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ FROM (SELECT wrk_no, CONVERT(char(7), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(7), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(7), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast AS asr_wrk_mast_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)
UNION ALL
- SELECT wrk_no, CONVERT(char(7), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ SELECT wrk_no, CONVERT(char(7), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast_log
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(7), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(7), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)) AS a
WHERE (ymd IS NOT NULL)
@@ -240,19 +240,19 @@
<select id="getViewInOutCountYear" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="Integer">
select count(1) from (
SELECT ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
- FROM (SELECT wrk_no, CONVERT(char(4), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ FROM (SELECT wrk_no, CONVERT(char(4), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(4), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(4), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast AS asr_wrk_mast_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)
UNION ALL
- SELECT wrk_no, CONVERT(char(4), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+ SELECT wrk_no, CONVERT(char(4), wrk_date, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
FROM dbo.asr_wrk_mast_log
WHERE (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts <= 5)
UNION ALL
- SELECT wrk_no, CONVERT(char(4), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+ SELECT wrk_no, CONVERT(char(4), wrk_date, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
FROM dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
WHERE (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts <= 15)) AS a
WHERE (ymd IS NOT NULL)
--
Gitblit v1.9.1