Skip to content

T
topsun-bpm
Commit ca2b3d05 authored by 1650842865's avatar 1650842865
Browse files
Options

质量异常评审表增加创建时间查询条件

parent 7fbc28dd
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 5 deletions
topsun-xt/src/main/webapp/biz/topsun/mes/unqualifiedMaterials/unqualifiedMaterialsList.jsp
View file @ ca2b3d05
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html> <html>
<head> <head>
<x:base include="layout,dialog,grid,tree,combox,commonTree"/> <x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/biz/topsun/mes/unqualifiedMaterials/unqualifiedMaterialsList.js'/> <x:script src='/biz/topsun/mes/unqualifiedMaterials/unqualifiedMaterialsList.js'/>
</head> </head>
<body> <body>
...@@ -14,9 +14,25 @@ ...@@ -14,9 +14,25 @@
<div position="center" title="质量异常评审表"> <div position="center" title="质量异常评审表">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/> <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm"> <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/> <div class="hg-form-row">
<x:inputC name="pd" required="false" label="PD/YL编码" labelCol="1"/> <x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
<x:inputC name="batchNo" required="false" label="生产批次" labelCol="1"/> <x:inputC name="pd" required="false" label="PD/YL编码" labelCol="1"/>
<x:inputC name="batchNo" required="false" label="生产批次" labelCol="1"/>
</div>
<div class="hg-form-row">
<div class="col-xs-4 col-sm-1">
<label class="hg-form-label">创建日期起&nbsp;:</label>
</div>
<div class="col-xs-4 col-sm-2 col-white-bg">
<x:input name="fillinBeginDate" required="false" wrapper="date" />
</div>
<div class="col-xs-4 col-sm-1">
<label class="hg-form-label">创建日期止&nbsp;:</label>
</div>
<div class="col-xs-4 col-sm-2 col-white-bg">
<x:input name="fillinEndDate" label="至" required="false" wrapper="date" />
</div>
</div>
<x:searchButtons/> <x:searchButtons/>
</form> </form>
<div class="blank_div clearfix"></div> <div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/template/print/topsun/processOuter.ftl
View file @ ca2b3d05
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<table cellspacing="0px" cellpadding="0px" class="tableBorder"> <table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup> <colgroup>
<col width='8%'/> <col width='8%'/>
<col width='100%'/> <col width='92%'/>
<#-- <col width="9%"/>--> <#-- <col width="9%"/>-->
<#-- <col width="15%"/>--> <#-- <col width="15%"/>-->
</colgroup> </colgroup>
......
topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/domain/query/UnqualifiedMaterialsQueryRequest.java
View file @ ca2b3d05
...@@ -3,6 +3,9 @@ package com.huigou.topsun.mes.unqualifiedMaterials.domain.query; ...@@ -3,6 +3,9 @@ package com.huigou.topsun.mes.unqualifiedMaterials.domain.query;
import com.huigou.data.domain.query.QueryAbstractRequest; import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data; import lombok.Data;
import java.util.Calendar;
import java.util.Date;
/** /**
* @Auther: xin.lu * @Auther: xin.lu
* @Date: 2024/08/12/10:26 * @Date: 2024/08/12/10:26
...@@ -13,4 +16,23 @@ public class UnqualifiedMaterialsQueryRequest extends QueryAbstractRequest { ...@@ -13,4 +16,23 @@ public class UnqualifiedMaterialsQueryRequest extends QueryAbstractRequest {
private String billCode; private String billCode;
private String pd; private String pd;
private String batchNo; private String batchNo;
protected Date fillinBeginDate;
protected Date fillinEndDate;
public Date getFillinEndDate() {
return fillinEndDate;
}
public void setFillinEndDate(Date fillinEndDate) {
if (fillinEndDate != null) {
// 使用Calendar类给日期加一天
Calendar calendar = Calendar.getInstance();
calendar.setTime(fillinEndDate);
calendar.add(Calendar.DATE, 1); // 给日期加上一天
// 获取新的Date对象
fillinEndDate = calendar.getTime();
}
this.fillinEndDate = fillinEndDate;
}
} }
topsun/src/main/resources/config/topsun/mes/unqualifiedMaterials/unqualifiedMaterials.xml
View file @ ca2b3d05
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
<condition column="pd" name="pd" type="java.lang.String" symbol="like" alias="t"/> <condition column="pd" name="pd" type="java.lang.String" symbol="like" alias="t"/>
<condition column="batch_no" name="batchNo" type="java.lang.String" symbol="like" alias="t"/> <condition column="batch_no" name="batchNo" type="java.lang.String" symbol="like" alias="t"/>
<condition column="id" name="id" type="java.lang.String" symbol="=" alias="t"/> <condition column="id" name="id" type="java.lang.String" symbol="=" alias="t"/>
<condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
<condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
</query> </query>
<query name="systemGroupAllDetail" label="查询用户分组"> <query name="systemGroupAllDetail" label="查询用户分组">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment