From 60cdc93fe5b1d873e0ae74ce5220cf527a47027e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 三月 2021 15:41:42 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java | 4 +
src/main/webapp/static/js/custOrder/custOrder.js | 124 +++++++++++++++++++++--------------------
src/main/java/zy/cloud/wms/common/service/MainService.java | 4 +
3 files changed, 71 insertions(+), 61 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index 808eaaa..86cbd86 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -102,7 +102,7 @@
if (issued > 0) {
// 瑙嗗浘瀵硅薄
StoPreTab tab = new StoPreTab();
- tab.setTitle(mat.getMatnr() + "<br>" + mat.getMaktx() + "<br>鏁伴噺锛�" + anfme);
+ tab.setTitle(mat.getMatnr() + "锛�" + mat.getMaktx() + "锛�");
tab.setMatnr(mat.getMatnr());
tab.setMaktx(mat.getMaktx());
tab.setAnfme(anfme);
@@ -111,7 +111,9 @@
tab.setNodeId(locDetl.getNodeId());
tab.setTotal(locDetl.getAnfme());
tab.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ tab.setRemQty(tab.getTotal() - tab.getReduce());
tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
+ tab.setPrior$(tab.getPrior()?"鉁�":"脳");
result.add(tab);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
diff --git a/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java b/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java
index 0a73c51..58b639f 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/StoPreTab.java
@@ -24,6 +24,10 @@
private Double reduce;
+ private Double remQty;
+
private Boolean prior;
+ private String prior$;
+
}
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 6358a08..eae59fb 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -196,7 +196,7 @@
}),
method: 'POST',
success: function (res) {
- console.log(res)
+ console.log(JSON.stringify(res.data))
layer.close(loadIndex);
// 鎴愬姛
if (res.code === 200){
@@ -205,38 +205,40 @@
,title: false
,closeBtn: false
,offset: '100px'
- ,area: '1200px;'
+ ,area: '800px;'
,shade: 0.5
,id: 'LAY_layuipro'
,btn: ['椹笂鎷ｈ揣', '绋嶅悗澶勭悊']
,btnAlign: 'c'
,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
- // ,content: '<div style="padding: 50px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">浣犵煡閬撳悧锛熶翰锛�<br>layer 鈮� layui<br><br>layer鍙槸浣滀负Layui鐨勪竴涓脊灞傛ā鍧楋紝鐢变簬鍏剁敤鎴峰熀鏁拌緝澶э紝鎵�浠ュ父甯镐細鏈変汉浠ヤ负layui鏄痩ayerui<br><br>layer铏界劧宸茶 Layui 鏀剁紪涓哄唴缃殑寮瑰眰妯″潡锛屼絾浠嶇劧浼氫綔涓轰竴涓嫭绔嬬粍浠跺叏鍔涚淮鎶ゃ�佸崌绾с��<br><br>鎴戜滑姝ゅ悗鐨勫緛閫旀槸鏄熻景澶ф捣 ^_^</div>'
,content: $('#stoukOutPreview')
,success: function(layero, index){
table.render({
elem: '#stoPreTab',
- // url: 'tablex-tb2.json',
data: res.data,
page: true,
cellMinWidth: 100,
cols: [[
- {field: 'title', title: '鍚嶇О', sort: true},
- {field: 'maktx', title: '鑿滃崟鍚嶇О'},
- {field: 'locNo', title: '璐т綅'},
- {field: 'reduce', title: '鍑哄簱鏁伴噺'},
- {field: 'prior', title: '鎺ㄨ崘璐т綅'},
+ {field: 'title', title: '鍟嗗搧', align: 'center'},
+ {field: 'anfme', title: '鎬绘暟閲�', align: 'center', style: 'font-weight: bold', width: 80},
+ {field: 'locNo', title: '璐т綅', align: 'center'},
+ {field: 'prior$', title: '鎺ㄨ崘璐т綅', align: 'center', width: 100},
+ {field: 'reduce', title: '鏁伴噺', align: 'center', width: 80, style: 'font-weight: bold'},
+ {field: 'remQty', title: '浣欓噺', align: 'center', width: 80},
]],
done: function () {
- tableX.merges('stoPreTab', [0]);
+ tableX.merges('stoPreTab', [0,1]);
}
});
- // var btn = layero.find('.layui-layer-btn');
- // btn.find('.layui-layer-btn0').attr({
- // href: 'http://www.layui.com/'
- // ,target: '_blank'
- // });
+ }
+ ,yes: function(index, layero){
+ //鎸夐挳銆愰┈涓婃嫞璐с�戠殑鍥炶皟
+ stockOut(data.number);
+ }
+ ,btn2: function(index, layero){
+ //鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
}
});
// 缂烘枡
@@ -260,51 +262,6 @@
}
}
})
-
-
- // layer.confirm(data.number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
- // layer.closeAll();
- // $.ajax({
- // url: baseUrl+"/work/stock/out",
- // headers: {'token': localStorage.getItem('token')},
- // contentType:'application/json;charset=UTF-8',
- // data: JSON.stringify({
- // number: data.number
- // }),
- // method: 'POST',
- // success: function (res) {
- // // 鎴愬姛
- // if (res.code === 200){
- // layer.confirm(res.msg, {
- // shadeClose: true
- // , btn: ['鎵撳嵃鎷ｈ揣鍗�']
- // }, function() {
- // layer.closeAll();
- // printPakouts(data.number);
- // }
- // )
- // // 缂烘枡
- // } else if (res.code === 20001) {
- // layer.confirm(res.msg, {
- // shadeClose: true
- // , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
- // }, function() {
- // // todo 搴撳瓨璋冩嫧
- // layer.closeAll();
- // }, function() {
- // // printPakouts(data.number);
- // layer.closeAll();
- // }
- // )
- // } else if (res.code === 403){
- // top.location.href = baseUrl+"/";
- // } else {
- // layer.msg(res.msg)
- // }
- // $(".layui-laypage-btn")[0].click();
- // }
- // })
- // });
break;
// 鎵撳嵃
case 'print':
@@ -317,6 +274,53 @@
}
});
+ // 寮�濮嬫嫞璐�
+ function stockOut(number) {
+ layer.confirm(number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
+ layer.closeAll();
+ $.ajax({
+ url: baseUrl+"/work/stock/out",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify({
+ number: number
+ }),
+ method: 'POST',
+ success: function (res) {
+ // 鎴愬姛
+ if (res.code === 200){
+ layer.confirm(res.msg, {
+ shadeClose: true
+ , btn: ['鎵撳嵃鎷ｈ揣鍗�']
+ }, function() {
+ layer.closeAll();
+ printPakouts(number);
+ }
+ )
+ // 缂烘枡
+ } else if (res.code === 20001) {
+ layer.confirm(res.msg, {
+ shadeClose: true
+ , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
+ }, function() {
+ // todo 搴撳瓨璋冩嫧
+ layer.closeAll();
+ }, function() {
+ // printPakouts(data.number);
+ layer.closeAll();
+ }
+ )
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ $(".layui-laypage-btn")[0].click();
+ }
+ })
+ });
+ }
+
// 鎵撳嵃鎷ｈ揣鍗�
function printPakouts(docNumber) {
$.ajax({
--
Gitblit v1.9.1