From b7c05c9a8fa17542af39e5e12a2fb98bcea3451f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 17:34:33 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 4
src/main/webapp/static/js/order/order.js | 400 ++++++++-------------------------------------------------
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 8
3 files changed, 62 insertions(+), 350 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index a18c83d..501063d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -62,8 +62,8 @@
return workService.stockOutPreview(stockOutParam, getUserId());
}
- @RequestMapping("/stock/out")
- @ManagerAuth(memo = "鎷ｈ揣")
+ @RequestMapping("/stock/out/create")
+ @ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
public R stockOut(@RequestBody StockOutParam stockOutParam) {
return workService.stockOut(stockOutParam, getUserId());
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 70e7a2f..9bfcfa4 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -254,10 +254,10 @@
@Override
public R stockOut(StockOutParam param, Long userId) {
- List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>()
- .eq("number", param.getOrderNo())
- .eq("status", 1)
- );
+ Order order = orderService.selectByOrderNo(param.getOrderNo());
+ if (order.getSettle() != 1) {
+ return R.error("姝ゅ崟鎹棤娉曠敓鎴愭嫞璐у崟");
+ }
List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(param.getOrderNo());
if (Cools.isEmpty(orderDetls)) {
return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 1071361..a295741 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -152,7 +152,6 @@
height: 'full-100',
cols: [[
{type: 'checkbox'}
- // ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
,{field: 'orderNo', align: 'center',title: '璁㈠崟缂栧彿'}
,{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'}
@@ -161,7 +160,6 @@
,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿', hide: true}
,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�', hide: true}
,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�'}
- // ,{field: 'cstmr$', align: 'center',title: '瀹㈡埛缂栧彿'}
,{field: 'cstmrName', align: 'center',title: '瀹㈡埛', hide: true}
,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡', hide: true}
,{field: 'operMemb', align: 'center',title: '鎿嶄綔浜哄憳'}
@@ -180,12 +178,6 @@
,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О', hide: true}
,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿', hide: true}
,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��', templet: '#settleTpl', width: 100}
- // ,{field: 'status$', align: 'center',title: '鐘舵��'}
- // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
- // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'}
- // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- // ,{field: 'memo', align: 'center',title: '澶囨敞'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
request: {
@@ -210,14 +202,6 @@
}
pageCurr=curr;
limit();
- form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
- res.data[_index][data.value] = 'Y';
- }else{
- res.data[_index][data.value] = 'N';
- }
- });
}
});
/* 琛ㄦ牸2鎼滅储 */
@@ -281,7 +265,6 @@
]],
done: function () {
tableMerge.render(this);
- // tableX.merges('stoPreTab', [0,1,2]);
$('.layui-table-body.layui-table-main').css("overflow", "auto")
}
});
@@ -289,7 +272,7 @@
}
,yes: function(index, layero){
//鎸夐挳銆愰┈涓婃嫞璐с�戠殑鍥炶皟
- stockOut(data.number);
+ stockOut(data.orderNo);
}
,btn2: function(index, layero){
//鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟
@@ -311,14 +294,16 @@
printPakouts(data.number);
})
break;
+ // 淇敼
+ case 'edit':
+ showEditModel2(obj.data);
+ break;
+ // 鍒犻櫎
+ case 'del':
+ var ids = [obj.id];
+ doDelOrder({ids: ids});
+ break;
- }
- if (obj.event === 'edit') { // 淇敼
- showEditModel2(obj.data);
- } else if (obj.event === 'del') { // 鍒犻櫎
- var ids = [];
- ids.push(obj.id)
- doDelOrder({ids: ids});
}
});
@@ -399,6 +384,52 @@
}
+ // 鐢熸垚鎷ｈ揣鍗�
+ function stockOut(orderNo) {
+ // layer.confirm(number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
+ layer.closeAll();
+ $.ajax({
+ url: baseUrl+"/work/stock/out/create",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ data: JSON.stringify({
+ orderNo: orderNo
+ }),
+ 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() {
+ // 搴撳瓨璋冩嫧
+ layer.closeAll();
+ }, function() {
+ alert(number)
+ layer.closeAll();
+ }
+ )
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ $(".layui-laypage-btn")[0].click();
+ }
+ })
+ // });
+ }
@@ -406,256 +437,6 @@
-
-
-
-
-
-
-
-// // 鐩戝惉鎺掑簭浜嬩欢
-// table.on('sort(locMast)', function (obj) {
-// var searchData = {};
-// $.each($('#search-box [name]').serializeArray(), function() {
-// searchData[this.name] = this.value;
-// });
-// searchData['orderByField'] = obj.field;
-// searchData['orderByType'] = obj.type;
-// tableIns.reload({
-// where: searchData,
-// page: {
-// curr: 1
-// },
-// done: function (res, curr, count) {
-// if (res.code === 403) {
-// top.location.href = baseUrl+"/";
-// }
-// pageCurr=curr;
-// limit();
-// }
-// });
-// });
-//
-// // 鐩戝惉澶村伐鍏锋爮浜嬩欢
-// table.on('toolbar(order)', function (obj) {
-// var checkStatus = table.checkStatus(obj.config.id);
-// switch(obj.event) {
-// case 'addData':
-// layer.open({
-// type: 2,
-// title: '鏂板',
-// maxmin: true,
-// area: [top.detailWidth, top.detailHeight],
-// content: 'order_detail.html',
-// success: function(layero, index){
-// layer.getChildFrame('#data-detail-submit-edit', index).hide();
-// clearFormVal(layer.getChildFrame('#detail', index));
-// layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-// }
-// });
-// break;
-// case 'deleteData':
-// var data = checkStatus.data;
-// if (data.length === 0){
-// layer.msg('璇烽�夋嫨鏁版嵁');
-// } else {
-// layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
-// $.ajax({
-// url: baseUrl+"/order/delete/auth",
-// headers: {'token': localStorage.getItem('token')},
-// data: {param: JSON.stringify(data)},
-// method: 'POST',
-// traditional:true,
-// success: function (res) {
-// if (res.code === 200){
-// layer.closeAll();
-// tableReload(false);
-// } else if (res.code === 403){
-// top.location.href = baseUrl+"/";
-// } else {
-// layer.msg(res.msg)
-// }
-// }
-// })
-// });
-// }
-// break;
-// case 'exportData':
-// layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
-// var titles=[];
-// var fields=[];
-// obj.config.cols[0].map(function (col) {
-// if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
-// titles.push(col.title);
-// fields.push(col.field);
-// }
-// });
-// var exportData = {};
-// $.each($('#search-box [name]').serializeArray(), function() {
-// exportData[this.name] = this.value;
-// });
-// var param = {
-// 'order': exportData,
-// 'fields': fields
-// };
-// $.ajax({
-// url: baseUrl+"/order/export/auth",
-// headers: {'token': localStorage.getItem('token')},
-// data: JSON.stringify(param),
-// dataType:'json',
-// contentType:'application/json;charset=UTF-8',
-// method: 'POST',
-// success: function (res) {
-// layer.closeAll();
-// if (res.code === 200) {
-// table.exportFile(titles,res.data,'xls');
-// } else if (res.code === 403) {
-// top.location.href = baseUrl+"/";
-// } else {
-// layer.msg(res.msg)
-// }
-// }
-// });
-// });
-// break;
-// }
-// });
-//
-// // 鐩戝惉琛屽伐鍏蜂簨浠�
-// table.on('tool(order)', function(obj){
-// var data = obj.data;
-// switch (obj.event) {
-// // 璇︽儏
-// case 'detail':
-// layer.open({
-// type: 2,
-// title: '璇︽儏',
-// maxmin: true,
-// area: [top.detailWidth, top.detailHeight],
-// shadeClose: true,
-// content: 'order_detail.html',
-// success: function(layero, index){
-// setFormVal(layer.getChildFrame('#detail', index), data, true);
-// top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
-// layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
-// layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-// layero.find('iframe')[0].contentWindow.layui.form.render('select');
-// layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
-// }
-// });
-// break;
-// // 缂栬緫
-// case 'edit':
-// layer.open({
-// type: 2,
-// title: '淇敼',
-// maxmin: true,
-// area: [top.detailWidth, top.detailHeight],
-// content: 'order_detail.html',
-// success: function(layero, index){
-// layer.getChildFrame('#data-detail-submit-save', index).hide();
-// setFormVal(layer.getChildFrame('#detail', index), data, false);
-// top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
-// top.convertDisabled(layer.getChildFrame('#id', index), true);
-// layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
-// layero.find('iframe')[0].contentWindow.layui.form.render('select');
-// layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
-// }
-// });
-// break;
-//
-//
-// }
-// });
-//
-// // 鏁版嵁淇濆瓨鍔ㄤ綔
-// form.on('submit(save)', function () {
-// if (banMsg != null){
-// layer.msg(banMsg);
-// return;
-// }
-// method("add");
-// });
-//
-// // 鏁版嵁淇敼鍔ㄤ綔
-// form.on('submit(edit)', function () {
-// method("update")
-// });
-//
-// function method(name){
-// var index = layer.load(1, {
-// shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
-// });
-// var data = {
-// // id: $('#id').val(),
-// id: $('#id').val(),
-// uuid: $('#uuid').val(),
-// orderNo: $('#orderNo').val(),
-// orderTime: $('#orderTime').val(),
-// docType: $('#docType').val(),
-// itemId: $('#itemId').val(),
-// allotItemId: $('#allotItemId').val(),
-// defNumber: $('#defNumber').val(),
-// number: $('#number').val(),
-// cstmr: $('#cstmr').val(),
-// cstmrName: $('#cstmrName').val(),
-// tel: $('#tel').val(),
-// operMemb: $('#operMemb').val(),
-// totalFee: $('#totalFee').val(),
-// discount: $('#discount').val(),
-// discountFee: $('#discountFee').val(),
-// otherFee: $('#otherFee').val(),
-// actFee: $('#actFee').val(),
-// payType: $('#payType').val(),
-// salesman: $('#salesman').val(),
-// accountDay: $('#accountDay').val(),
-// postFeeType: $('#postFeeType').val(),
-// postFee: $('#postFee').val(),
-// payTime: top.strToDate($('#payTime\\$').val()),
-// sendTime: top.strToDate($('#sendTime\\$').val()),
-// shipName: $('#shipName').val(),
-// shipCode: $('#shipCode').val(),
-// settle: $('#settle').val(),
-// status: $('#status').val(),
-// createBy: $('#createBy').val(),
-// createTime: top.strToDate($('#createTime\\$').val()),
-// updateBy: $('#updateBy').val(),
-// updateTime: top.strToDate($('#updateTime\\$').val()),
-// memo: $('#memo').val(),
-//
-// };
-// $.ajax({
-// url: baseUrl+"/order/"+name+"/auth",
-// headers: {'token': localStorage.getItem('token')},
-// data: top.reObject(data),
-// method: 'POST',
-// success: function (res) {
-// if (res.code === 200){
-// parent.layer.closeAll();
-// parent.$(".layui-laypage-btn")[0].click();
-// $("#data-detail :input").each(function () {
-// $(this).val("");
-// });
-// } else if (res.code === 403){
-// top.location.href = baseUrl+"/";
-// }else {
-// layer.msg(res.msg)
-// }
-// layer.close(index);
-// }
-// })
-// }
-//
-// // 澶嶉�夋浜嬩欢
-// form.on('checkbox(detailCheckbox)', function (data) {
-// var el = data.elem;
-// if (el.checked) {
-// $(el).val('Y');
-// } else {
-// $(el).val('N');
-// }
-// });
-//
// // 鎼滅储鏍忔悳绱簨浠�
// form.on('submit(search)', function (data) {
// pageCurr = 1;
@@ -721,76 +502,7 @@
where: searchData,
page: {
curr: pageCurr
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- if (res.data.length === 0 && count !== 0) {
- tableIns.reload({
- where: searchData,
- page: {
- curr: pageCurr-1
- }
- });
- pageCurr -= 1;
- }
- limit(child);
}
});
}
-function setFormVal(el, data, showImg) {
- for (var val in data) {
- var find = el.find(":input[id='" + val + "']");
- if (find[0]!=null){
- if (find[0].type === 'checkbox'){
- if (data[val]==='Y'){
- find.attr("checked","checked");
- find.val('Y');
- } else {
- find.remove("checked");
- find.val('N');
- }
- continue;
- }
- }
- find.val(data[val]);
- if (showImg){
- var next = find.next();
- if (next.get(0)){
- if (next.get(0).localName === "img") {
- find.hide();
- next.attr("src", data[val]);
- next.show();
- }
- }
- }
- }
-}
-
-function clearFormVal(el) {
- $(':input', el)
- .val('')
- .removeAttr('checked')
- .removeAttr('selected');
-}
-
-function detailScreen(index) {
- var detail = layer.getChildFrame('#data-detail', index);
- var height = detail.height()+60;
- if (height > ($(window).height()*0.9)) {
- height = ($(window).height()*0.8);
- }
- layer.style(index, {
-// top: (($(window).height()-height)/3)+"px",
- height: height+'px'
- });
-}
-
-$('body').keydown(function () {
- if (event.keyCode === 13) {
- $("#search").click();
- }
-});
--
Gitblit v1.9.1