From d8f5476af7490d3faf40a7da332155cf06aec5e1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 18:03:16 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/PakoutController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/PakoutController.java b/src/main/java/zy/cloud/wms/manager/controller/PakoutController.java
index f0f93cc..96e6a02 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PakoutController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PakoutController.java
@@ -43,11 +43,17 @@
EntityWrapper<Pakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper
+// .orderBy("wrk_sts", true)
+ .orderBy("update_time", false);
+ }
return R.ok(pakoutService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
@@ -127,4 +133,16 @@
return R.ok();
}
+ @RequestMapping(value = "/pakout/print/auth")
+ @ManagerAuth
+ public R print(@RequestParam String docNumber) {
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber));
+ if (!Cools.isEmpty(pakouts)) {
+ if (pakouts.get(0).getWrkSts() == 1) {
+ pakoutService.stockOutPrint(null, docNumber, getUserId());
+ }
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1