From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 129 +++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 34 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..ea75a90 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -31,6 +31,7 @@
@Autowired
private LocDetlService locDetlService;
+
@Autowired
private LocDetlMapper locDetlMapper;
@Autowired
@@ -52,7 +53,7 @@
@RequestMapping(value = "/locDetl/auth")
@ManagerAuth
- public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
+ public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos) {
if (!locNos.isEmpty()) {
List<LocDetl> res = new ArrayList<>();
for (String locNo : new HashSet<>(locNos)) {
@@ -68,10 +69,10 @@
@RequestMapping(value = "/stock/out/list/auth")
@ManagerAuth
- public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- if (!Cools.isEmpty(param.get("modi_time"))){
+ public R stockOutList(@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);
@@ -80,17 +81,55 @@
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 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){
+ 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<>();
+ if (param.get("crn_no") != null) {
+ if (param.get("crn_no").toString().equalsIgnoreCase("1")) {
+ wrapper.addFilter("LEFT(loc_no,2)<=4");
+ } else {
+ wrapper.addFilter("LEFT(loc_no,2)>=5 and LEFT(loc_no,2)<=16");
+ }
+ }
+ param.remove("crn_no");
+ convert(param, wrapper);
+ wrapper.orderBy("appe_time", true);
+ 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,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
// String row = "";
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
// if (param.get("row") != null) {
@@ -106,7 +145,9 @@
excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
// if (!row.equals("")){
// wrapper.and()
// .where("loc_no like '" +row +"%'");
@@ -114,10 +155,11 @@
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()){
+
+ 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)){
+ 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]));
@@ -142,10 +184,10 @@
return R.ok();
}
- @RequestMapping(value = "/locDetl/update/auth")
- @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
- public R update(LocDetl locDetl){
- if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+ @RequestMapping(value = "/locDetl/update/auth")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
+ public R update(LocDetl locDetl) {
+ if (Cools.isEmpty(locDetl) || null == locDetl.getMatnr()) {
return R.error();
}
locDetl.setModiUser(getUserId());
@@ -156,12 +198,12 @@
@RequestMapping(value = "/locDetl/delete/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<LocDetl> list = JSONArray.parseArray(param, LocDetl.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (LocDetl entity : list){
+ for (LocDetl entity : list) {
locDetlService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -169,7 +211,7 @@
@RequestMapping(value = "/locDetl/export/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
@@ -179,15 +221,15 @@
if (chooseRow.length() == 1) {
row = "0" + chooseRow;
map.remove("row");
- }else {
+ } else {
row = chooseRow;
map.remove("row");
}
}
convert(map, wrapper);
- if (!row.equals("")){
+ if (!row.equals("")) {
wrapper.and()
- .where("loc_no like '" +row +"%'");
+ .where("loc_no like '" + row + "%'");
}
List<LocDetl> list = locDetlService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
@@ -200,7 +242,7 @@
wrapper.like("matnr", condition);
Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocDetl locDetl : page.getRecords()){
+ for (LocDetl locDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locDetl.getMatnr());
map.put("value", locDetl.getMatnr());
@@ -213,7 +255,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locDetlService.selectOne(wrapper)){
+ if (null != locDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocDetl.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -221,8 +263,8 @@
@RequestMapping(value = "/locDetl/statis/auth")
@ManagerAuth
- public R statis(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
+ public R statis(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
@RequestParam Map<String, Object> param) {
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
for (LocDetl locDetl : stockStatis.getRecords()) {
@@ -259,11 +301,30 @@
/**
* 鑾峰彇搴撳瓨鎬绘暟
+ *
* @return
*/
@RequestMapping("/locDetl/count")
- public R getAllCount(){
- Integer sum = locDetlService.sum();
+ public R getAllCount() {
+ 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