加上时间查询

src/main/java/com/jeesite/modules/mes/entity/MesOrderSn.java

@@ -1,5 +1,7 @@
 package com.jeesite.modules.mes.entity;
 
+import java.util.Date;
+
 import javax.validation.constraints.Size;
 
 import com.jeesite.common.entity.DataEntity;
@@ -61,5 +63,21 @@ public class MesOrderSn extends DataEntity<MesOrderSn> {
 	public void setSn(String sn) {
 		this.sn = sn;
 	}
+
+	public Date getUpdateDate_gte() {
+		return sqlMap.getWhere().getValue("update_date", QueryType.GTE);
+	}
+
+	public void setUpdateDate_gte(Date updateDate) {
+		sqlMap.getWhere().and("update_date", QueryType.GTE, updateDate);
+	}
+
+	public Date getUpdateDate_lte() {
+		return sqlMap.getWhere().getValue("update_date", QueryType.LTE);
+	}
+
+	public void setUpdateDate_lte(Date updateDate) {
+		sqlMap.getWhere().and("update_date", QueryType.LTE, updateDate);
+	}
 	
 }

src/main/java/com/jeesite/modules/mes/entity/MesOrderSnJj.java

@@ -1,5 +1,7 @@
 package com.jeesite.modules.mes.entity;
 
+import java.util.Date;
+
 import javax.validation.constraints.Size;
 
 import com.jeesite.common.entity.DataEntity;
@@ -61,5 +63,21 @@ public class MesOrderSnJj extends DataEntity<MesOrderSnJj> {
 	public void setSn(String sn) {
 		this.sn = sn;
 	}
+
+	public Date getUpdateDate_gte() {
+		return sqlMap.getWhere().getValue("update_date", QueryType.GTE);
+	}
+
+	public void setUpdateDate_gte(Date updateDate) {
+		sqlMap.getWhere().and("update_date", QueryType.GTE, updateDate);
+	}
+
+	public Date getUpdateDate_lte() {
+		return sqlMap.getWhere().getValue("update_date", QueryType.LTE);
+	}
+
+	public void setUpdateDate_lte(Date updateDate) {
+		sqlMap.getWhere().and("update_date", QueryType.LTE, updateDate);
+	}
 	
 }

src/main/java/com/jeesite/modules/mes/entity/MesOrderSnZp.java

@@ -1,10 +1,13 @@
 package com.jeesite.modules.mes.entity;
 
+import java.util.Date;
+
 import javax.validation.constraints.Size;
 
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.Table;
+import com.jeesite.common.mybatis.mapper.query.QueryType;
 
 /**
  * 装配订单工件绑定Entity
@@ -53,4 +56,20 @@ public class MesOrderSnZp extends DataEntity<MesOrderSnZp> {
 		this.sn = sn;
 	}
 
+	public Date getUpdateDate_gte() {
+		return sqlMap.getWhere().getValue("update_date", QueryType.GTE);
+	}
+
+	public void setUpdateDate_gte(Date updateDate) {
+		sqlMap.getWhere().and("update_date", QueryType.GTE, updateDate);
+	}
+
+	public Date getUpdateDate_lte() {
+		return sqlMap.getWhere().getValue("update_date", QueryType.LTE);
+	}
+
+	public void setUpdateDate_lte(Date updateDate) {
+		sqlMap.getWhere().and("update_date", QueryType.LTE, updateDate);
+	}
+
 }

src/main/java/com/jeesite/modules/mes/entity/MesSnCold.java

@@ -85,5 +85,21 @@ public class MesSnCold extends DataEntity<MesSnCold> {
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
+
+	public Date getUpdateTime_gte() {
+		return sqlMap.getWhere().getValue("update_time", QueryType.GTE);
+	}
+
+	public void setUpdateTime_gte(Date updateTime) {
+		sqlMap.getWhere().and("update_time", QueryType.GTE, updateTime);
+	}
+
+	public Date getUpdateTime_lte() {
+		return sqlMap.getWhere().getValue("update_time", QueryType.LTE);
+	}
+
+	public void setUpdateTime_lte(Date updateTime) {
+		sqlMap.getWhere().and("update_time", QueryType.LTE, updateTime);
+	}
 	
 }

src/main/resources/views/modules/mes/mesOrderSnJjList.html

@@ -8,9 +8,6 @@
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
 				<a href="#" class="btn btn-default" id="btnExport"><i class="glyphicon glyphicon-export"></i> 导出</a>
-				<% if(hasPermi('mes:mesOrderSnJj:edit')){ %>
-					<a href="${ctx}/mes/mesOrderSnJj/form" class="btn btn-default btnTool" title="${text('新增机加订单工件绑定')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
-				<% } %>
 				<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
 			</div>
 		</div>
@@ -30,6 +27,20 @@
 					</div>
 				</div>
 				<div class="form-group">
+					<label class="control-label">${text('开始时间')}：</label>
+					<div class="control-inline">
+						<#form:input path="updateDate_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="updateDate_lte.click()"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('结束时间')}：</label>
+					<div class="control-inline">
+						<#form:input path="updateDate_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+					</div>
+				</div>
+				<div class="form-group">
 					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
 					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
 				</div>

src/main/resources/views/modules/mes/mesOrderSnList.html

@@ -8,9 +8,6 @@
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
 				<a href="#" class="btn btn-default" id="btnExport"><i class="glyphicon glyphicon-export"></i> 导出</a>
-				<% if(hasPermi('mes:mesOrderSn:edit')){ %>
-					<a href="${ctx}/mes/mesOrderSn/form" class="btn btn-default btnTool" title="${text('新增生产订单工件表')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
-				<% } %>
 				<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
 			</div>
 		</div>
@@ -30,6 +27,20 @@
 					</div>
 				</div>
 				<div class="form-group">
+					<label class="control-label">${text('开始时间')}：</label>
+					<div class="control-inline">
+						<#form:input path="updateDate_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="updateDate_lte.click()"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('结束时间')}：</label>
+					<div class="control-inline">
+						<#form:input path="updateDate_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+					</div>
+				</div>
+				<div class="form-group">
 					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
 					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
 				</div>

src/main/resources/views/modules/mes/mesOrderSnZpList.html

@@ -7,9 +7,6 @@
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
-				<% if(hasPermi('mes:mesOrderSnZp:edit')){ %>
-					<a href="${ctx}/mes/mesOrderSnZp/form" class="btn btn-default btnTool" title="${text('新增装配订单工件绑定')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
-				<% } %>
 				<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
 			</div>
 		</div>
@@ -29,6 +26,20 @@
 					</div>
 				</div>
 				<div class="form-group">
+					<label class="control-label">${text('开始时间')}：</label>
+					<div class="control-inline">
+						<#form:input path="updateDate_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="updateDate_lte.click()"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('结束时间')}：</label>
+					<div class="control-inline">
+						<#form:input path="updateDate_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
+					</div>
+				</div>
+				<div class="form-group">
 					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
 					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
 				</div>

src/main/resources/views/modules/mes/mesSnColdList.html

@@ -30,9 +30,16 @@
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">${text('更新时间')}：</label>
+					<label class="control-label">${text('开始时间')}：</label>
 					<div class="control-inline">
-						<#form:input path="updateTime" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+						<#form:input path="updateTime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
+							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="updateTime_lte.click()"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('结束时间')}：</label>
+					<div class="control-inline">
+						<#form:input path="updateTime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime"
 							dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/>
 					</div>
 				</div>

src/main/resources/views/modules/mes/mesWuliaoCzList.html

@@ -93,10 +93,10 @@ $('#dataGrid').dataGrid({
 		{header:'${text("回炉料重量")}', name:'hzl', index:'a.h_zl', width:150, align:"center", formatter: function(val, obj, row, act){
 			return (val == null || val === '') ? '' : (val + ' kg');
 		}},
-		{header:'${text("原铝锭去皮")}', name:'yqpZl', index:'a.y_qp_zl', width:150, align:"center", formatter: function(val, obj, row, act){
+		{header:'${text("原铝锭去皮")}', name:'yQpZl', index:'a.y_qp_zl', width:150, align:"center", formatter: function(val, obj, row, act){
 			return (val == null || val === '') ? '' : (val + ' kg');
 		}},
-		{header:'${text("回炉料去皮")}', name:'hqpZl', index:'a.h_qp_zl', width:150, align:"center", formatter: function(val, obj, row, act){
+		{header:'${text("回炉料去皮")}', name:'hQpZl', index:'a.h_qp_zl', width:150, align:"center", formatter: function(val, obj, row, act){
 			return (val == null || val === '') ? '' : (val + ' kg');
 		}},
 		{header:'${text("回炉料占比")}', name:'hlBl', index:'a.hl_bl', width:150, align:"center", formatter: function(val, obj, row, act){