From 4e02590562894bf6614bc3066f6689f1b00ea2ce Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 14 八月 2024 16:39:33 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml | 54 ++++--
zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html | 10
zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml | 128 ++++++++++++-----
zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js | 7
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java | 27 +++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java | 12 +
zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml | 14 ++
zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html | 10
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 8 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java | 56 +++++++
zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl.html | 2
zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html | 2
zy-asrs-wms/src/main/webapp/static/js/report/workOut.js | 39 +---
zy-asrs-wms/src/main/webapp/static/js/report/workIn.js | 34 +---
14 files changed, 271 insertions(+), 132 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java
index 2a6332f..452d347 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java
@@ -1,7 +1,9 @@
package com.zy.asrs.common.wms.entity;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.sys.entity.User;
import com.zy.asrs.common.sys.service.UserService;
+import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
@@ -153,6 +155,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "璐т富")
+ private String owner;
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.modiUser);
@@ -178,13 +183,23 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public void setQueryDate(String queryDate) {
- this.queryDate = queryDate;
- if (queryDate.contains(" - ")) {
- String[] dates = queryDate.split(" - ");
- this.beginDate = dates[0];
- this.endDate = dates[1];
+ public Mat getMat$(){
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = service.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
+ if (!Cools.isEmpty(mat)){
+ return mat;
+ }
+ return null;
+ }
+ public void setQueryDate(String queryDate) {
+ if(!Cools.isEmpty(queryDate)){
+ this.queryDate = queryDate;
+ if (queryDate.contains(" - ")) {
+ String[] dates = queryDate.split(" - ");
+ this.beginDate = dates[0];
+ this.endDate = dates[1];
+ }
}
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java
index 352183e..02a3045 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Repository;
import java.util.List;
+import java.util.Map;
@Mapper
@@ -18,8 +19,13 @@
//鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
IPage<ViewStockUseBean> queryViewStockUseList(IPage<?> page, ViewStockUseBean viewStockUse);
+ List<ViewStockUseBean> getViewStockUseAll(ViewStockUseBean viewStockUse);
+
//鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
IPage<ViewStayTimeBean> queryViewStayTimeList(IPage<?> page, ViewStayTimeBean viewStayTime);
+
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ List<ViewStayTimeBean> getViewStayTimeAll(Map<String, Object> map);
//鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
IPage<ViewInOutBean> queryViewInOutList(IPage<?> page, ViewInOutBean viewInOut);
@@ -27,7 +33,13 @@
//鍒嗛〉鏌ヨ鏃ュ叆搴撹褰�
IPage<ViewWorkInBean> queryViewWorkInList(IPage<?> page, ViewWorkInBean viewWorkIn);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ List<ViewWorkInBean> getViewWorkInAll(Map<String, Object> map);
+
//鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
IPage<ViewWorkInBean> queryViewWorkOutList(IPage<?> page, ViewWorkInBean viewWorkIn);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ List<ViewWorkInBean> getViewWorkOutAll(Map<String, Object> map);
+
}
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml
index ba60db9..d8059f0 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml
@@ -2,9 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.ReportQueryMapper">
+ <sql id="viewStockUseConditionSql">
+ <if test="row1!=null and row1!='' ">
+ and row1 like '%' + #{row1} + '%'
+ </if>
+ </sql>
+
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
<select id="queryViewStockUseList" parameterType="com.zy.asrs.common.wms.entity.ViewStockUseBean" resultType="com.zy.asrs.common.wms.entity.ViewStockUseBean">
select * from asr_stk_use_view
</select>
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+ <select id="getViewStockUseAll" parameterType="com.zy.asrs.common.wms.entity.ViewStockUseBean" resultType="com.zy.asrs.common.wms.entity.ViewStockUseBean">
+ select * from asr_stk_use_view
+ where 1=1
+ <include refid="viewStockUseConditionSql"></include>
+ order by row1 asc
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
index 5a220a1..9177994 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
@@ -3,26 +3,40 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.ReportQueryMapper">
-<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<sql id="viewStayTimeConditionSql">
- <if test="viewStayTime.locNo!=null and viewStayTime.locNo!='' ">
- and common_loc_mast.loc_no like '%' + #{viewStayTime.locNo} + '%'
- </if>
- <if test="viewStayTime.matnr!=null and viewStayTime.matnr!='' ">
- and matnr like '%' + #{viewStayTime.matnr} + '%'
- </if>
-</sql>
+ <!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
+ <sql id="viewStayTimeConditionSql">
+ <if test="viewStayTime.locNo!=null and viewStayTime.locNo!='' ">
+ and common_loc_mast.loc_no like '%' + #{viewStayTime.locNo} + '%'
+ </if>
+ <if test="viewStayTime.matnr!=null and viewStayTime.matnr!='' ">
+ and wms_loc_detl.matnr like '%' + #{viewStayTime.matnr} + '%'
+ </if>
+ </sql>
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewStayTimeList" parameterType="com.zy.asrs.common.wms.entity.ViewStayTimeBean" resultType="com.zy.asrs.common.wms.entity.ViewStayTimeBean">
- SELECT
- GETDATE() AS today
- , CONVERT(decimal, DATEDIFF(second,wms_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
- , wms_loc_detl.*
- FROM wms_loc_detl
- INNER JOIN common_loc_mast ON wms_loc_detl.loc_no = common_loc_mast.loc_no and wms_loc_detl.host_id = common_loc_mast.host_id
- where 1=1
- <include refid="viewStayTimeConditionSql"></include>
-</select>
+ <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+ <select id="queryViewStayTimeList" parameterType="com.zy.asrs.common.wms.entity.ViewStayTimeBean" resultType="com.zy.asrs.common.wms.entity.ViewStayTimeBean">
+ SELECT
+ GETDATE() AS today
+ , CONVERT(decimal, DATEDIFF(second,wms_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
+ , wms_loc_detl.*
+ FROM wms_loc_detl
+ INNER JOIN common_loc_mast ON wms_loc_detl.loc_no = common_loc_mast.loc_no and wms_loc_detl.host_id = common_loc_mast.host_id
+ where 1=1
+ <include refid="viewStayTimeConditionSql"></include>
+ </select>
+
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+ <select id="getViewStayTimeAll" parameterType="map" resultType="com.zy.asrs.common.wms.entity.ViewStayTimeBean">
+ SELECT
+ GETDATE() AS today
+ , CONVERT(decimal, DATEDIFF(second,wms_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
+ , wms_loc_detl.*
+ FROM wms_loc_detl
+ INNER JOIN common_loc_mast ON wms_loc_detl.loc_no = common_loc_mast.loc_no and wms_loc_detl.host_id = common_loc_mast.host_id
+ where 1=1
+ <if test="locNo!=null and locNo!='' ">
+ and wms_loc_detl.loc_no like '%' + #{locNo} + '%'
+ </if>
+ </select>
</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
index 5e24305..258045c 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
@@ -3,56 +3,106 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.ReportQueryMapper">
-<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<sql id="viewWorkInConditionSql">
- <if test="viewWorkIn.locNo!=null and viewWorkIn.locNo!='' ">
- and loc_no like '%' + #{viewWorkIn.locNo} + '%'
+ <!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
+ <sql id="viewWorkInConditionSql">
+ <if test="viewWorkIn.locNo!=null and viewWorkIn.locNo!='' ">
+ and loc_no like '%' + #{viewWorkIn.locNo} + '%'
+ </if>
+ <if test="viewWorkIn.matnr!=null and viewWorkIn.matnr!='' ">
+ and matnr like '%' + #{viewWorkIn.matnr} + '%'
+ </if>
+ <if test="viewWorkIn.maktx!=null and viewWorkIn.maktx!='' ">
+ and (maktx like '%' + #{viewWorkIn.maktx} + '%'
+ or matnr like '%' + #{viewWorkIn.maktx} + '%'
+ or lgnum like '%' + #{viewWorkIn.maktx} + '%'
+ or tbnum like '%' + #{viewWorkIn.maktx} + '%'
+ or tbpos like '%' + #{viewWorkIn.maktx} + '%'
+ or zmatid like '%' + #{viewWorkIn.maktx} + '%'
+ or maktx like '%' + #{viewWorkIn.maktx} + '%'
+ or werks like '%' + #{viewWorkIn.maktx} + '%'
+ or anfme like '%' + #{viewWorkIn.maktx} + '%'
+ or altme like '%' + #{viewWorkIn.maktx} + '%'
+ or zpallet like '%' + #{viewWorkIn.maktx} + '%'
+ or bname like '%' + #{viewWorkIn.maktx} + '%'
+ )
+ </if>
+ <if test="viewWorkIn.beginDate!=null and viewWorkIn.beginDate!='' ">
+ <![CDATA[
+ and io_time >= #{viewWorkIn.beginDate}
+ ]]>
+ </if>
+ <if test="viewWorkIn.endDate!=null and viewWorkIn.endDate!='' ">
+ <![CDATA[
+ and io_time <= #{viewWorkIn.endDate}
+ ]]>
+ </if>
+ </sql>
+
+ <sql id="viewWorkInConditionMapSql">
+ <if test="locNo!=null and locNo!='' ">
+ and loc_no like '%' + #{locNo} + '%'
</if>
- <if test="viewWorkIn.matnr!=null and viewWorkIn.matnr!='' ">
- and matnr like '%' + #{viewWorkIn.matnr} + '%'
+ <if test="matnr!=null and matnr!='' ">
+ and matnr like '%' + #{matnr} + '%'
</if>
- <if test="viewWorkIn.maktx!=null and viewWorkIn.maktx!='' ">
- and (maktx like '%' + #{viewWorkIn.maktx} + '%'
- or matnr like '%' + #{viewWorkIn.maktx} + '%'
- or lgnum like '%' + #{viewWorkIn.maktx} + '%'
- or tbnum like '%' + #{viewWorkIn.maktx} + '%'
- or tbpos like '%' + #{viewWorkIn.maktx} + '%'
- or zmatid like '%' + #{viewWorkIn.maktx} + '%'
- or maktx like '%' + #{viewWorkIn.maktx} + '%'
- or werks like '%' + #{viewWorkIn.maktx} + '%'
- or anfme like '%' + #{viewWorkIn.maktx} + '%'
- or altme like '%' + #{viewWorkIn.maktx} + '%'
- or zpallet like '%' + #{viewWorkIn.maktx} + '%'
- or bname like '%' + #{viewWorkIn.maktx} + '%'
+ <if test="maktx!=null and maktx!='' ">
+ and (maktx like '%' + #{maktx} + '%'
+ or matnr like '%' + #{maktx} + '%'
+ or lgnum like '%' + #{maktx} + '%'
+ or tbnum like '%' + #{maktx} + '%'
+ or tbpos like '%' + #{maktx} + '%'
+ or zmatid like '%' + #{maktx} + '%'
+ or maktx like '%' + #{maktx} + '%'
+ or werks like '%' + #{maktx} + '%'
+ or anfme like '%' + #{maktx} + '%'
+ or altme like '%' + #{maktx} + '%'
+ or zpallet like '%' + #{maktx} + '%'
+ or bname like '%' + #{maktx} + '%'
)
</if>
- <if test="viewWorkIn.beginDate!=null and viewWorkIn.beginDate!='' ">
+ <if test="beginDate!=null and beginDate!='' ">
<![CDATA[
- and io_time >= #{viewWorkIn.beginDate}
+ and io_time >= #{beginDate}
]]>
</if>
- <if test="viewWorkIn.endDate!=null and viewWorkIn.endDate!='' ">
+ <if test="endDate!=null and endDate!='' ">
<![CDATA[
- and io_time <= #{viewWorkIn.endDate}
+ and io_time <= #{endDate}
]]>
</if>
-</sql>
+ </sql>
-<!-- 鍏ュ簱缁熻 -->
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkInList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
- select * from asr_wrkin_view
- where 1=1
- <include refid="viewWorkInConditionSql"></include>
-</select>
+ <!-- 鍏ュ簱缁熻 -->
+ <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+ <select id="queryViewWorkInList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
+ select * from asr_wrkin_view
+ where 1=1
+ <include refid="viewWorkInConditionSql"></include>
+ </select>
-<!-- 鍑哄簱缁熻 -->
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkOutList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
- select *
- from asr_wrkout_view
- where 1=1
- <include refid="viewWorkInConditionSql"></include>
-</select>
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+ <select id="getViewWorkInAll" parameterType="map" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
+ select * from asr_wrkin_view
+ where 1=1
+ <include refid="viewWorkInConditionMapSql"></include>
+ </select>
+
+ <!-- 鍑哄簱缁熻 -->
+ <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+ <select id="queryViewWorkOutList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
+ select *
+ from asr_wrkout_view
+ where 1=1
+ <include refid="viewWorkInConditionSql"></include>
+ </select>
+
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+ <select id="getViewWorkOutAll" parameterType="map" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
+ select *
+ from asr_wrkout_view a
+ where 1=1
+ <include refid="viewWorkInConditionMapSql"></include>
+ Order by a.io_time desc
+ </select>
</mapper>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index 3f188ed..3d6f303 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -101,6 +101,8 @@
if(Cools.eq(entry.getKey(),"curr")
|| Cools.eq(entry.getKey(),"limit")
|| Cools.eq(entry.getKey(),"unreason")
+ || Cools.eq(entry.getKey(),"orderByField")
+ || Cools.eq(entry.getKey(),"orderByType")
|| Cools.eq(entry.getKey(),"row")
|| Cools.eq(entry.getKey(),"condition")){
continue;
@@ -129,6 +131,8 @@
@ManagerAuth
public R page(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
@@ -163,6 +167,10 @@
wrapper.eq("loc_no", param.get("locNo"));
}
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
+ }
+
param.remove("locNo");
param.remove("owner");
param.remove("zpallet");
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
index 6f489a1..fb3c929 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.wms.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.web.BaseController;
@@ -8,13 +10,16 @@
import com.zy.asrs.common.wms.entity.ViewStockUseBean;
import com.zy.asrs.common.wms.entity.ViewWorkInBean;
import com.zy.asrs.common.wms.mapper.ReportQueryMapper;
+import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
/**
@@ -43,6 +48,15 @@
return R.ok(list);
}
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStockUseExport.action")
+ @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
+ public R viewStockUseExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
+ return R.ok(exportSupport(list, fields));
+ }
+
//------------------搴撳瓨婊炵暀缁熻--------------------------------------
@RequestMapping("/viewStayTimeList.action")
public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
@@ -51,7 +65,7 @@
ViewStayTimeBean bean = new ViewStayTimeBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
- String locNo = String.valueOf(param.get("loc_no"));
+ String locNo = String.valueOf(param.get("locNo"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
bean.setLocNo(locNo);
}
@@ -59,6 +73,16 @@
Page<ViewStayTimeBean> page = new Page<>(curr, limit);
IPage<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(page, bean);
return R.ok(list);
+ }
+
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStayTimeExport.action")
+ @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
+ public R viewStayTimeExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map map = param.getObject("exportData", Map.class);
+ List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(map);
+ return R.ok(exportSupport(list, fields));
}
//------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
@@ -77,17 +101,43 @@
//------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
@RequestMapping("/viewWorkInList.action")
public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
- Page<ViewWorkInBean> page = new Page<>(1, 99999);
+ Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize());
IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(page, bean);
return R.ok(list);
+ }
+
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkInExport.action")
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkInExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQueryDate(bean.getQueryDate());
+ Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class);
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(map);
+ return R.ok(exportSupport(list, fields));
}
//------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
@RequestMapping("/viewWorkOutList.action")
public R viewWorkOutList(ViewWorkInBean bean){
- Page<ViewWorkInBean> page = new Page<>(1, 99999);
+ Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize());
IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(page, bean);
return R.ok(list);
}
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkOutExport.action")
+ @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkOutExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQueryDate(bean.getQueryDate());
+ Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class);
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(map);
+ return R.ok(exportSupport(list, fields));
+ }
+
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js b/zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js
index 7039a49..20fe80d 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js
@@ -78,6 +78,10 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(stayTime)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
switch(obj.event) {
case 'exportData':
layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
@@ -90,7 +94,8 @@
}
});
var param = {
- 'fields': fields
+ 'fields': fields,
+ 'exportData': searchData
};
$.ajax({
url: baseUrl+"/report/viewStayTimeExport.action",
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/workIn.js b/zy-asrs-wms/src/main/webapp/static/js/report/workIn.js
index edbd80a..decb622 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/workIn.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/workIn.js
@@ -1,9 +1,8 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200},
- {field: 'io_time', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ {field: 'ioTime$', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
return cols;
@@ -107,28 +106,15 @@
data: JSON.stringify(param),
contentType:'application/json;charset=UTF-8',
method: 'POST',
- xhrFields: {
- responseType: "blob" // 璁剧疆鍝嶅簲绫诲瀷涓轰簩杩涘埗鏁版嵁
- },
success: function (res) {
- // 鍒涘缓涓�涓复鏃剁殑涓嬭浇閾炬帴
- const url = window.URL.createObjectURL(res);
- // 鍒涘缓涓�涓殣钘忕殑 <a> 鍏冪礌骞惰缃笅杞介摼鎺�
- const a = document.createElement("a");
- a.style.display = "none";
- a.href = url;
- a.download = "export.xlsx"; // 鎸囧畾涓嬭浇鐨勬枃浠跺悕
- document.body.appendChild(a);
-
- // 瑙﹀彂鐐瑰嚮浜嬩欢浠ュ紑濮嬩笅杞�
- a.click();
-
- // 娓呯悊涓存椂璧勬簮
- setTimeout(function () {
- window.URL.revokeObjectURL(url);
- document.body.removeChild(a);
- layer.closeAll();
- }, 100);
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
},
fail: function (){
layer.msg('瀵煎嚭澶辫触', {icon: 2})
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/workOut.js b/zy-asrs-wms/src/main/webapp/static/js/report/workOut.js
index d442626..b41df8f 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/workOut.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/workOut.js
@@ -1,12 +1,10 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'ioTime$', align: 'center', title: '鍑哄簱鏃ユ湡', width: 200},
- {field: 'io_time', align: 'center', title: '鍑哄簱鏃ユ湡', width: 200},
- {field: 'order_no', align: 'center', title: '鍗曟嵁缂栧彿', width: 200}
- ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
- ,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
+ {field: 'ioTime$', align: 'center', title: '鍑哄簱鏃ユ湡', width: 200}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'crnStrTime', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
+ ,{field: 'crnEndTime', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
];
cols.push.apply(cols, detlCols);
return cols;
@@ -110,28 +108,15 @@
data: JSON.stringify(param),
contentType:'application/json;charset=UTF-8',
method: 'POST',
- xhrFields: {
- responseType: "blob" // 璁剧疆鍝嶅簲绫诲瀷涓轰簩杩涘埗鏁版嵁
- },
success: function (res) {
- // 鍒涘缓涓�涓复鏃剁殑涓嬭浇閾炬帴
- const url = window.URL.createObjectURL(res);
- // 鍒涘缓涓�涓殣钘忕殑 <a> 鍏冪礌骞惰缃笅杞介摼鎺�
- const a = document.createElement("a");
- a.style.display = "none";
- a.href = url;
- a.download = "export.xlsx"; // 鎸囧畾涓嬭浇鐨勬枃浠跺悕
- document.body.appendChild(a);
-
- // 瑙﹀彂鐐瑰嚮浜嬩欢浠ュ紑濮嬩笅杞�
- a.click();
-
- // 娓呯悊涓存椂璧勬簮
- setTimeout(function () {
- window.URL.revokeObjectURL(url);
- document.body.removeChild(a);
- layer.closeAll();
- }, 100);
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
},
fail: function (){
layer.msg('瀵煎嚭澶辫触', {icon: 2})
diff --git a/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl.html b/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl.html
index a5e4cfb..e2640ab 100644
--- a/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/adjDetl/adjDetl.html
@@ -21,7 +21,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html b/zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html
index 6269cce..697669b 100644
--- a/zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html
+++ b/zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html
@@ -21,7 +21,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="locNo" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html b/zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html
index 574821f..d5866ad 100644
--- a/zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html
+++ b/zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html
@@ -21,27 +21,27 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="locNo" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="搴忓垪鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="order_no" placeholder="鍗曟嵁缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="orderNo" placeholder="鍗曟嵁缂栧彿" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 鍏ュ簱缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input layui-laydate-range" name="queryDate" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 鍏ュ簱缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
<div id="data-search-btn" class="layui-btn-container layui-form-item">
diff --git a/zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html b/zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html
index 2a73a2c..eadc785 100644
--- a/zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html
+++ b/zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html
@@ -21,27 +21,27 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="locNo" placeholder="搴撲綅鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="搴忓垪鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="order_no" placeholder="鍗曟嵁缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="orderNo" placeholder="鍗曟嵁缂栧彿" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input layui-laydate-range" name="queryDate" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
<div id="data-search-btn" class="layui-btn-container layui-form-item">
--
Gitblit v1.9.1