From 815a94a56d6c0fe940349de1bcf1a61850d0eddc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 26 十二月 2024 13:49:27 +0800
Subject: [PATCH] #空板出库口替换
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 2f91219..655e6f1 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
+import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -31,6 +32,7 @@
@Autowired
private LocDetlService locDetlService;
+
@Autowired
private LocDetlMapper locDetlMapper;
@Autowired
@@ -80,10 +82,41 @@
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 = "/stock/out/crn/list/auth")
+ @ManagerAuth
+ public R crnStockOutList(@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");
+ }
+ }
+ param.remove("curr");
+ param.remove("limit");
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ wrapper.addFilter("LEFT(loc_no,2)>=1 and LEFT(loc_no,2)<=16");
+// Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ if (locDetlPage.getRecords().size()==0){
+ locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
+ }
+ return R.ok(locDetlPage);
+ }
+
+ @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -106,6 +139,8 @@
excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
+ // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
+ RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
// if (!row.equals("")){
// wrapper.and()
@@ -113,6 +148,7 @@
// }
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()){
@@ -263,7 +299,24 @@
*/
@RequestMapping("/locDetl/count")
public R getAllCount(){
- Integer sum = locDetlService.sum();
+ Double sum = locDetlService.sum();
+ return R.ok(sum);
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @RequestMapping("/locDetl/matnr/count")
+ public R getCount(@RequestBody Map<String, String> param){
+ String matnr = param.get("matnr");
+ Double sum = 0.0;
+ if (Cools.isEmpty(matnr)){
+ sum = locDetlService.sum();
+ }else {
+ sum = locDetlService.getSumAnfme(matnr);
+ }
+
return R.ok(sum);
}
--
Gitblit v1.9.1