Skip to content

孙克 / SmdBox

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

部分中英文修改

1 个父辈 441937d9
内嵌 并排
正在显示 9 个修改的文件 包含 45 行增加 和 37 行删除
myproject/src/main/java/com/myproject/webapp/controller/storage/ChartController.java
......@@ -43,10 +43,10 @@ public class ChartController extends BaseController{
public String showChart(HttpServletRequest request) {
//TODO:首页查询订单的时候需要只显示一部分,
request.setAttribute("dataLogs",dataLogDao.latestLogs(10));
//request.setAttribute("dataLogs",dataLogDao.latestLogs(10));
request.setAttribute("usedPosData",storageManager.countUsedPos());
return "storage/chart";
//request.setAttribute("usedPosData",storageManager.countUsedPos());
return "homeMenu";
}
......
myproject/src/main/java/com/myproject/webapp/controller/webService/StorageDataController.java
......@@ -309,14 +309,14 @@ public class StorageDataController extends BaseController {
StoragePos pos = findPos(findByPartNumber, storageId, value,excludePosIds, checkoutType);
if(pos == null){
String msg = "1未找到可以出库的物料";
String msg = "1"+getText("shelf.msg.outError",request.getLocale(),"未找到可以出库的物料");
log.error(msg);
return msg;
}else{
log.info("出库位置仓位【"+pos.getPosName()+"】");
String outResult = taskService.checkout(pos,subSourceId, isSingleOut);
if(!Strings.isNullOrEmpty(outResult)){
return "1"+outResult;
return "1"+getText(outResult,request.getLocale());
}
}
}
......@@ -332,7 +332,7 @@ public class StorageDataController extends BaseController {
String outResult = taskService.checkout(pos, subSourceId, isSingleOut);
if(!Strings.isNullOrEmpty(outResult)){
return "1"+outResult;
return "1"+getText(outResult,request.getLocale());
}
}
}
......
myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java
......@@ -1491,7 +1491,7 @@ public class TaskService implements ITaskService {
if(taskInList.getPosId() == null) continue;
if(taskInList.getPosId().equals(pos.getId())){
log.info("库位【"+pos.getPosName()+"已在任务列表中,忽略】");
return "库位【"+pos.getPosName()+"已在任务列表中,忽略】";
return "";
}
}
......@@ -1530,10 +1530,12 @@ public class TaskService implements ITaskService {
liteOrderMap.put(orderNo,cacheOrder);
}else{
return "无法执行工单补料任务";
//return "无法执行工单补料任务";
return "order.out.failed";
}
}else{
return "未找到工单信息";
//return "未找到工单信息";
return "order.out.notFound";
}
}
task = dataLogDao.save(task);
......
myproject/src/main/resources/StorageResources.properties
......@@ -41,9 +41,6 @@ workOrder.update.title=Work Order Management
workOrder.update.subtitle=Work Order Info.
workOrder.list=Work Order List
workOrder.saveSuccess=Work Order Saved
workOrder.deleteSuccess=Work Order Deleted
workOrder.checkoutSuccess=Work Order completed
workOrder.error.emptyBom=No BOM ties to selected Work Order
workOrder.workOrder=Work Order
workOrder.name=Order Number
workOrder.date=Date
......@@ -371,6 +368,8 @@ shelf.nextPos.wrongSize=Next Position [{0}] size [{1}] is different from materia
order.out.set=set of materials
order.out.surplus=surplus material
order.out.failed=Can not execute task
order.out.notFound=The order info was not found
order.inventory=inventory
order.num.modify=Order Qty Modify
order.modify.tip=Modify Qty to\: current quantity times
......@@ -379,6 +378,7 @@ order.close.empty=Order number is empty.
order.close.notExist=The order of [{0}] is not found.
order.close.success =Order Closed Successfully
export.csv=Export to CSV
workOrder.waitOut=waiting for execution
......
myproject/src/main/resources/StorageResources_en.properties
......@@ -431,3 +431,5 @@ order.close.success=Order Closed Successfully
order.close.empty=Order Number is empty.
order.close.notExist=The order of [{0}] is not found.
order.close=Close
order.out.failed=Can not execute task
order.out.notFound=The order info was not found
myproject/src/main/resources/StorageResources_jp.properties
......@@ -427,4 +427,6 @@ delete.confirm=\u786E\u5B9A\u8981\u5220\u9664\u5417?
order.close.success=\u5DE5\u5355\u5173\u95ED\u6210\u529F
order.close.empty=\u5DE5\u5355\u53F7\u4E0D\u80FD\u4E3A\u7A7A
order.close.notExist=\u672A\u627E\u5230\u5DE5\u5355[{0}]
order.close=\u5173\u95ED
\ No newline at end of file
order.close=\u5173\u95ED
order.out.failed=\u65E0\u6CD5\u6267\u884C\u5DE5\u5355\u8865\u6599\u4EFB\u52A1
order.out.notFound=\u672A\u627E\u5230\u5DE5\u5355\u4FE1\u606F
\ No newline at end of file
myproject/src/main/resources/StorageResources_zh_CN.properties
......@@ -427,4 +427,6 @@ delete.confirm=\u786E\u5B9A\u8981\u5220\u9664\u5417?
order.close.success=\u5DE5\u5355\u5173\u95ED\u6210\u529F
order.close.empty=\u5DE5\u5355\u53F7\u4E0D\u80FD\u4E3A\u7A7A
order.close.notExist=\u672A\u627E\u5230\u5DE5\u5355[{0}]
order.close=\u5173\u95ED
\ No newline at end of file
order.close=\u5173\u95ED
order.out.failed=\u65E0\u6CD5\u6267\u884C\u5DE5\u5355\u8865\u6599\u4EFB\u52A1
order.out.notFound=\u672A\u627E\u5230\u5DE5\u5355\u4FE1\u606F
\ No newline at end of file
myproject/src/main/webapp/WEB-INF/pages/user/userUpdate.jsp
......@@ -140,24 +140,24 @@
<div class="form-group">
</div>
<div class="form-group last">
<label class="control-label col-md-3"><fmt:message key="user.cabinetAssign"/></label>
<div class="col-md-9">
<form:select path="cabinetPos" multiple="multiple" class="multi-select">
<c:forEach var="item" items="${slots}">
<optgroup label="${item.key}">
<c:forEach items="${item.value}" var="pos">
<c:set var="selectedStr" value=""/>
<c:if test="${fn:contains(user.cabinetPosIds,pos.id)}">
<c:set var="selectedStr" value="selected"/>
</c:if>
<form:option value="${pos.id}" selected="${selectedStr}">${pos.posName}</form:option>
</c:forEach>
</optgroup>
</c:forEach>
</form:select>
</div>
</div>
<%--<div class="form-group last">--%>
<%--<label class="control-label col-md-3"><fmt:message key="user.cabinetAssign"/></label>--%>
<%--<div class="col-md-9">--%>
<%--<form:select path="cabinetPos" multiple="multiple" class="multi-select">--%>
<%--<c:forEach var="item" items="${slots}">--%>
<%--<optgroup label="${item.key}">--%>
<%--<c:forEach items="${item.value}" var="pos">--%>
<%--<c:set var="selectedStr" value=""/>--%>
<%--<c:if test="${fn:contains(user.cabinetPosIds,pos.id)}">--%>
<%--<c:set var="selectedStr" value="selected"/>--%>
<%--</c:if>--%>
<%--<form:option value="${pos.id}" selected="${selectedStr}">${pos.posName}</form:option>--%>
<%--</c:forEach>--%>
<%--</optgroup>--%>
<%--</c:forEach>--%>
<%--</form:select>--%>
<%--</div>--%>
<%--</div>--%>
</div>
......
myproject/src/main/webapp/common/metroTopMenu.jsp
......@@ -101,11 +101,11 @@
<fmt:message key="menu.bigdata.runStatus" /><span class="selected"></span>
</a>
</li>
<li class="classic-menu-dropdown">
<a href="${ctx}/storage/chart.html" name="data">
<fmt:message key="数据看板" /><span class="selected"></span>
</a>
</li>
<%--<li class="classic-menu-dropdown">--%>
<%--<a href="${ctx}/storage/chart.html" name="data">--%>
<%--<fmt:message key="数据看板" /><span class="selected"></span>--%>
<%--</a>--%>
<%--</li>--%>
<%--<li class="classic-menu-dropdown">--%>
<%--<a href="${ctx}/system/dataReport.html" name="data">--%>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!