From 469d41fe09ceec3dc5259d01a4060aac1448e09f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 03 九月 2025 09:59:34 +0800
Subject: [PATCH] 完善订单组托可用数据显示功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
index cd49b75..8c664ac 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.common.utils.WaitPakingExcelListener;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.WaitPakin;
+import com.zy.asrs.common.wms.entity.WaitPakinLog;
import com.zy.asrs.common.wms.entity.WrkMast;
import com.zy.asrs.common.wms.service.OrderDetlService;
import com.zy.asrs.common.wms.service.WaitPakinService;
@@ -67,9 +68,6 @@
@RequestParam Map<String, Object> param) {
QueryWrapper<WaitPakin> wrapper = new QueryWrapper<>();
wrapper.eq("host_id", getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like("id", condition);
- }
convert(param,wrapper);
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
@@ -219,4 +217,30 @@
return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
}
+ @RequestMapping(value = "/waitPakin/export/auth")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ QueryWrapper<WaitPakin> wrapper = new QueryWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("waitPakin"));
+ String row = "";
+ if (map.get("row") != null) {
+ String chooseRow = (String) map.get("row");
+ if (chooseRow.length() == 1) {
+ row = "0" + chooseRow;
+ map.remove("row");
+ }else {
+ row = chooseRow;
+ map.remove("row");
+ }
+ }
+ convert(map, wrapper);
+// if (!row.equals("")){
+// wrapper.and()
+// .where("loc_no like '" +row +"%'");
+// }
+ List<WaitPakin> list = waitPakinService.list(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
}
--
Gitblit v1.9.1