From acad71339e2a131f6ef72c9be912b9e70dd00af0 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 24 三月 2022 15:17:16 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/PickoutDetlController.java | 8 ++
src/main/java/zy/cloud/wms/manager/controller/OrderController.java | 12 ++-
src/main/java/zy/cloud/wms/manager/controller/WaveController.java | 15 ++++
src/main/webapp/views/pickout/pickout.html | 15 +++--
src/main/webapp/static/js/wave/wave.js | 3
src/main/webapp/static/js/order/order.js | 2
src/main/webapp/views/wave/wave.html | 2
src/main/webapp/static/js/pickout/pickout.js | 65 ++++++++++++++-------
src/main/java/zy/cloud/wms/manager/controller/PickoutController.java | 4 +
src/main/webapp/views/order/order.html | 2
10 files changed, 90 insertions(+), 38 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
index f8f15ea..294d5fd 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
@@ -64,11 +64,13 @@
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
- wrapper.orderBy("update_time", false);
- }
- return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+// else {
+// wrapper.orderBy("update_time", false);
+// }
+ wrapper.orderBy("create_time",false);
+ Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderPage);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
diff --git a/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java b/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
index 2ab4c98..a25878a 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
@@ -45,7 +45,9 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(pickoutService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<Pickout> pickoutPage = pickoutService.selectPage(new Page<>(curr, limit), wrapper);
+
+ return R.ok(pickoutPage);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
diff --git a/src/main/java/zy/cloud/wms/manager/controller/PickoutDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/PickoutDetlController.java
index 0a70ffc..bd80f81 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PickoutDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PickoutDetlController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import zy.cloud.wms.manager.entity.Pickout;
import zy.cloud.wms.manager.entity.PickoutDetl;
import zy.cloud.wms.manager.service.PickoutDetlService;
import com.core.annotations.ManagerAuth;
@@ -15,6 +16,7 @@
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import zy.cloud.wms.manager.service.PickoutService;
import java.util.*;
@@ -23,6 +25,8 @@
@Autowired
private PickoutDetlService pickoutDetlService;
+ @Autowired
+ private PickoutService pickoutService;
@RequestMapping(value = "/pickoutDetl/{id}/auth")
@ManagerAuth
@@ -41,7 +45,9 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(pickoutDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<PickoutDetl> pickoutDetlPage = pickoutDetlService.selectPage(new Page<>(curr, limit), wrapper);
+
+ return R.ok(pickoutDetlPage);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WaveController.java b/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
index f8aa130..4181182 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WaveController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import com.core.exception.CoolException;
import zy.cloud.wms.common.model.PickOutDto;
import zy.cloud.wms.manager.entity.Wave;
import zy.cloud.wms.manager.entity.WaveDetl;
@@ -90,10 +91,22 @@
@RequestMapping(value = "/wave/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
+ /**
+ * 鎺х涓庡垵濮嬪寲
+ */
HashSet<String> orders = new HashSet<>();
for (Long id : ids){
- List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
+ Wave wave = waveService.selectOne(new EntityWrapper<Wave>()
+ .eq("id", id));
+ if (Cools.isEmpty(wave)) {
+ throw new CoolException("鎵句笉鍒拌娉㈡");
+ }
+ if (wave.getStatus() != 0){
+ throw new CoolException("浠呮敮鎸佹挙閿�'寰呭鐞�'鐘舵�佺殑璁㈠崟");
+ }
+ List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
.eq("wave_id", id));
+
for (WaveDetl waveDetl : waveDetls) {
String orderNos = waveDetl.getOrderNos();
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 14e4c5f..eeac82c 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -227,11 +227,13 @@
});
/* 琛ㄦ牸2鎼滅储 */
form.on('submit(orderTbSearch)', function (data) {
+
insTb2.reload({where: data.field, page: {curr: 1}});
return false;
});
/* 琛ㄦ牸2閲嶇疆 */
form.on('submit(orderTbReset)', function (data) {
+ $("#orderNo").val("");
insTb2.reload({where: null,page: {curr: 1}});
return false;
});
diff --git a/src/main/webapp/static/js/pickout/pickout.js b/src/main/webapp/static/js/pickout/pickout.js
index 316ce54..95be0cb 100644
--- a/src/main/webapp/static/js/pickout/pickout.js
+++ b/src/main/webapp/static/js/pickout/pickout.js
@@ -1,4 +1,5 @@
var pageCurr;
+var currPick;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
@@ -57,8 +58,8 @@
table.on('tool(leftTable)', function(obj){
var data = obj.data;
switch (obj.event) {
- case 'complete':
- complete(data);
+ case 'printOrder':
+ printPick(data);
break;
case "del":
var ids = [data.id];
@@ -69,9 +70,11 @@
/* 鐩戝惉琛屽崟鍑讳簨浠� */
var selObj;
table.on('row(leftTable)', function (obj) {
+ currPick = obj.data.id;
selObj = obj;
obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
tableIns.reload({where: {head_id: obj.data.id}, page: {curr: 1}});
+
});
/* 鍒犻櫎 */
@@ -89,14 +92,18 @@
method: 'POST',
success: function (res) {
layer.close(loadIndex);
+
if (res.code === 200){
+
layer.msg(res.msg, {icon: 1});
- tableReload();
+
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
layer.msg(res.msg, {icon: 2});
}
+ leftTB.reload({where: null,page: {curr: 1}});
+ tableIns.reload({where: null,page: {curr: 1}});
}
})
});
@@ -106,6 +113,17 @@
leftTB.reload({where: {wrk_no: data.field.docName}});
return false;
});
+ // 閲嶇疆
+ form.on('submit(leftReset)', function (data) {
+
+ leftTB.reload({where: null,page: {curr: 1}});
+ $("#docName").val("");
+ tableReload(false);
+ });
+
+ function printPick(data){
+
+ }
@@ -174,12 +192,12 @@
limit();
}
});
- /* 琛ㄦ牸2鎼滅储 */
- form.on('submit(rightSearch)', function (data) {
-
- tableIns.reload({where: data.field , page: {curr: 1}});
- return false;
- });
+ // /* 琛ㄦ牸2鎼滅储 */
+ // form.on('submit(rightSearch)', function (data) {
+ //
+ // tableIns.reload({where: data.field , page: {curr: 1}});
+ // return false;
+ // });
// // 鐩戝惉鎺掑簭浜嬩欢
// table.on('sort(pickout)', function (obj) {
// var searchData = {};
@@ -258,18 +276,22 @@
// });
//
//
- // // 鎼滅储
- // form.on('submit(search)', function (data) {
- // pageCurr = 1;
- // tableReload(false);
- // });
- //
- // // 閲嶇疆
- // form.on('submit(reset)', function (data) {
- // pageCurr = 1;
- // clearFormVal($('#search-box'));
- // tableReload(false);
- // });
+ // 鎼滅储
+ form.on('submit(rightSearch)', function (data) {
+ data.field.head_id = currPick;
+ tableIns.reload({
+ where: data.field,
+ page: {curr: 1}
+ });
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+
+ tableIns.reload({where: null,page: {curr: 1}});
+ $("#matnr").val("");
+ tableReload(false);
+ });
//
// 鏃堕棿閫夋嫨鍣�
function layDateRender() {
@@ -297,6 +319,7 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
+
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
diff --git a/src/main/webapp/static/js/wave/wave.js b/src/main/webapp/static/js/wave/wave.js
index d432cd4..ed2eba6 100644
--- a/src/main/webapp/static/js/wave/wave.js
+++ b/src/main/webapp/static/js/wave/wave.js
@@ -201,7 +201,7 @@
function stockOut(mData, data){
console.log(mData);
- layer.confirm('纭畾鐢熸垚璇ユ尝娆＄殑鎷ｈ揣鍗曪紵(涓嶅彲閫�)', {
+ layer.confirm('纭畾鐢熸垚璇ユ尝娆＄殑鎷ｈ揣鍗曪紵', {
skin: 'layui-layer-admin',
shade: .1
}, function (i) {
@@ -216,6 +216,7 @@
success: function (res) {
layer.close(loadIndex);
if (res.code === 200){
+ layer.closeAll();
layer.msg(res.msg, {icon: 1});
tableReload();
} else if (res.code === 403){
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 1a10c8a..dbd3d97 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -87,7 +87,7 @@
<div class="layui-inline">
<label class="layui-form-label">璁㈠崟缂栧彿:</label>
<div class="layui-input-inline">
- <input name="order_no" class="layui-input" placeholder="杈撳叆璁㈠崟缂栧彿"/>
+ <input name="order_no" class="layui-input" id="orderNo" placeholder="杈撳叆璁㈠崟缂栧彿"/>
</div>
</div>
<div class="layui-inline"> 
diff --git a/src/main/webapp/views/pickout/pickout.html b/src/main/webapp/views/pickout/pickout.html
index 5ffc23f..09c1aa3 100644
--- a/src/main/webapp/views/pickout/pickout.html
+++ b/src/main/webapp/views/pickout/pickout.html
@@ -62,18 +62,21 @@
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<!-- 琛ㄦ牸宸ュ叿鏍�1 -->
- <form class="layui-form toolbar">
+ <div class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline" style="max-width: 140px;">
- <input name="docName" class="layui-input" placeholder="璇疯緭鍏ヤ换鍔″彿"/>
+ <input name="docName" id="docName" class="layui-input" placeholder="璇疯緭鍏ヤ换鍔″彿"/>
</div>
<div class="layui-inline">
<button class="layui-btn icon-btn" lay-filter="leftResearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
+ <button class="layui-btn icon-btn" lay-filter="leftReset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
</div>
</div>
- </form>
+ </div>
<!-- 鏁版嵁琛ㄦ牸1 -->
<table id="leftTable" lay-filter="leftTable"></table>
</div>
@@ -83,12 +86,12 @@
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
- <form class="layui-form toolbar">
+ <div class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鍟嗗搧缂栫爜:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input"type="text" placeholder="缂栫爜" autocomplete="off"/>
+ <input name="matnr" id="matnr" class="layui-input"type="text" placeholder="缂栫爜" autocomplete="off"/>
</div>
</div>
<div class="layui-inline"> 
@@ -100,7 +103,7 @@
</button>
</div>
</div>
- </form>
+ </div>
<!-- 鏁版嵁琛ㄦ牸2 -->
<table id="pickout" lay-filter="pickout"></table>
</div>
diff --git a/src/main/webapp/views/wave/wave.html b/src/main/webapp/views/wave/wave.html
index e05449a..701d1a3 100644
--- a/src/main/webapp/views/wave/wave.html
+++ b/src/main/webapp/views/wave/wave.html
@@ -17,7 +17,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="wave_no" placeholder="娉㈡缂栧彿" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
--
Gitblit v1.9.1