From 83b51a5a0774ea8ecb9a06304af3b956a21307c8 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期六, 08 三月 2025 09:06:55 +0800
Subject: [PATCH] CUT库条码T开头，截取后10位
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java | 266 +++++++++++++++++++++++++++++-----------------------
1 files changed, 149 insertions(+), 117 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
index f53228e..f64066a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
@@ -1,117 +1,149 @@
-package com.zy.asrs.wms.asrs.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.common.annotation.OperationLog;
-import com.zy.asrs.wms.common.domain.BaseParam;
-import com.zy.asrs.wms.common.domain.KeyValVo;
-import com.zy.asrs.wms.common.domain.PageParam;
-import com.zy.asrs.wms.asrs.entity.ShelvesRule;
-import com.zy.asrs.wms.asrs.service.ShelvesRuleService;
-import com.zy.asrs.wms.system.controller.BaseController;
-import com.zy.asrs.wms.utils.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-
-@RestController
-@RequestMapping("/api")
-public class ShelvesRuleController extends BaseController {
-
- @Autowired
- private ShelvesRuleService shelvesRuleService;
-
- @PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
- @PostMapping("/shelvesRule/page")
- public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<ShelvesRule, BaseParam> pageParam = new PageParam<>(baseParam, ShelvesRule.class);
- return R.ok().add(shelvesRuleService.page(pageParam, pageParam.buildWrapper(true)));
- }
-
- @PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
- @PostMapping("/shelvesRule/list")
- public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(shelvesRuleService.list());
- }
-
- @PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
- @GetMapping("/shelvesRule/{id}")
- public R get(@PathVariable("id") Long id) {
- return R.ok().add(shelvesRuleService.getById(id));
- }
-
- @PreAuthorize("hasAuthority('asrs:shelvesRule:save')")
- @OperationLog("娣诲姞涓婃灦瑙勫垯")
- @PostMapping("/shelvesRule/save")
- public R save(@RequestBody HashMap<String, Object> param) {
- if(!param.containsKey("ruleType") || !param.containsKey("laneList")) {
- return R.error("缂哄皯鍙傛暟");
- }
- ShelvesRule shelvesRule = new ShelvesRule();
- shelvesRule.setRuleType(Integer.parseInt(param.get("ruleType").toString()));
- shelvesRule.setLane(JSON.toJSONString(param.get("laneList")));
- if (!shelvesRuleService.save(shelvesRule)) {
- return R.error("娣诲姞澶辫触");
- }
- return R.ok("娣诲姞鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:shelvesRule:update')")
- @OperationLog("淇敼涓婃灦瑙勫垯")
- @PostMapping("/shelvesRule/update")
- public R update(@RequestBody HashMap<String, Object> param) {
- if(!param.containsKey("ruleType") || !param.containsKey("laneList") || !param.containsKey("id")) {
- return R.error("缂哄皯鍙傛暟");
- }
-
- ShelvesRule shelvesRule = shelvesRuleService.getById(param.get("id").toString());
- if (shelvesRule == null) {
- return R.error("涓婃灦瑙勫垯涓嶅瓨鍦�");
- }
-
- shelvesRule.setRuleType(Integer.parseInt(param.get("ruleType").toString()));
- shelvesRule.setLane(JSON.toJSONString(param.get("laneList")));
- if (!shelvesRuleService.updateById(shelvesRule)) {
- return R.error("淇敼澶辫触");
- }
- return R.ok("淇敼鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:shelvesRule:remove')")
- @OperationLog("鍒犻櫎涓婃灦瑙勫垯")
- @PostMapping("/shelvesRule/remove/{ids}")
- public R remove(@PathVariable Long[] ids) {
- if (!shelvesRuleService.removeByIds(Arrays.asList(ids))) {
- return R.error("鍒犻櫎澶辫触");
- }
- return R.ok("鍒犻櫎鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
- @PostMapping("/shelvesRule/query")
- public R query(@RequestParam(required = false) String condition) {
- List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<ShelvesRule> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(ShelvesRule::getId, condition);
- }
- shelvesRuleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getId()))
- );
- return R.ok().add(vos);
- }
-
- @PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
- @PostMapping("/shelvesRule/export")
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(shelvesRuleService.list(), ShelvesRule.class), response);
- }
-
-}
+package com.zy.asrs.wms.asrs.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.ShelvesRuleDetl;
+import com.zy.asrs.wms.asrs.service.ShelvesRuleDetlService;
+import com.zy.asrs.wms.common.annotation.OperationLog;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.KeyValVo;
+import com.zy.asrs.wms.common.domain.PageParam;
+import com.zy.asrs.wms.asrs.entity.ShelvesRule;
+import com.zy.asrs.wms.asrs.service.ShelvesRuleService;
+import com.zy.asrs.wms.system.controller.BaseController;
+import com.zy.asrs.wms.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@RestController
+@RequestMapping("/api")
+public class ShelvesRuleController extends BaseController {
+
+ @Autowired
+ private ShelvesRuleService shelvesRuleService;
+ @Autowired
+ private ShelvesRuleDetlService shelvesRuleDetlService;
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
+ @PostMapping("/shelvesRule/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ShelvesRule, BaseParam> pageParam = new PageParam<>(baseParam, ShelvesRule.class);
+ return R.ok().add(shelvesRuleService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
+ @PostMapping("/shelvesRule/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(shelvesRuleService.list());
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
+ @GetMapping("/shelvesRule/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(shelvesRuleService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRule:save')")
+ @OperationLog("娣诲姞涓婃灦瑙勫垯")
+ @PostMapping("/shelvesRule/save")
+ public R save(@RequestBody HashMap<String, Object> param) {
+ if(!param.containsKey("ruleType") || !param.containsKey("laneList")) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+ ShelvesRule shelvesRule = new ShelvesRule();
+ shelvesRule.setName(param.get("name").toString());
+ shelvesRule.setRuleType(Integer.parseInt(param.get("ruleType").toString()));
+ shelvesRule.setLane(JSON.toJSONString(param.get("laneList")));
+ if (!shelvesRuleService.save(shelvesRule)) {
+ throw new CoolException("娣诲姞澶辫触");
+ }
+
+ List<Integer> detls = JSON.parseArray(JSON.toJSONString(param.get("detls")), Integer.class);
+ for (Integer detlType : detls) {
+ ShelvesRuleDetl shelvesRuleDetl = new ShelvesRuleDetl();
+ shelvesRuleDetl.setRuleId(shelvesRule.getId());
+ shelvesRuleDetl.setDetlType(detlType);
+ if (!shelvesRuleDetlService.save(shelvesRuleDetl)) {
+ throw new CoolException("娣诲姞瑙勫垯鏄庣粏澶辫触");
+ }
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRule:update')")
+ @OperationLog("淇敼涓婃灦瑙勫垯")
+ @PostMapping("/shelvesRule/update")
+ @Transactional
+ public R update(@RequestBody HashMap<String, Object> param) {
+ if(!param.containsKey("ruleType") || !param.containsKey("laneList") || !param.containsKey("id")) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+
+ ShelvesRule shelvesRule = shelvesRuleService.getById(param.get("id").toString());
+ if (shelvesRule == null) {
+ return R.error("涓婃灦瑙勫垯涓嶅瓨鍦�");
+ }
+
+ shelvesRule.setName(param.get("name").toString());
+ shelvesRule.setRuleType(Integer.parseInt(param.get("ruleType").toString()));
+ shelvesRule.setLane(JSON.toJSONString(param.get("laneList")));
+ shelvesRule.setStatus(Integer.parseInt(param.get("status").toString()));
+ if (!shelvesRuleService.updateById(shelvesRule)) {
+ throw new CoolException("淇敼澶辫触");
+ }
+
+ shelvesRuleDetlService.remove(new LambdaQueryWrapper<ShelvesRuleDetl>().eq(ShelvesRuleDetl::getRuleId, shelvesRule.getId()));
+ List<Integer> detls = JSON.parseArray(JSON.toJSONString(param.get("detls")), Integer.class);
+ for (Integer detlType : detls) {
+ ShelvesRuleDetl shelvesRuleDetl = new ShelvesRuleDetl();
+ shelvesRuleDetl.setRuleId(shelvesRule.getId());
+ shelvesRuleDetl.setDetlType(detlType);
+ if (!shelvesRuleDetlService.save(shelvesRuleDetl)) {
+ throw new CoolException("娣诲姞瑙勫垯鏄庣粏澶辫触");
+ }
+ }
+
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRule:remove')")
+ @OperationLog("鍒犻櫎涓婃灦瑙勫垯")
+ @PostMapping("/shelvesRule/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!shelvesRuleService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
+ @PostMapping("/shelvesRule/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<ShelvesRule> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(ShelvesRule::getId, condition);
+ }
+ shelvesRuleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
+ @PostMapping("/shelvesRule/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(shelvesRuleService.list(), ShelvesRule.class), response);
+ }
+
+}
--
Gitblit v1.9.1