From b97ab3e077df3665663eb3a5b0c23d54c83a5548 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期五, 31 五月 2024 12:02:25 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast_detail.html | 6 +-
src/main/resources/mapper/ViewStayTimeMapper.xml | 59 ++++++++++-------------------
src/main/webapp/static/js/locMast/locMast.js | 2
src/main/java/com/zy/asrs/entity/LocMast.java | 2 +
4 files changed, 27 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 4648d05..3002d7a 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -224,6 +224,8 @@
case 1:
return "浣庡簱浣�";
case 2:
+ return "涓簱浣�";
+ case 3:
return "楂樺簱浣�";
default:
return String.valueOf(this.locType1);
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index 7a0e299..8181ced 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -92,28 +92,7 @@
<!-- 鍒嗛〉鏌ヨAGV鍜屽洓椤瑰簱鎵�鏈変俊鎭� -->
<select id="queryAllViewStayTimeList" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
- select
- *
- from (
- select
- ROW_NUMBER() over (order by stay_time desc) as row
- , *
- from
- (
- SELECT
- GETDATE() AS today
- , CONVERT(decimal, DATEDIFF(second,all_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
- , all_loc_detl.*
- FROM all_loc_detl
- where 1=1
- <include refid="viewStayTimeConditionSql"></include>
- ) t
- left join (select matnr as c ,store_max_date,store_max,store_min from man_mat) b
- on t.matnr = b.c
- left join (select matnr as f,sum(asr_loc_detl.anfme) as sum_qty from asr_loc_detl group by asr_loc_detl.matnr ) as z
- on z.f= b.c
-
- ) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ c
</select>
<select id="getAllViewStayTimeCount" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="Integer">
select
@@ -138,22 +117,26 @@
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
<select id="getViewStayTimeAll" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
select
- *
- from (
- select
- ROW_NUMBER() over (order by stay_time desc) as row
- , *
- from
- (
- SELECT
- GETDATE() AS today
- , CONVERT(decimal, DATEDIFF(second,asr_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
- , dbo.asr_loc_detl.*
- FROM asr_loc_detl
- INNER JOIN asr_loc_mast ON asr_loc_detl.loc_no = asr_loc_mast.loc_no
- where 1=1
- <include refid="viewStayTimeConditionSql"></include>
- ) t
+ *
+ from (
+ select
+ ROW_NUMBER() over (order by stay_time desc) as row
+ , *
+ from
+ (
+ SELECT
+ GETDATE() AS today
+ , CONVERT(decimal, DATEDIFF(second,all_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
+ ,
+ all_loc_detl.*
+ FROM all_loc_detl
+ ) t
+ left join (select matnr as c ,store_max_date,store_max,store_min from man_mat) b
+ on t.matnr = b.c
+ left join (select matnr as f,sum(asr_loc_detl.anfme) as sum_qty from asr_loc_detl group by asr_loc_detl.matnr ) as z
+ on z.f= b.c
+
+
) a
</select>
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index c31ecf8..92dd739 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -442,7 +442,7 @@
bay1: $('#bay1').val(),
lev1: $('#lev1').val(),
fullPlt: $('#fullPlt').val(),
- locType: $('#locType').val(),
+ locType1: $('#locType1').val(),
outEnable: $('#outEnable').val(),
ioTime: top.strToDate($('#ioTime\\$').val()),
firstTime: top.strToDate($('#firstTime\\$').val()),
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 1e12d40..5391d98 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -71,10 +71,10 @@
</div>
</div>
</div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">楂樹綆绫诲瀷锛�</label>
<div class="layui-input-inline">
- <input id="sheetNo" class="layui-input" type="text">
+ <input id="locType1" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:80%;">
--
Gitblit v1.9.1