From 029ffbf20db7196d4f460bc741fd5f36a80689ae Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 15 一月 2026 19:55:45 +0800
Subject: [PATCH] 空板回库称重再校验
---
src/main/java/com/zy/asrs/controller/LocAroundBindController.java | 122 ++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocAroundBindController.java b/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
index e870bec..d07f384 100644
--- a/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
+++ b/src/main/java/com/zy/asrs/controller/LocAroundBindController.java
@@ -1,17 +1,23 @@
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.LocAroundBind;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.param.InitDeviceLocParams;
+import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.LocAroundBindService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.impl.LocDetlServiceImpl;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +29,10 @@
@Autowired
private LocAroundBindService locAroundBindService;
+ @Autowired
+ private LocMastServiceImpl locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
@RequestMapping(value = "/locAroundBind/{id}/auth")
@ManagerAuth
@@ -32,22 +42,26 @@
@RequestMapping(value = "/locAroundBind/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 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<LocAroundBind> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ allLike(LocAroundBind.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(locAroundBindService.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]));
@@ -60,24 +74,45 @@
@RequestMapping(value = "/locAroundBind/add/auth")
@ManagerAuth
public R add(LocAroundBind locAroundBind) {
+ if (Objects.isNull(locAroundBind)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locAroundBind.getBlocNo()));
+ if (!Objects.isNull(aroundBind)) {
+ return R.error("宸ヤ綅宸茬粦瀹氾紝涓嶈兘閲嶅缁戝畾锛�");
+ }
+
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locAroundBind.getBlocNo()));
+ locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
+ locMast.setDeleted(1);
+ locMast.setFrozen(1);
+
+ if (!locMastService.updateById(locMast)) {
+ return R.error("鍘熷簱绂佺敤澶辫触锛侊紒");
+ }
locAroundBindService.insert(locAroundBind);
return R.ok();
}
- @RequestMapping(value = "/locAroundBind/update/auth")
- @ManagerAuth
- public R update(LocAroundBind locAroundBind){
- if (Cools.isEmpty(locAroundBind) || null==locAroundBind.getId()){
+ @RequestMapping(value = "/locAroundBind/update/auth")
+ @ManagerAuth
+ public R update(LocAroundBind locAroundBind) {
+ if (Cools.isEmpty(locAroundBind) || null == locAroundBind.getId()) {
return R.error();
}
+
+ if (locAroundBind.getLocType().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locAroundBind.getBlocNo()));
+ }
+
locAroundBindService.updateById(locAroundBind);
return R.ok();
}
@RequestMapping(value = "/locAroundBind/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
locAroundBindService.deleteById(id);
}
return R.ok();
@@ -85,7 +120,7 @@
@RequestMapping(value = "/locAroundBind/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<LocAroundBind> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("locAroundBind"));
@@ -101,7 +136,7 @@
wrapper.like("id", condition);
Page<LocAroundBind> page = locAroundBindService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocAroundBind locAroundBind : page.getRecords()){
+ for (LocAroundBind locAroundBind : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locAroundBind.getId());
map.put("value", locAroundBind.getId());
@@ -113,11 +148,58 @@
@RequestMapping(value = "/locAroundBind/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<LocAroundBind> wrapper = new EntityWrapper<LocAroundBind>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locAroundBindService.selectOne(wrapper)){
+ Wrapper<LocAroundBind> wrapper = new EntityWrapper<LocAroundBind>()
+ .eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != locAroundBindService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocAroundBind.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
+ /**
+ * 鏈哄彴缁戝畾浣滀笟搴撲綅
+ *
+ * @param
+ * @return
+ */
+ @ManagerAuth
+ @PostMapping(value = "/locAroundBind/bind/init")
+ public R bind(@RequestBody InitDeviceLocParams params) {
+ if (Cools.isEmpty(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(params.getDevNo())) {
+ return R.error("鏈哄彴鍙蜂笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(params.getStartRow())) {
+ return R.error("璧峰鎺掍笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(params.getEndRow())) {
+ return R.error("缁堟鎺掍笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(params.getStartBay())) {
+ return R.error("璧峰鍒椾笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(params.getEndBay())) {
+ return R.error("缁堟鍒椾笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(params.getStartLev())) {
+ return R.error("璧峰灞備笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(params.getEndLev())) {
+ return R.error("缁堟灞備笉鑳戒负绌�");
+ }
+ if (params.getStartRow() > params.getEndRow()) {
+ return R.error("璧峰鎺掍笉鑳藉ぇ浜庣粓姝㈡帓");
+ }
+ if (params.getStartBay() > params.getEndBay()) {
+ return R.error("璧峰鍒椾笉鑳藉ぇ浜庣粓姝㈠垪");
+ }
+ if (params.getStartLev() > params.getEndLev()) {
+ return R.error("璧峰灞備笉鑳藉ぇ浜庣粓姝㈠眰");
+ }
+
+ return locAroundBindService.bindLocs(params);
+ }
+
}
--
Gitblit v1.9.1