Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
SmdBox
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 55bc85f5
由
sunke
编写于
2020-07-24 08:21:51 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
工单修改数量后出库BGU
1 个父辈
6cad4e79
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
21 行增加
和
11 行删除
myproject/src/main/java/com/myproject/webapp/controller/webService/StorageDataController.java
myproject/src/main/webapp/WEB-INF/pages/component/componentSearch.jsp
myproject/src/main/webapp/WEB-INF/pages/storage/allBoxView.jsp
myproject/src/main/webapp/common/metroTopMenu.jsp
myproject/src/main/java/com/myproject/webapp/controller/webService/StorageDataController.java
查看文件 @
55bc85f
...
@@ -500,6 +500,9 @@ public class StorageDataController extends BaseController {
...
@@ -500,6 +500,9 @@ public class StorageDataController extends BaseController {
item
.
setNeedNum
(
newNeedNum
.
intValue
());
item
.
setNeedNum
(
newNeedNum
.
intValue
());
liteOrderItemDao
.
save
(
item
);
liteOrderItemDao
.
save
(
item
);
}
}
LiteOrder
liteOrder
=
liteOrderDao
.
findWithItemsByOrderNo
(
orderNo
);
TaskService
.
liteOrderMap
.
put
(
liteOrder
.
getOrderNo
(),
liteOrder
);
return
"0"
+
getText
(
"shelf.msg.opSucess"
,
request
.
getLocale
(),
"操作成功"
);
return
"0"
+
getText
(
"shelf.msg.opSucess"
,
request
.
getLocale
(),
"操作成功"
);
}
}
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
...
...
myproject/src/main/webapp/WEB-INF/pages/component/componentSearch.jsp
查看文件 @
55bc85f
...
@@ -99,9 +99,8 @@
...
@@ -99,9 +99,8 @@
<display:column media="html" titleKey=" ">
<display:column media="html" titleKey=" ">
<a
<a onclick="window.open('${ctx}/codeGen.html?pnId=${component.id}&num=1')"><fmt:message key="component.generateBarcode"/> </a>
onclick="window.open('${ctx}/codeGen.html?pnId=${component.id}&num=1')"><fmt:message key="component.generateBarcode"/> </a></display:column>
</display:column>
<display:setProperty name="paging.banner.item_name"><fmt:message
<display:setProperty name="paging.banner.item_name"><fmt:message
key="component.item.name"/></display:setProperty>
key="component.item.name"/></display:setProperty>
<display:setProperty name="paging.banner.items_name"><fmt:message
<display:setProperty name="paging.banner.items_name"><fmt:message
...
@@ -190,6 +189,10 @@
...
@@ -190,6 +189,10 @@
${component.maxStorageTime - component.warmTime}<fmt:message key="solder.hour"/>
${component.maxStorageTime - component.warmTime}<fmt:message key="solder.hour"/>
</display:column>
</display:column>
<display:column media="html" titleKey=" ">
<a onclick="window.open('${ctx}/codeGen.html?pnId=${component.id}&num=1')"><fmt:message key="component.generateBarcode"/> </a>
</display:column>
<display:setProperty name="paging.banner.item_name"><fmt:message
<display:setProperty name="paging.banner.item_name"><fmt:message
key="component.item.name"/></display:setProperty>
key="component.item.name"/></display:setProperty>
<display:setProperty name="paging.banner.items_name"><fmt:message
<display:setProperty name="paging.banner.items_name"><fmt:message
...
@@ -266,6 +269,10 @@
...
@@ -266,6 +269,10 @@
<display:column titleKey="pcb.fixtureNumber" property="fixtureNumber">
<display:column titleKey="pcb.fixtureNumber" property="fixtureNumber">
</display:column>
</display:column>
<display:column media="html" titleKey=" ">
<a onclick="window.open('${ctx}/codeGen.html?pnId=${component.id}&num=1')"><fmt:message key="component.generateBarcode"/> </a>
</display:column>
<display:setProperty name="paging.banner.item_name"><fmt:message
<display:setProperty name="paging.banner.item_name"><fmt:message
key="component.item.name"/></display:setProperty>
key="component.item.name"/></display:setProperty>
<display:setProperty name="paging.banner.items_name"><fmt:message
<display:setProperty name="paging.banner.items_name"><fmt:message
...
...
myproject/src/main/webapp/WEB-INF/pages/storage/allBoxView.jsp
查看文件 @
55bc85f
...
@@ -343,7 +343,7 @@
...
@@ -343,7 +343,7 @@
</div>
</div>
<div id="modifyOrderNum" class="modal fade" tabindex="-1" data-backdrop="static" data-keyboard="false">
<div id="modifyOrderNum" class="modal fade" tabindex="-1" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog" style="
width: 800px; margin-top:
10%;">
<div class="modal-dialog" style="
margin-top: 10%;width:80%;margin-left:
10%;">
<div class="modal-content">
<div class="modal-content">
<div class="modal-header">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
...
@@ -368,7 +368,7 @@
...
@@ -368,7 +368,7 @@
</div>
</div>
<div id="modifyNum" class="modal fade" tabindex="-1" data-backdrop="static" data-keyboard="false">
<div id="modifyNum" class="modal fade" tabindex="-1" data-backdrop="static" data-keyboard="false">
<div class="modal-dialog" style="
width: 800px; margin-top:
10%;">
<div class="modal-dialog" style="
margin-top: 10%;width:80%;margin-left:
10%;">
<div class="modal-content">
<div class="modal-content">
<div class="modal-header">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
...
@@ -1031,7 +1031,7 @@
...
@@ -1031,7 +1031,7 @@
var num = $("#orderNumRate").val();
var num = $("#orderNumRate").val();
$.post("${ctx}/service/store/modifyOrderNum", {orderNo: orderNo, num: num}, function (data) {
$.post("${ctx}/service/store/modifyOrderNum", {orderNo: orderNo, num: num}, function (data) {
showMsg(data);
showMsg(data);
if (data.indexOf("
OK
") == 0) {
if (data.indexOf("
0
") == 0) {
$("#orderNumRate").val("");
$("#orderNumRate").val("");
$("#modifyOrderNum").modal("hide");
$("#modifyOrderNum").modal("hide");
showOrderDetail(orderNo);
showOrderDetail(orderNo);
...
...
myproject/src/main/webapp/common/metroTopMenu.jsp
查看文件 @
55bc85f
...
@@ -62,11 +62,11 @@
...
@@ -62,11 +62,11 @@
<fmt:message key="menu.cloud.inventory"/><span class="selected"></span>
<fmt:message key="menu.cloud.inventory"/><span class="selected"></span>
</a>
</a>
</li>
</li>
<
li class="classic-menu-dropdown"
>
<
%--<li class="classic-menu-dropdown">--%
>
<
a href="${ctx}/component/ReelNumModify.html" name="cloud"
>
<
%--<a href="${ctx}/component/ReelNumModify.html" name="cloud">--%
>
<
fmt:message key="menu.cloud.numModify"/><span class="selected"></span
>
<
%--<fmt:message key="menu.cloud.numModify"/><span class="selected"></span>--%
>
<
/a
>
<
%--</a>--%
>
<
/li
>
<
%--</li>--%
>
</ul>
</ul>
</security:authorize>
</security:authorize>
<%--Barcode--%>
<%--Barcode--%>
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论