From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/asrs/controller/BasSteController.java | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasSteController.java b/src/main/java/com/zy/asrs/controller/BasSteController.java
index 3f2b933..95197ca 100644
--- a/src/main/java/com/zy/asrs/controller/BasSteController.java
+++ b/src/main/java/com/zy/asrs/controller/BasSteController.java
@@ -1,28 +1,34 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasSte;
-import com.zy.asrs.service.BasSteService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasSte;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasSteService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class BasSteController extends BaseController {
@Autowired
private BasSteService basSteService;
+ @Autowired
+ private WrkMastService wrkMastService;
@RequestMapping(value = "/basSte/{id}/auth")
@ManagerAuth
@@ -32,24 +38,26 @@
@RequestMapping(value = "/basSte/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 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) {
EntityWrapper<BasSte> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasSte.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));
+ }
return R.ok(basSteService.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]));
@@ -66,11 +74,15 @@
return R.ok();
}
- @RequestMapping(value = "/basSte/update/auth")
- @ManagerAuth
- public R update(BasSte basSte){
- if (Cools.isEmpty(basSte) || null==basSte.getSteNo()){
+ @RequestMapping(value = "/basSte/update/auth")
+ @ManagerAuth
+ public R update(BasSte basSte) {
+ if (Cools.isEmpty(basSte) || null == basSte.getSteNo()) {
return R.error();
+ }
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
+ if (wrkMasts == null || wrkMasts.isEmpty()) {
+ basSte.setPakMk("N");
}
basSteService.updateById(basSte);
return R.ok();
@@ -78,16 +90,16 @@
@RequestMapping(value = "/basSte/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- basSteService.deleteById(id);
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
+ basSteService.deleteById(id.intValue());
}
return R.ok();
}
@RequestMapping(value = "/basSte/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasSte> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basSte"));
@@ -103,7 +115,7 @@
wrapper.like("ste_no", condition);
Page<BasSte> page = basSteService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasSte basSte : page.getRecords()){
+ for (BasSte basSte : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basSte.getSteNo());
map.put("value", basSte.getSteNo());
@@ -116,7 +128,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasSte> wrapper = new EntityWrapper<BasSte>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basSteService.selectOne(wrapper)){
+ if (null != basSteService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasSte.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1