From a4a9b52810e925fdd0eb3ba0cf800f8d1528dd82 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 14 四月 2021 08:32:59 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 12 +++---
src/main/webapp/static/js/order/order.js | 101 +++++++++++++-------------------------------------
2 files changed, 32 insertions(+), 81 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 33dd07f..b1100d0 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -36,7 +36,7 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private CustOrderService custOrderService;
+ private OrderService orderService;
@RequestMapping("/stock/pakin")
@ManagerAuth(memo = "鍏ュ簱")
@@ -125,14 +125,14 @@
}
@RequestMapping("/orderNo/init")
- @ManagerAuth(memo = "鐢熸垚閿�鍞鍗曠紪鍙�")
+ @ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
public R initOrderNo() {
long nextId = snowflakeIdWorker.nextId();
- String number = "PR-" + String.valueOf(nextId).substring(0, 15);
- if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", number)) > 0) {
- return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇峰啀鐢熸垚涓�娆�");
+ String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
+ if (orderService.selectByOrderNo(orderNo) != null) {
+ return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
}
- return R.ok().add(number);
+ return R.ok().add(orderNo);
}
@RequestMapping("/order/init")
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index c30bcf6..91b49bb 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -59,13 +59,17 @@
if (obj.event === 'add') { // 娣诲姞
showEditModel();
} else if (obj.event === 'edit') { // 淇敼
- showEditModel(selObj.data, selObj);
+ if (selObj == null) {
+ return;
+ }
+ showEditModel(selObj.data);
} else if (obj.event === 'del') { // 鍒犻櫎
doDel(selObj);
}
});
/* 鐩戝惉琛屽崟鍑讳簨浠� */
+ var selObj;
table.on('row(docTypeTable)', function (obj) {
selObj = obj;
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
@@ -73,7 +77,7 @@
});
/* 鏄剧ず琛ㄥ崟寮圭獥 */
- function showEditModel(mData, obj) {
+ function showEditModel(mData) {
admin.open({
type: 1,
title: (mData ? '淇敼' : '娣诲姞') + '鍗曟嵁绫诲瀷',
@@ -91,6 +95,7 @@
method: 'POST',
success: function (res) {
layer.close(loadIndex);
+ selObj = null;
if (res.code === 200){
layer.close(dIndex);
layer.msg(res.msg, {icon: 1});
@@ -153,9 +158,9 @@
cols: [[
{type: 'checkbox'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
+ ,{field: 'docType$', align: 'center',title: '绫诲埆', templet: '#docTypeTpl', width: 100}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', minWidth: 200}
,{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'}
- ,{field: 'docType$', align: 'center',title: '鍗曟嵁绫诲瀷', templet: '#docTypeTpl', width: 100}
,{field: 'itemName', align: 'center',title: '椤圭洰'}
,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿', hide: true}
,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�', hide: true}
@@ -215,6 +220,23 @@
return false;
});
+ /* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
+ table.on('toolbar(orderTable)', function (obj) {
+ if (obj.event === 'add') { // 娣诲姞
+ right();
+ } else if (obj.event === 'del') { // 鍒犻櫎
+ var checkRows = table.checkStatus('orderTable');
+ if (checkRows.data.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkRows.data.map(function (d) {
+ return d.id;
+ });
+ doDelOrder({ids: ids});
+ }
+ });
+
/* 琛ㄦ牸2宸ュ叿鏉＄偣鍑讳簨浠� */
table.on('tool(orderTable)', function (obj) {
var data = obj.data;
@@ -232,7 +254,6 @@
method: 'POST',
success: function (res) {
layer.close(loadIndex);
- // 鎴愬姛
if (res.code === 200){
layer.open({
type: 1
@@ -289,14 +310,10 @@
break;
// 鎵撳嵃
case 'print':
- layer.confirm('寮�濮嬫墦鍗�' +data.number + ' 鎷ｈ揣鍗曪紵', {shadeClose: true}, function(){
+ layer.confirm('寮�濮嬫墦鍗�' +data.orderNo + ' 鎷ｈ揣鍗曪紵', {shadeClose: true}, function(){
layer.closeAll();
printPakouts(data.orderNo);
})
- break;
- // 淇敼
- case 'edit':
- showEditModel2(obj.data);
break;
// 鍒犻櫎
case 'del':
@@ -306,53 +323,6 @@
}
});
-
- /* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
- table.on('toolbar(orderTable)', function (obj) {
- if (obj.event === 'add') { // 娣诲姞
- // showEditModel2();
- right();
- } else if (obj.event === 'del') { // 鍒犻櫎
- var checkRows = table.checkStatus('orderTable');
- if (checkRows.data.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- var ids = checkRows.data.map(function (d) {
- return d.id;
- });
- doDelOrder({ids: ids});
- }
- });
-
- /* 鏄剧ず琛ㄥ崟寮圭獥2 */
- function showEditModel2(mData) {
- admin.open({
- type: 1,
- title: (mData ? '淇敼' : '娣诲姞') + '鏁版嵁瀛楀吀椤�',
- content: $('#dictDataEditDialog').html(),
- success: function (layero, dIndex) {
- // 鍥炴樉琛ㄥ崟鏁版嵁
- form.val('dictDataEditForm', mData);
- // 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(dictDataEditSubmit)', function (data) {
- data.field.dictId = selObj.data.dictId;
- var loadIndex = layer.load(2);
- $.get(mData ? '../../json/ok.json' : '../../json/ok.json', data.field, function (res) {
- layer.close(loadIndex);
- if (200 === res.code) {
- layer.close(dIndex);
- layer.msg(res.msg, {icon: 1});
- insTb2.reload({page: {curr: 1}});
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }, 'json');
- return false;
- });
- }
- });
- }
/* 鍒犻櫎璁㈠崟 */
function doDelOrder(obj) {
@@ -383,7 +353,6 @@
});
}
-
// 鐢熸垚鎷ｈ揣鍗�
function stockOut(orderNo) {
layer.closeAll();
@@ -404,19 +373,6 @@
}, function() {
layer.closeAll();
printPakouts(orderNo);
- }
- )
- // 缂烘枡
- } 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){
@@ -534,11 +490,6 @@
}
});
}
-
-// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
- parent.layer.closeAll();
-});
function tableReload(child) {
var searchData = {};
--
Gitblit v1.9.1