From d2adac4e369165ec523c23e7ffd19fc5775d43b5 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 11 四月 2022 08:14:14 +0800
Subject: [PATCH] Changes
---
src/main/java/zy/cloud/wms/manager/controller/OrderController.java | 1 +
src/main/webapp/static/js/order/orderResult.js | 3 +--
src/main/java/zy/cloud/wms/manager/controller/PickoutController.java | 6 +++++-
3 files changed, 7 insertions(+), 3 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 b9cebdf..3806cfe 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
@@ -326,6 +326,7 @@
if (Cools.isEmpty(waves)) {
throw new CoolException("鎵句笉鍒拌娉㈡");
}
+
HashSet<String> allOrders = new HashSet<>();
for (Wave wave : waves) {
List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
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 bb59338..ffabf05 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PickoutController.java
@@ -131,7 +131,8 @@
@RequestMapping(value = "/pickout/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<Pickout> wrapper = new EntityWrapper<Pickout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ Wrapper<Pickout> wrapper = new EntityWrapper<Pickout>()
+ .eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != pickoutService.selectOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(Pickout.class, String.valueOf(param.get("key"))));
}
@@ -193,6 +194,8 @@
.eq("id",wave.getId()));
List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
.eq("wave_id", wave.getId()));
+
+
if (Cools.isEmpty(waveDetls)) {
return R.error("鎵句笉鍒板搴旀尝娆℃槑缁�");
}
@@ -206,6 +209,7 @@
orderNos.add(s);
}
}
+
/**
* 寰幆鎵�鏈夋嫞璐у崟鏄庣粏,渚濇鍒嗛厤缁欐墍鏈夊嚭搴撳崟
*/
diff --git a/src/main/webapp/static/js/order/orderResult.js b/src/main/webapp/static/js/order/orderResult.js
index 2716189..82ec595 100644
--- a/src/main/webapp/static/js/order/orderResult.js
+++ b/src/main/webapp/static/js/order/orderResult.js
@@ -170,8 +170,7 @@
limits: [15, 30, 50, 100, 200, 500],
height: 'full-100',
cols: [[
- {type: 'checkbox'}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
+ {field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'matnr', align: 'center',title: '鐗╂枡ID'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'anfme', align: 'center',title: '搴斿嚭搴撻噺', minWidth: 100}
--
Gitblit v1.9.1