From 248f0106cb099a5d6c21b9b7bd648cd0b61a3db0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 28 六月 2023 10:13:09 +0800
Subject: [PATCH] #订单出库批量出库优化
---
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index f747394..d87a31c 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -1,14 +1,18 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.ManLocDetl;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -51,7 +55,8 @@
param.remove("update_time");
}
}
- return R.ok(manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class)));
+ Page<ManLocDetl> page = manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class));
+ return R.ok(page);
}
@@ -68,5 +73,44 @@
return R.ok(outPage);
}
+ @RequestMapping("/manLocDetl/adjust/start")
+ @ManagerAuth(memo = "搴撳瓨璋冩暣")
+ public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
+ manLocDetlService.adjustLocDetl(param, getUserId(),getUser());
+ return R.ok("搴撳瓨璋冩暣鎴愬姛");
+ }
+
+ @RequestMapping(value = "/manLocDetl/asrsAndSaas/list")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+
+ Page<ManLocDetl> manLocDetlPage = toPage(curr, limit, param, ManLocDetl.class);
+ Page<ManLocDetl> all = manLocDetlService.selectAllPage(manLocDetlPage);
+ return R.ok().add(all);
+ }
+ 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)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ if (entry.getKey().equals("locNo")) {
+ wrapper.eq("loc_no", String.valueOf(entry.getValue()));
+ } else {
+ wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ }
+ }
+ }
+ }
+
+
+
}
--
Gitblit v1.9.1