From d14cfd26c49bae091b84e90142b04ec0067c82bb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 25 五月 2023 16:29:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index d8c9fa2..f9e1bd1 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,10 +13,12 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocOwner;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
@@ -33,7 +35,8 @@
@Autowired
private LocDetlService locDetlService;
-
+ @Autowired
+ private LocOwnerService locOwnerService;
@Autowired
private LocDetlMapper locDetlMapper;
@Autowired
@@ -83,7 +86,7 @@
param.remove("modi_time");
}
}
- return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
+ return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class),"2"));
}
@RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
@@ -281,4 +284,33 @@
return R.ok(sum);
}
+
+ @RequestMapping(value = "/turn/over/list/auth")
+ @ManagerAuth
+ public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ if (!Cools.isEmpty(param.get("modi_time"))){
+ String val = String.valueOf(param.get("modi_time"));
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ param.put("startTime", DateUtils.convert(dates[0]));
+ param.put("endTime", DateUtils.convert(dates[1]));
+ param.remove("modi_time");
+ }
+ }
+ if (!Cools.isEmpty(param.get("owner"))){
+ List<LocOwner> locOwners = locOwnerService.selectList(new EntityWrapper<LocOwner>().eq("owner", param.get("owner")));
+ if (Cools.isEmpty(locOwners) || locOwners.size()>1){
+ return R.error();
+ }else {
+ param.remove("owner");
+ param.put("owner", locOwners.get(0).getId());
+ }
+ }
+
+ return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class),"1"));
+ }
+
+
}
--
Gitblit v1.9.1