Skip to content

孙克 / QisdaNew

转到一个项目
切换导航栏
切换导航栏固定状态
Commit edd9f66c 由 sunke
选项

异常日志导出 

需求单导出
入库时已在库位中的物料进行出库
1 个父辈 3e08084d
内嵌 并排
正在显示 10 个修改的文件 包含 86 行增加 和 42 行删除
myproject/src/main/java/com/myproject/webapp/controller/cloud/AlarmInfoSearchController.java
...@@ -6,6 +6,7 @@ import com.myproject.dao.mongo.IAlarmInfoDao; ...@@ -6,6 +6,7 @@ import com.myproject.dao.mongo.IAlarmInfoDao;
import com.myproject.util.DateUtil; import com.myproject.util.DateUtil;
import com.myproject.webapp.controller.storage.BaseSearchController; import com.myproject.webapp.controller.storage.BaseSearchController;
import org.displaytag.properties.SortOrderEnum; import org.displaytag.properties.SortOrderEnum;
import org.displaytag.tags.TableTagParameters;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
...@@ -55,12 +56,21 @@ public class AlarmInfoSearchController extends BaseSearchController { ...@@ -55,12 +56,21 @@ public class AlarmInfoSearchController extends BaseSearchController {
query.addCriteria(baseCriteria); query.addCriteria(baseCriteria);
PageList pageList = searchCriteria.getPageList(); PageList pageList = searchCriteria.getPageList();
//导出
if (request.getParameter(TableTagParameters.PARAMETER_EXPORTING) != null){
pageList.setPageNumber(-1);
searchCriteria.setPageList(pageList);
}
if(pageList.getSortCriterion().equals("id")){ if(pageList.getSortCriterion().equals("id")){
pageList.setSortCriterion("updateDate"); pageList.setSortCriterion("updateDate");
pageList.setSortDirection(SortOrderEnum.DESCENDING); pageList.setSortDirection(SortOrderEnum.DESCENDING);
searchCriteria.setPageList(pageList); searchCriteria.setPageList(pageList);
} }
pageList = alarmInfoDao.findByQuery(query, searchCriteria.getPageList()); pageList = alarmInfoDao.findByQuery(query, searchCriteria.getPageList());
searchCriteria.setPageList(pageList); searchCriteria.setPageList(pageList);
......
myproject/src/main/java/com/myproject/webapp/controller/qisda/OutInfoSearchController.java
...@@ -10,6 +10,7 @@ import com.myproject.webapp.controller.storage.BaseSearchController; ...@@ -10,6 +10,7 @@ import com.myproject.webapp.controller.storage.BaseSearchController;
import com.myproject.webapp.controller.webService.DataCache; import com.myproject.webapp.controller.webService.DataCache;
import org.apache.logging.log4j.util.Strings; import org.apache.logging.log4j.util.Strings;
import org.displaytag.properties.SortOrderEnum; import org.displaytag.properties.SortOrderEnum;
import org.displaytag.tags.TableTagParameters;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
...@@ -75,6 +76,11 @@ public class OutInfoSearchController extends BaseSearchController { ...@@ -75,6 +76,11 @@ public class OutInfoSearchController extends BaseSearchController {
searchCriteria.setPageList(pageList); searchCriteria.setPageList(pageList);
} }
//导出
if (request.getParameter(TableTagParameters.PARAMETER_EXPORTING) != null){
pageList.setPageNumber(-1);
}
pageList = outInfoDao.findByQuery(query, pageList); pageList = outInfoDao.findByQuery(query, pageList);
searchCriteria.setPageList(pageList); searchCriteria.setPageList(pageList);
......
myproject/src/main/java/com/myproject/webapp/controller/qisda/QisdaController.java
...@@ -285,7 +285,8 @@ public class QisdaController extends BaseController { ...@@ -285,7 +285,8 @@ public class QisdaController extends BaseController {
if(Strings.isNullOrEmpty(hSerialListStr)){ if(Strings.isNullOrEmpty(hSerialListStr)){
return "参数为空"; return "参数为空";
} }
log.info("更改需求单出库优先级:" + hSerialListStr);
log.info(request.getRemoteAddr() + " 更改需求单出库优先级:" + hSerialListStr);
String[] hSerialArray = hSerialListStr.split(";"); String[] hSerialArray = hSerialListStr.split(";");
List<String> hSerialList = Lists.newArrayList(hSerialArray); List<String> hSerialList = Lists.newArrayList(hSerialArray);
outInfoCache.changePriority(hSerialList); outInfoCache.changePriority(hSerialList);
......
myproject/src/main/java/com/myproject/webapp/controller/system/SettingsController.java
...@@ -93,6 +93,7 @@ public class SettingsController extends BaseUpdateController { ...@@ -93,6 +93,7 @@ public class SettingsController extends BaseUpdateController {
oldSettings.setOrderFileDir(settings.getOrderFileDir()); oldSettings.setOrderFileDir(settings.getOrderFileDir());
oldSettings.setInactionDay(settings.getInactionDay()); oldSettings.setInactionDay(settings.getInactionDay());
log.info("设置 停止出入库="+settings.isStopOut()+" 停止自动任务=isStopJob()");
oldSettings.setStopOut(settings.isStopOut()); oldSettings.setStopOut(settings.isStopOut());
oldSettings.setStopJob(settings.isStopJob()); oldSettings.setStopJob(settings.isStopJob());
......
myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaDeviceController.java
...@@ -102,7 +102,7 @@ public class QisdaDeviceController extends BaseController { ...@@ -102,7 +102,7 @@ public class QisdaDeviceController extends BaseController {
for (CodeBean codeBean : codeBeans) { for (CodeBean codeBean : codeBeans) {
if(codeBean.isValid()){ if(codeBean.isValid()){
if(barcode != null){ if(barcode != null){
String msg = "找到多个有效条码"; String msg = "获取尺寸时找到多个有效条码";
throw new ValidateException(msg); throw new ValidateException(msg);
}else{ }else{
barcode = codeBean.getBarcode(); barcode = codeBean.getBarcode();
...@@ -111,7 +111,7 @@ public class QisdaDeviceController extends BaseController { ...@@ -111,7 +111,7 @@ public class QisdaDeviceController extends BaseController {
} }
} }
if(barcode == null){ if(barcode == null){
String msg = "未找到有效条码"; String msg = "获取尺寸时未找到有效条码";
throw new ValidateException(msg); throw new ValidateException(msg);
} }
......
myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java
...@@ -385,6 +385,10 @@ public class TaskService implements ITaskService { ...@@ -385,6 +385,10 @@ public class TaskService implements ITaskService {
} }
if (pos != null) { if (pos != null) {
//如果已在库位中,那么自动将该库位的物料出库
log.info("出库已在库位中的物料["+barcodeSave.getBarcode()+"]");
checkout(pos,"",true);
Storage storage = dataCache.getStorageById(pos.getStorageId()); Storage storage = dataCache.getStorageById(pos.getStorageId());
throw new ValidateException("[ " + barcodeSave.getBarcode() + "]已在"+storage.getName()+"["+pos.getPosName()+"]中"); throw new ValidateException("[ " + barcodeSave.getBarcode() + "]已在"+storage.getName()+"["+pos.getPosName()+"]中");
} }
......
myproject/src/main/webapp/WEB-INF/pages/qisda/outInfoSearch.jsp
...@@ -77,14 +77,16 @@ ...@@ -77,14 +77,16 @@
</form> </form>
<display:table name="searchCriteria.pageList" requestURI="" <display:table name="searchCriteria.pageList" requestURI=""
sort="external" sort="external"
defaultsort="1" class="table table-striped table-bordered table-hover" export="false" id="outInfo"> defaultsort="1" class="table table-striped table-bordered table-hover" export="true" id="outInfo">
<display:setProperty name="export.csv.filename" value="outInfo.csv" />
<c:set var="endOutInfoClass" value=""/> <c:set var="endOutInfoClass" value=""/>
<c:if test="${outInfo.endOutInfo}"> <c:if test="${outInfo.endOutInfo}">
<c:set var="endOutInfoClass" value="bg-yellow"/> <c:set var="endOutInfoClass" value="bg-yellow"/>
</c:if> </c:if>
<display:column titleKey="需求单号" sortable="true" sortProperty="hSerial"> <display:column titleKey="需求单号" sortable="true" sortProperty="hSerial" media="html">
<a href="#" onclick="showDetail('${outInfo.hSerial}')">${outInfo.hSerial}</a> <a href="#" onclick="showDetail('${outInfo.hSerial}')">${outInfo.hSerial}</a>
</display:column> </display:column>
<display:column titleKey="需求单号" property="hSerial" sortable="false" media="csv"/>
<display:column titleKey="动作" property="action" sortable="true" sortProperty="action" class="${endOutInfoClass}"/> <display:column titleKey="动作" property="action" sortable="true" sortProperty="action" class="${endOutInfoClass}"/>
<display:column titleKey="工单" sortable="true" sortProperty="so"> <display:column titleKey="工单" sortable="true" sortProperty="so">
${outInfo.so}<c:if test="${outInfo.soseq != null}">(${outInfo.soseq})</c:if> ${outInfo.so}<c:if test="${outInfo.soseq != null}">(${outInfo.soseq})</c:if>
......
myproject/src/main/webapp/WEB-INF/pages/system/settings.jsp
...@@ -96,41 +96,41 @@ ...@@ -96,41 +96,41 @@
</div> </div>
<div class="portlet-title"> <%--<div class="portlet-title">--%>
<div class="caption"> <%--<div class="caption">--%>
<i class="icon-link font-green-haze"></i> <%--<i class="icon-link font-green-haze"></i>--%>
<span class="caption-subject bold uppercase font-green-haze"><fmt:message key="settings.api"/></span> <%--<span class="caption-subject bold uppercase font-green-haze"><fmt:message key="settings.api"/></span>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
<div class="portlet-body" style="padding-left: 30px;"> <%--<div class="portlet-body" style="padding-left: 30px;">--%>
<c:if test='<%=DataCache.isProductionFor("Pana") %>'> <%--<c:if test='<%=DataCache.isProductionFor("Pana") %>'>--%>
<div class="form-group form-inline"> <%--<div class="form-group form-inline">--%>
<div class="input-group margin-top-10"><fmt:message key="settings.api.checkBarcode"/>:</div> <%--<div class="input-group margin-top-10"><fmt:message key="settings.api.checkBarcode"/>:</div>--%>
<div class="input-group margin-top-10"> <%--<div class="input-group margin-top-10">--%>
<form:input path="reelCheckApi" cssClass="form-control input-xlarge"/> <%--<form:input path="reelCheckApi" cssClass="form-control input-xlarge"/>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
</c:if> <%--</c:if>--%>
<div class="form-group form-inline"> <%--<div class="form-group form-inline">--%>
<div class="input-group margin-top-10"><fmt:message key="settings.api.inNotifaction"/>:</div> <%--<div class="input-group margin-top-10"><fmt:message key="settings.api.inNotifaction"/>:</div>--%>
<div class="input-group margin-top-10"> <%--<div class="input-group margin-top-10">--%>
<form:input path="inNotifyApi" cssClass="form-control input-xlarge"/> <%--<form:input path="inNotifyApi" cssClass="form-control input-xlarge"/>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
<div class="form-group form-inline"> <%--<div class="form-group form-inline">--%>
<div class="input-group margin-top-10"><fmt:message key="settings.api.outNotifaction"/>:</div> <%--<div class="input-group margin-top-10"><fmt:message key="settings.api.outNotifaction"/>:</div>--%>
<div class="input-group margin-top-10"> <%--<div class="input-group margin-top-10">--%>
<form:input path="outNotifyApi" cssClass="form-control form-control input-xlarge"/> <%--<form:input path="outNotifyApi" cssClass="form-control form-control input-xlarge"/>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
<div class="form-group form-inline"> <%--<div class="form-group form-inline">--%>
<div class="input-group margin-top-10"><fmt:message key="settings.api.orderFileDir"/>:</div> <%--<div class="input-group margin-top-10"><fmt:message key="settings.api.orderFileDir"/>:</div>--%>
<div class="input-group margin-top-10"> <%--<div class="input-group margin-top-10">--%>
<form:input path="orderFileDir" cssClass="form-control form-control input-xlarge"/> <%--<form:input path="orderFileDir" cssClass="form-control form-control input-xlarge"/>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<div class="row"> <div class="row">
......
myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp
...@@ -12,6 +12,24 @@ ...@@ -12,6 +12,24 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<ul class="timeline"> <ul class="timeline">
<li class="timeline-grey">
<div class="timeline-time">
<span class="date">2020 </span>
<span class="time">10-21 </span>
</div>
<div class="timeline-icon">
<i class="fa fa-clock-o"></i>
</div>
<div class="timeline-body">
<h2>版本: V2020102114</h2>
<div class="timeline-content">
<ul>
<li>需求单增加导出功能</li>
<li>已在库位中的物料自动处理</li>
</ul>
</div>
</div>
</li>
<li class="timeline-purple"> <li class="timeline-purple">
<div class="timeline-time"> <div class="timeline-time">
<span class="date">2020 </span> <span class="date">2020 </span>
...@@ -24,7 +42,9 @@ ...@@ -24,7 +42,9 @@
<h2>版本: V2020101210</h2> <h2>版本: V2020101210</h2>
<div class="timeline-content"> <div class="timeline-content">
<ul> <ul>
<li>优化部分逻辑,提高系统的稳定性</li> <li>修复入库不绑定工单BUG</li>
<li>优化出入库部分逻辑,提高系统的稳定性</li>
<li>增加工单手动排序日志记录</li>
</ul> </ul>
</div> </div>
</div> </div>
......
myproject/src/main/webapp/decorators/metro.jsp
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
<div class="page-footer-inner"> <div class="page-footer-inner">
2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a> 2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
</div> </div>
<span class="right" style="color: #a3a3a3;">Version: 2020.09.02</span> <span class="right" style="color: #a3a3a3;">Version: 2020.10.28</span>
<div class="scroll-to-top"> <div class="scroll-to-top">
<i class="icon-arrow-up"></i> <i class="icon-arrow-up"></i>
</div> </div>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!