Skip to content

孙克 / SmdBox

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

阳光电源呆滞物料提醒

1 个父辈 41544591
内嵌 并排
正在显示 8 个修改的文件 包含 43 行增加 和 23 行删除
myproject/src/main/java/com/myproject/bean/utils/StatusBean.java
...@@ -160,6 +160,14 @@ public class StatusBean { ...@@ -160,6 +160,14 @@ public class StatusBean {
} }
/** /**
* 门口是否有料盘,如果
* @return
*/
public String hasTrayAtDoor(){
return getFromData("TrayCheck_Door");
}
/**
* 从Data中获取数据 * 从Data中获取数据
*/ */
public String getFromData(String key){ public String getFromData(String key){
......
myproject/src/main/java/com/myproject/util/StorageConstants.java
...@@ -148,9 +148,9 @@ public class StorageConstants { ...@@ -148,9 +148,9 @@ public class StorageConstants {
*/ */
public final static int OUT_FINISHED = 10; public final static int OUT_FINISHED = 10;
/** /**
* 11出库失败 * 11出库完成
*/ */
public final static int OUT_FAILED = 11; public final static int OUT_END = 11;
/** /**
* 12出库移栽中 * 12出库移栽中
......
myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java
...@@ -1130,7 +1130,7 @@ public class TaskService implements ITaskService { ...@@ -1130,7 +1130,7 @@ public class TaskService implements ITaskService {
log.warn(statusBeanToSave.getCid() + "出仓位[" + boxStatus.getPosId() + "]完成时任务不存在"); log.warn(statusBeanToSave.getCid() + "出仓位[" + boxStatus.getPosId() + "]完成时任务不存在");
} }
} }
} else if (StorageConstants.BOX_STATUS.OUT_FAILED == status) {//出库失败 } else if (StorageConstants.BOX_STATUS.OUT_END == status) {//出库完成(放到仓门口
//暂不处理 //暂不处理
} }
} }
......
myproject/src/main/resources/StorageResources.properties
...@@ -128,7 +128,7 @@ storage.status.7=Material Receiving Completed ...@@ -128,7 +128,7 @@ storage.status.7=Material Receiving Completed
storage.status.8=Material Receiving Failed storage.status.8=Material Receiving Failed
storage.status.9=Material Retrieval in Porcess storage.status.9=Material Retrieval in Porcess
storage.status.10=Materail Retrieval Completed storage.status.10=Materail Retrieval Completed
storage.status.11=Material Retrieval failed storage.status.11=Material Retrieval End
storage.status.12=Material transfering storage.status.12=Material transfering
storage.status.13=System resetting storage.status.13=System resetting
sotrage.status.999=Offline sotrage.status.999=Offline
......
myproject/src/main/resources/StorageResources_en.properties
...@@ -125,7 +125,7 @@ storage.status.7=Material Receiving Completed ...@@ -125,7 +125,7 @@ storage.status.7=Material Receiving Completed
storage.status.8=Material Receiving Failed storage.status.8=Material Receiving Failed
storage.status.9=Material Retrieval in Porcess storage.status.9=Material Retrieval in Porcess
storage.status.10=Materail Retrieval Completed storage.status.10=Materail Retrieval Completed
storage.status.11=Material Retrieval failed storage.status.11=Material Retrieval End
storage.status.12=Material transfering storage.status.12=Material transfering
storage.status.13=System resetting storage.status.13=System resetting
sotrage.status.999=Offline sotrage.status.999=Offline
......
myproject/src/main/resources/StorageResources_zh_CN.properties
...@@ -125,7 +125,7 @@ storage.status.7=\u6599\u76D8\u5165\u4ED3\u4F4D\u5B8C\u6210 ...@@ -125,7 +125,7 @@ storage.status.7=\u6599\u76D8\u5165\u4ED3\u4F4D\u5B8C\u6210
storage.status.8=\u5165\u5E93\u5931\u8D25 storage.status.8=\u5165\u5E93\u5931\u8D25
storage.status.9=\u51FA\u5E93\u6267\u884C\u4E2D storage.status.9=\u51FA\u5E93\u6267\u884C\u4E2D
storage.status.10=\u51FA\u4ED3\u4F4D\u5B8C\u6210 storage.status.10=\u51FA\u4ED3\u4F4D\u5B8C\u6210
storage.status.11=\u51FA\u5E93\u5931\u8D25 storage.status.11=\u51FA\u5E93\u5B8C\u6210
storage.status.12=\u79FB\u683D\u4E2D storage.status.12=\u79FB\u683D\u4E2D
storage.status.13=\u539F\u70B9\u8FD4\u56DE\u4E2D storage.status.13=\u539F\u70B9\u8FD4\u56DE\u4E2D
sotrage.status.999=\u79BB\u7EBF sotrage.status.999=\u79BB\u7EBF
......
myproject/src/main/webapp/WEB-INF/pages/component/storagePosFind.jsp
...@@ -9,6 +9,13 @@ ...@@ -9,6 +9,13 @@
<%@ include file="/common/taglibs.jsp" %> <%@ include file="/common/taglibs.jsp" %>
<%@ page language="java" pageEncoding="UTF-8" %> <%@ page language="java" pageEncoding="UTF-8" %>
<style type="text/css">
.inactionItem{
color:red;
}
</style>
<c:if test="${screen != 'tablet'}"> <c:if test="${screen != 'tablet'}">
<!-- BEGIN PAGE HEADER--> <!-- BEGIN PAGE HEADER-->
<h3 class="page-title"> <h3 class="page-title">
...@@ -149,6 +156,11 @@ ...@@ -149,6 +156,11 @@
<c:if test="${pos.barcode.type == 1 && pos.barcode.maxStorageTime != 0 && pos.inStoreHour >= pos.barcode.maxStorageTime}"> <c:if test="${pos.barcode.type == 1 && pos.barcode.maxStorageTime != 0 && pos.inStoreHour >= pos.barcode.maxStorageTime}">
<c:set var="alarmClass" value="alarmItem"/> <c:set var="alarmClass" value="alarmItem"/>
</c:if> </c:if>
<c:set var="inactionClass" value=""/>
<c:if test="${pos.inStoreHour/24 >= inactionDay}">
<c:set var="inactionClass" value="inactionItem"/>
</c:if>
<c:if test="${today >= pos.barcode.expireDate}"> <c:if test="${today >= pos.barcode.expireDate}">
<c:set var="alarmClass" value="alarmItem"/> <c:set var="alarmClass" value="alarmItem"/>
</c:if> </c:if>
...@@ -160,7 +172,7 @@ ...@@ -160,7 +172,7 @@
</display:column> </display:column>
<display:column titleKey="storagePosFind.index">${pos_rowNum}</display:column> <display:column titleKey="storagePosFind.index">${pos_rowNum}</display:column>
<display:column titleKey="component.partNumber" style="width: 15%;" sortProperty="barcode.partNumber" sortable="true" class="${alarmClass}"> <display:column titleKey="component.partNumber" style="width: 15%;" sortProperty="barcode.partNumber" sortable="true">
${pos.barcode.partNumber} ${pos.barcode.partNumber}
</display:column> </display:column>
...@@ -179,7 +191,7 @@ ...@@ -179,7 +191,7 @@
<%--<display:column property="barcode.lockName" titleKey="menu.inRule"/>--%> <%--<display:column property="barcode.lockName" titleKey="menu.inRule"/>--%>
<display:column property="posName" titleKey="checkOut.pos" sortProperty="posName" sortable="true"/> <display:column property="posName" titleKey="checkOut.pos" sortProperty="posName" sortable="true"/>
<display:column titleKey="barcode.inStoreRemainTime" sortProperty="barcode.putInTime" sortable="true"> <display:column titleKey="barcode.inStoreRemainTime" sortProperty="barcode.putInTime" sortable="true" class="${inactionClass}">
<c:if test="${pos.inStoreHour >= 1}">${pos.inStoreHour}<fmt:message key="solder.hour"/></c:if><c:if test="${pos.inStoreMiniute != 0}">${pos.inStoreMiniute}<fmt:message key="runStatus.minutes"/> <c:if test="${pos.inStoreHour >= 1}">${pos.inStoreHour}<fmt:message key="solder.hour"/></c:if><c:if test="${pos.inStoreMiniute != 0}">${pos.inStoreMiniute}<fmt:message key="runStatus.minutes"/>
<c:if test="${pos.barcode.maxStorageTime != 0 }"> <c:if test="${pos.barcode.maxStorageTime != 0 }">
/${pos.barcode.maxStorageTime}<fmt:message key="solder.hour"/></c:if> /${pos.barcode.maxStorageTime}<fmt:message key="solder.hour"/></c:if>
...@@ -194,7 +206,7 @@ ...@@ -194,7 +206,7 @@
<display:column titleKey="barcode.produceDate" sortProperty="barcode.produceDate" sortable="true"> <display:column titleKey="barcode.produceDate" sortProperty="barcode.produceDate" sortable="true">
<fmt:formatDate value="${pos.barcode.produceDate}" pattern="yyyy-MM-dd"/> <fmt:formatDate value="${pos.barcode.produceDate}" pattern="yyyy-MM-dd"/>
</display:column> </display:column>
<display:column titleKey="barcode.expireDate" sortProperty="barcode.expireDate" sortable="true"> <display:column titleKey="barcode.expireDate" sortProperty="barcode.expireDate" sortable="true" class="${alarmClass}">
<fmt:formatDate value="${pos.barcode.expireDate}" pattern="yyyy-MM-dd"/> <fmt:formatDate value="${pos.barcode.expireDate}" pattern="yyyy-MM-dd"/>
</display:column> </display:column>
<display:column property="barcode.memo" titleKey="barcode.memo"/> <display:column property="barcode.memo" titleKey="barcode.memo"/>
......
myproject/src/main/webapp/WEB-INF/pages/system/settings.jsp
...@@ -98,19 +98,19 @@ ...@@ -98,19 +98,19 @@
<%--</div>--%> <%--</div>--%>
<%--</div>--%> <%--</div>--%>
<%--<div class="portlet-title">--%> <div class="portlet-title">
<%--<div class="caption">--%> <div class="caption">
<%--<i class="icon-bell font-green-haze"></i>--%> <i class="icon-bell font-green-haze"></i>
<%--<span class="caption-subject bold uppercase font-green-haze"><fmt:message key="提醒设置"/></span>--%> <span class="caption-subject bold uppercase font-green-haze"><fmt:message key="提醒设置"/></span>
<%--</div>--%> </div>
<%--</div>--%> </div>
<%--<div class="portlet-body" style="padding-left: 30px;">--%> <div class="portlet-body" style="padding-left: 30px;">
<%--<div class="form-group form-inline">--%> <div class="form-group form-inline">
<%--<div class="input-group margin-top-10">--%> <div class="input-group margin-top-10">
<%--<form:input path="inactionDay" cssClass="form-control input-small"/>--%> <form:input path="inactionDay" cssClass="form-control input-small"/>
<%--<span class="input-group-addon"><fmt:message key="天前呆滞物料提醒"/></span>--%> <span class="input-group-addon"><fmt:message key="天前呆滞物料提醒"/></span>
<%--</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.pcbEmail.adress"/>:</div>--%> <%--<div class="input-group margin-top-10"><fmt:message key="settings.pcbEmail.adress"/>:</div>--%>
<%--<div class="input-group margin-top-10">--%> <%--<div class="input-group margin-top-10">--%>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<%--</div>--%> <%--</div>--%>
<%--<button type="button" class="btn yellow" onclick="testEmail('true');"><fmt:message key="btn.test"/></button>--%> <%--<button type="button" class="btn yellow" onclick="testEmail('true');"><fmt:message key="btn.test"/></button>--%>
<%--</div>--%> <%--</div>--%>
<%--</div>--%> </div>
<%--<div class="portlet-title">--%> <%--<div class="portlet-title">--%>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!