From 6004efd6f95e26c718325675adcac6149c21b392 Mon Sep 17 00:00:00 2001
From: zwl <zwl123456>
Date: 星期四, 11 九月 2025 15:19:11 +0800
Subject: [PATCH] U8订单对接完成(需正式账套)
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index eaa6577..fdcee3a 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -12,10 +12,10 @@
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.Mat;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +31,7 @@
@Autowired
private LocDetlService locDetlService;
+
@Autowired
private LocDetlMapper locDetlMapper;
@Autowired
@@ -80,25 +81,21 @@
param.remove("modi_time");
}
}
- return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
+ Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ if (stockOut.getRecords().size()==0){
+ stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
+ }
+ return R.ok(stockOut);
}
- @RequestMapping(value = "/locDetl/list/auth")
+ @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
@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,
- @RequestParam(required = false)Boolean unreason){
- if (unreason) {
-
- return R.ok(locDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<LocDetl>()
- .where(" DATALENGTH( batch ) != 11 or\n" +
- " batch LIKE '%[a-z]%'")));
- }
- param.remove("unreason");
+ @RequestParam Map<String, Object> param){
// String row = "";
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
// if (param.get("row") != null) {
@@ -119,9 +116,9 @@
// wrapper.and()
// .where("loc_no like '" +row +"%'");
// }
-
return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -243,6 +240,15 @@
return R.ok().add(stockStatis);
}
+ @RequestMapping(value = "/locDetl/check/auth")
+ @ManagerAuth
+ public R check(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param) {
+ Page<CheckDetl> stockStatis = locDetlService.getStockCheck(toPage(curr, limit, param, CheckDetl.class));
+ return R.ok().add(stockStatis);
+ }
+
@Autowired
private LocDetlMapper LocDetlMapper;
--
Gitblit v1.9.1