From 901b2ab3e0e7c592602848cfa256f34c5b0c7bb8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 一月 2024 09:57:01 +0800
Subject: [PATCH] #

---
 zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml               |   28 ++
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java    |   14 +
 zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml                 |   58 ++++
 zy-asrs-wms/src/main/webapp/static/js/report/stayTime.js                          |    4 
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java    |  191 +++++++++++++++
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java |   33 ++
 zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml                |   10 
 zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml                  |   20 +
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStockUseBean.java  |   31 ++
 zy-asrs-wms/src/main/webapp/static/js/report/reportStockUse.js                    |   14 
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java     |   21 +
 zy-asrs-wms/src/main/webapp/static/js/handWrkMast/handWrkMast.js                  |    4 
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java   |   93 +++++++
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStayTimeBean.java  |  178 ++++++++++++++
 zy-asrs-wms/src/main/webapp/views/handWrkMast/handWrkMast.html                    |    6 
 15 files changed, 690 insertions(+), 15 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java
new file mode 100644
index 0000000..cf1bdeb
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java
@@ -0,0 +1,21 @@
+package com.zy.asrs.common.wms.entity;
+
+import lombok.Data;
+
+/**
+ * 鏃ュ嚭鍏ュ簱娆℃暟缁熻
+ * @author admin
+ * @date 2018骞�11鏈�24鏃�
+ */
+@Data
+public class ViewInOutBean {
+	private String ymd;
+    private String sourceStaNo;
+    private Long stoQty;
+    private Long retQty;
+    private Long totalQty;
+    private int pageNumber;
+    private int pageSize;
+    private String beginDate; //鏌ヨ寮�濮嬫棩鏈�
+    private String endDate;   //鏌ヨ鎴鏃ユ湡
+}
\ No newline at end of file
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStayTimeBean.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStayTimeBean.java
new file mode 100644
index 0000000..0bcca55
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStayTimeBean.java
@@ -0,0 +1,178 @@
+package com.zy.asrs.common.wms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.zy.asrs.common.sys.entity.User;
+import com.zy.asrs.common.sys.service.UserService;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 搴撳瓨婊炵暀鏃堕棿瀹炰綋绫�
+ * @author admin
+ * @date 2018骞�11鏈�23鏃�
+ */
+@Data
+public class ViewStayTimeBean {
+
+	private int pageNumber;
+	private int pageSize;
+
+	private int stayTime;
+
+	private String beginDate;
+	private String endDate;
+
+	private Integer row;
+
+	@ApiModelProperty(value= "搴撲綅鍙�")
+	private String locNo;
+
+	@ApiModelProperty(value= "鎵樼洏鏉＄爜")
+	private String zpallet;
+
+	@ApiModelProperty(value= "鏁伴噺")
+	private Double anfme;
+
+	@ApiModelProperty(value= "鍟嗗搧缂栧彿")
+	private String matnr;
+
+	@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+	private String maktx;
+
+	@ApiModelProperty(value= "搴忓垪鐮�")
+	private String batch;
+
+	@ApiModelProperty(value= "鍗曟嵁缂栧彿")
+	private String orderNo;
+
+	@ApiModelProperty(value= "瑙勬牸")
+	private String specs;
+
+	@ApiModelProperty(value= "鍨嬪彿")
+	private String model;
+
+	@ApiModelProperty(value= "棰滆壊")
+	private String color;
+
+	@ApiModelProperty(value= "鍝佺墝")
+	private String brand;
+
+	@ApiModelProperty(value= "鍗曚綅")
+	private String unit;
+
+	@ApiModelProperty(value= "鍗曚环")
+	private Double price;
+
+	@ApiModelProperty(value= "sku")
+	private String sku;
+
+	@ApiModelProperty(value= "鍗曚綅閲�")
+	private Double units;
+
+	@ApiModelProperty(value= "鏉＄爜")
+	private String barcode;
+
+	@ApiModelProperty(value= "浜у湴")
+	private String origin;
+
+	@ApiModelProperty(value= "鍘傚")
+	private String manu;
+
+	@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+	private String manuDate;
+
+	@ApiModelProperty(value= "鍝侀」鏁�")
+	private String itemNum;
+
+	@ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+	private Double safeQty;
+
+	@ApiModelProperty(value= "閲嶉噺")
+	private Double weight;
+
+	@ApiModelProperty(value= "闀垮害")
+	private Double length;
+
+	@ApiModelProperty(value= "浣撶Н")
+	private Double volume;
+
+	@ApiModelProperty(value= "涓夋柟缂栫爜")
+	private String threeCode;
+
+	@ApiModelProperty(value= "渚涘簲鍟�")
+	private String supp;
+
+	@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+	private String suppCode;
+
+	@ApiModelProperty(value= "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
+	private Integer beBatch;
+
+	@ApiModelProperty(value= "淇濊川鏈�")
+	private String deadTime;
+
+	@ApiModelProperty(value= "棰勮澶╂暟")
+	private Integer deadWarn;
+
+	@ApiModelProperty(value= "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
+	private Integer source;
+
+	@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
+	private Integer inspect;
+
+	@ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
+	private Integer danger;
+
+	@ApiModelProperty(value= "淇敼浜哄憳")
+	private Long modiUser;
+
+	@ApiModelProperty(value= "淇敼鏃堕棿")
+	private Date modiTime;
+
+	@ApiModelProperty(value= "鍒涘缓鑰�")
+	private Long appeUser;
+
+	@ApiModelProperty(value= "娣诲姞鏃堕棿")
+	private Date appeTime;
+
+	@ApiModelProperty(value= "澶囨敞")
+	private String memo;
+
+	public String getModiUser$(){
+		UserService service = SpringUtils.getBean(UserService.class);
+		User user = service.getById(this.modiUser);
+		if (!Cools.isEmpty(user)){
+			return String.valueOf(user.getUsername());
+		}
+		return null;
+	}
+
+	public String getModiTime$(){
+		if (Cools.isEmpty(this.modiTime)){
+			return "";
+		}
+		return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+	}
+
+	public String getAppeUser$(){
+		UserService service = SpringUtils.getBean(UserService.class);
+		User user = service.getById(this.appeUser);
+		if (!Cools.isEmpty(user)){
+			return String.valueOf(user.getUsername());
+		}
+		return null;
+	}
+
+	public String getAppeTime$(){
+		if (Cools.isEmpty(this.appeTime)){
+			return "";
+		}
+		return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+	}
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStockUseBean.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStockUseBean.java
new file mode 100644
index 0000000..2605785
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStockUseBean.java
@@ -0,0 +1,31 @@
+package com.zy.asrs.common.wms.entity;
+
+import lombok.Data;
+
+/**
+ * 搴撲綅浣跨敤鐜囪鍥惧疄浣撶被
+ * @author admin
+ * @date 2018骞�11鏈�23鏃�
+ */
+@Data
+public class ViewStockUseBean {
+    private String row1;    	//閽㈡灦鍙�
+
+    private Long totalQty;    	//搴撲綅鎬绘暟
+
+    private Long fullQty;    	//鍦ㄥ簱鏁伴噺
+
+    private Long nullQty;    	//绌哄簱浣�
+
+    private Long forbidQty;    //绂佺敤搴撲綅
+
+    private Long emptyQty;		//绌哄鍣�
+
+    private String fullRate;   //鍦ㄥ簱鐜�
+
+    private String occRate;   //浣跨敤鐜�
+
+    private int pageNumber;
+
+    private int pageSize;
+}
\ No newline at end of file
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
new file mode 100644
index 0000000..2a6332f
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java
@@ -0,0 +1,191 @@
+package com.zy.asrs.common.wms.entity;
+
+import com.zy.asrs.common.sys.entity.User;
+import com.zy.asrs.common.sys.service.UserService;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 鍏ュ簱鏄庣粏缁熻
+ * @author admin
+ * @date 2018骞�11鏈�26鏃�
+ */
+@Data
+public class ViewWorkInBean {
+
+
+	private int pageNumber;
+	private int pageSize;
+
+	private int stayTime;
+
+	private String beginDate;
+	private String endDate;
+	private String queryDate;
+
+	private Integer row;
+
+	private String crnStrTime;
+	private String crnEndTime;
+
+	@ApiModelProperty(value= "宸ヤ綔鍙�")
+	private Integer wrkNo;
+
+	@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+	private Date ioTime;
+
+	@ApiModelProperty(value= "搴撲綅鍙�")
+	private String locNo;
+
+	@ApiModelProperty(value= "鎵樼洏鏉＄爜")
+	private String zpallet;
+
+	@ApiModelProperty(value= "鏁伴噺")
+	private Double anfme;
+
+	@ApiModelProperty(value= "鍟嗗搧缂栧彿")
+	private String matnr;
+
+	@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+	private String maktx;
+
+	@ApiModelProperty(value= "搴忓垪鐮�")
+	private String batch;
+
+	@ApiModelProperty(value= "鍗曟嵁缂栧彿")
+	private String orderNo;
+
+	@ApiModelProperty(value= "瑙勬牸")
+	private String specs;
+
+	@ApiModelProperty(value= "鍨嬪彿")
+	private String model;
+
+	@ApiModelProperty(value= "棰滆壊")
+	private String color;
+
+	@ApiModelProperty(value= "鍝佺墝")
+	private String brand;
+
+	@ApiModelProperty(value= "鍗曚綅")
+	private String unit;
+
+	@ApiModelProperty(value= "鍗曚环")
+	private Double price;
+
+	@ApiModelProperty(value= "sku")
+	private String sku;
+
+	@ApiModelProperty(value= "鍗曚綅閲�")
+	private Double units;
+
+	@ApiModelProperty(value= "鏉＄爜")
+	private String barcode;
+
+	@ApiModelProperty(value= "浜у湴")
+	private String origin;
+
+	@ApiModelProperty(value= "鍘傚")
+	private String manu;
+
+	@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+	private String manuDate;
+
+	@ApiModelProperty(value= "鍝侀」鏁�")
+	private String itemNum;
+
+	@ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+	private Double safeQty;
+
+	@ApiModelProperty(value= "閲嶉噺")
+	private Double weight;
+
+	@ApiModelProperty(value= "闀垮害")
+	private Double length;
+
+	@ApiModelProperty(value= "浣撶Н")
+	private Double volume;
+
+	@ApiModelProperty(value= "涓夋柟缂栫爜")
+	private String threeCode;
+
+	@ApiModelProperty(value= "渚涘簲鍟�")
+	private String supp;
+
+	@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+	private String suppCode;
+
+	@ApiModelProperty(value= "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
+	private Integer beBatch;
+
+	@ApiModelProperty(value= "淇濊川鏈�")
+	private String deadTime;
+
+	@ApiModelProperty(value= "棰勮澶╂暟")
+	private Integer deadWarn;
+
+	@ApiModelProperty(value= "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
+	private Integer source;
+
+	@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
+	private Integer inspect;
+
+	@ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
+	private Integer danger;
+
+	@ApiModelProperty(value= "淇敼浜哄憳")
+	private Long modiUser;
+
+	@ApiModelProperty(value= "淇敼鏃堕棿")
+	private Object modiTime;
+
+	@ApiModelProperty(value= "鍒涘缓鑰�")
+	private Long appeUser;
+
+	@ApiModelProperty(value= "娣诲姞鏃堕棿")
+	private Object appeTime;
+
+	@ApiModelProperty(value= "澶囨敞")
+	private String memo;
+
+	public String getModiUser$(){
+		UserService service = SpringUtils.getBean(UserService.class);
+		User user = service.getById(this.modiUser);
+		if (!Cools.isEmpty(user)){
+			return String.valueOf(user.getUsername());
+		}
+		return null;
+	}
+
+	public String getAppeUser$(){
+		UserService service = SpringUtils.getBean(UserService.class);
+		User user = service.getById(this.appeUser);
+		if (!Cools.isEmpty(user)){
+			return String.valueOf(user.getUsername());
+		}
+		return null;
+	}
+
+	public String getIoTime$(){
+		if (Cools.isEmpty(this.ioTime)){
+			return "";
+		}
+		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];
+
+		}
+	}
+
+}
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
new file mode 100644
index 0000000..352183e
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java
@@ -0,0 +1,33 @@
+package com.zy.asrs.common.wms.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zy.asrs.common.wms.entity.ViewInOutBean;
+import com.zy.asrs.common.wms.entity.ViewStayTimeBean;
+import com.zy.asrs.common.wms.entity.ViewStockUseBean;
+import com.zy.asrs.common.wms.entity.ViewWorkInBean;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Mapper
+@Repository
+public interface ReportQueryMapper {
+
+	//鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
+	IPage<ViewStockUseBean> queryViewStockUseList(IPage<?> page, ViewStockUseBean viewStockUse);
+
+	//鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
+	IPage<ViewStayTimeBean> queryViewStayTimeList(IPage<?> page, ViewStayTimeBean viewStayTime);
+
+	//鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
+	IPage<ViewInOutBean> queryViewInOutList(IPage<?> page, ViewInOutBean viewInOut);
+
+	//鍒嗛〉鏌ヨ鏃ュ叆搴撹褰�
+	IPage<ViewWorkInBean> queryViewWorkInList(IPage<?> page, ViewWorkInBean viewWorkIn);
+
+	//鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
+	IPage<ViewWorkInBean> queryViewWorkOutList(IPage<?> page, ViewWorkInBean viewWorkIn);
+
+}
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml
new file mode 100644
index 0000000..ba60db9
--- /dev/null
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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">
+
+    <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+    <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>
+
+</mapper>
\ No newline at end of file
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml
new file mode 100644
index 0000000..d1c436e
--- /dev/null
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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">
+
+<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
+<sql id="viewInOutConditionSql">	
+	<if test="viewInOut.sourceStaNo!=null and viewInOut.sourceStaNo!='' ">
+		and source_sta_no like '%' + #{viewInOut.sourceStaNo} + '%'
+	</if>
+</sql>
+
+<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+<select id="queryViewInOutList" parameterType="com.zy.asrs.common.wms.entity.ViewInOutBean" resultType="com.zy.asrs.common.wms.entity.ViewInOutBean">
+	select * from asr_sta_inout_view
+	where 1=1
+	<include refid="viewInOutConditionSql"></include>
+</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
new file mode 100644
index 0000000..5a220a1
--- /dev/null
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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">
+
+<!-- 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>
+
+<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+<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>
+
+</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
new file mode 100644
index 0000000..5e24305
--- /dev/null
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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">
+
+<!-- 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>
+
+<!-- 鍏ュ簱缁熻 -->
+<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+<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>
+
+</mapper>
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
new file mode 100644
index 0000000..6f489a1
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
@@ -0,0 +1,93 @@
+package com.zy.asrs.wms.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.web.BaseController;
+import com.zy.asrs.common.wms.entity.ViewInOutBean;
+import com.zy.asrs.common.wms.entity.ViewStayTimeBean;
+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.common.Cools;
+import com.zy.asrs.framework.common.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 鏃ュ織缁熻鎺у埗鍣ㄥ眰
+ * @author admin
+ * @date 2018骞�11鏈�23鏃�
+ */
+@RestController
+@RequestMapping("/report")
+public class ReportQueryController extends BaseController {
+
+	@Autowired
+	private ReportQueryMapper reportQueryMapper;
+
+	//------------------搴撲綅浣跨敤缁熻--------------------------------------
+	@RequestMapping("/viewStockUseList.action")
+	public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
+										  @RequestParam(defaultValue = "10")Integer limit,
+										  @RequestParam Map<String, Object> param){
+		ViewStockUseBean bean = new ViewStockUseBean();
+		bean.setPageSize(limit);
+		bean.setPageNumber(curr);
+
+		Page<ViewStockUseBean> page = new Page<>(curr, limit);
+		IPage<ViewStockUseBean> list = reportQueryMapper.queryViewStockUseList(page, bean);
+		return R.ok(list);
+	}
+
+	//------------------搴撳瓨婊炵暀缁熻--------------------------------------
+	@RequestMapping("/viewStayTimeList.action")
+	public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
+														   @RequestParam(defaultValue = "10")Integer limit,
+														   @RequestParam Map<String, Object> param){
+		ViewStayTimeBean bean = new ViewStayTimeBean();
+		bean.setPageSize(limit);
+		bean.setPageNumber(curr);
+		String locNo = String.valueOf(param.get("loc_no"));
+		if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+			bean.setLocNo(locNo);
+		}
+
+		Page<ViewStayTimeBean> page = new Page<>(curr, limit);
+		IPage<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(page, bean);
+		return R.ok(list);
+	}
+
+	//------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
+	@RequestMapping("/viewInOutList.action")
+	public Map<String,Object> viewInOutList(@RequestParam(defaultValue = "1")Integer curr,
+											 @RequestParam(defaultValue = "10")Integer limit,
+											 @RequestParam Map<String, Object> param){
+		ViewInOutBean bean = new ViewInOutBean();
+		bean.setPageSize(limit);
+		bean.setPageNumber(curr);
+		Page<ViewInOutBean> page = new Page<>(curr, limit);
+		IPage<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(page, bean);
+		return R.ok(list);
+	}
+
+	//------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
+	@RequestMapping("/viewWorkInList.action")
+	public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
+		Page<ViewWorkInBean> page = new Page<>(1, 99999);
+		IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(page, bean);
+		return R.ok(list);
+	}
+
+	//------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
+	@RequestMapping("/viewWorkOutList.action")
+	public R viewWorkOutList(ViewWorkInBean bean){
+		Page<ViewWorkInBean> page = new Page<>(1, 99999);
+		IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(page, bean);
+		return R.ok(list);
+	}
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
index 314286d..962d6d6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
@@ -37,7 +37,7 @@
                   @RequestParam(required = false) String timeRange,
                   @RequestParam Map<String, Object> param) {
         LambdaQueryWrapper<WrkMastLog> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(WrkMastLog::getHostId, getHostId());
+//        wrapper.eq(WrkMastLog::getHostId, getHostId());
         if (!Cools.isEmpty(condition)) {
             wrapper.like(WrkMastLog::getWrkNo, condition);
         }
@@ -46,6 +46,18 @@
             wrapper.ge(WrkMastLog::getAppeTime, DateUtils.convert(range[0]));
             wrapper.le(WrkMastLog::getAppeTime, DateUtils.convert(range[1]));
         }
+        if (!Cools.isEmpty(param.get("wrkNo"))) {
+            wrapper.eq(WrkMastLog::getWrkNo, param.get("wrkNo"));
+        }
+        if (!Cools.isEmpty(param.get("wrkSts"))) {
+            wrapper.eq(WrkMastLog::getWrkSts, param.get("wrkSts"));
+        }
+        if (!Cools.isEmpty(param.get("ioType"))) {
+            wrapper.eq(WrkMastLog::getIoType, param.get("ioType"));
+        }
+        if (!Cools.isEmpty(param.get("manuType"))) {
+            wrapper.like(WrkMastLog::getManuType, param.get("manuType"));
+        }
         wrapper.orderByDesc(WrkMastLog::getId);
         return R.ok(wrkMastLogService.page(new Page<>(curr, limit), wrapper));
     }
diff --git a/zy-asrs-wms/src/main/webapp/static/js/handWrkMast/handWrkMast.js b/zy-asrs-wms/src/main/webapp/static/js/handWrkMast/handWrkMast.js
index 686640d..267267c 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -11,9 +11,9 @@
     tableIns = table.render({
         elem: '#wrkMast',
         headers: {token: localStorage.getItem('token')},
-        url: baseUrl+'/wrkMastLog/list/auth',
+        url: baseUrl+'/wrkMastLog/page/auth',
         page: true,
-        where: {manu_type : '鎵嬪姩'},
+        where: {},
         limit: 50,
         limits: [50, 100, 200, 500],
         even: true,
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/reportStockUse.js b/zy-asrs-wms/src/main/webapp/static/js/report/reportStockUse.js
index 414dde2..b8248b3 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/reportStockUse.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/reportStockUse.js
@@ -20,13 +20,13 @@
         cols: [[
             // {type: 'checkbox', fixed: 'left'}
             {field: 'row1', title: '閽㈡灦鍙�', sort: true, align: 'center'}
-            ,{field: 'total_qty', align: 'center',title: '搴撲綅鎬绘暟'}
-            ,{field: 'full_qty', align: 'center',title: '鍦ㄥ簱鏁伴噺'}
-            ,{field: 'null_qty', align: 'center',title: '绌哄簱浣嶆暟閲�'}
-            ,{field: 'forbid_qty', align: 'center',title: '绂佺敤搴撲綅鏁伴噺'}
-            ,{field: 'empty_qty', align: 'center',title: '绌哄鍣ㄦ暟閲�'}
-            ,{field: 'full_rate', align: 'center',title: '鍦ㄥ簱鐜�(%)'}
-            ,{field: 'occ_rate', align: 'center',title: '浣跨敤鐜�(%)'}
+            ,{field: 'totalQty', align: 'center',title: '搴撲綅鎬绘暟'}
+            ,{field: 'fullQty', align: 'center',title: '鍦ㄥ簱鏁伴噺'}
+            ,{field: 'nullQty', align: 'center',title: '绌哄簱浣嶆暟閲�'}
+            ,{field: 'forbidQty', align: 'center',title: '绂佺敤搴撲綅鏁伴噺'}
+            ,{field: 'emptyQty', align: 'center',title: '绌哄鍣ㄦ暟閲�'}
+            ,{field: 'fullRate', align: 'center',title: '鍦ㄥ簱鐜�(%)'}
+            ,{field: 'occRate', align: 'center',title: '浣跨敤鐜�(%)'}
         ]],
         request: {
             pageName: 'curr',
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 7fa12ef..7039a49 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
@@ -2,8 +2,8 @@
 function getCol() {
     var cols = [
         {field: 'appeTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
-        ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
-        ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+        ,{field: 'stayTime', align: 'center',title: '婊炵暀澶╂暟'}
+        ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
     ];
     cols.push.apply(cols, detlCols);
     return cols;
diff --git a/zy-asrs-wms/src/main/webapp/views/handWrkMast/handWrkMast.html b/zy-asrs-wms/src/main/webapp/views/handWrkMast/handWrkMast.html
index 9bdd5b4..5c1febe 100644
--- a/zy-asrs-wms/src/main/webapp/views/handWrkMast/handWrkMast.html
+++ b/zy-asrs-wms/src/main/webapp/views/handWrkMast/handWrkMast.html
@@ -51,7 +51,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="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
+            <input class="layui-input" type="text" name="wrkNo" placeholder="宸ヤ綔鍙�" autocomplete="off">
         </div>
     </div>
     <div class="layui-inline">
@@ -78,7 +78,7 @@
     </div>
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <select name="manu_type">
+            <select name="manuType">
                 <option value="鎵嬪姩" style="display: none"></option>
                 <option value="瀹屾垚">鎵嬪姩瀹屾垚</option>
                 <option value="鍙栨秷">鎵嬪姩鍙栨秷</option>
@@ -88,7 +88,7 @@
     <!-- 鏃ユ湡鑼冨洿 -->
     <div class="layui-inline" style="width: 300px">
         <div class="layui-input-inline">
-            <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+            <input class="layui-input layui-laydate-range" name="timeRange" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
         </div>
     </div>
     <!-- 寰呮坊鍔� -->

--
Gitblit v1.9.1