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/OrderTypeController.java | 226 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 121 insertions(+), 105 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderTypeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderTypeController.java
index 9f71240..20052da 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderTypeController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderTypeController.java
@@ -1,105 +1,121 @@
-package com.zy.asrs.wms.asrs.controller;
-
-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.OrderType;
-import com.zy.asrs.wms.asrs.service.OrderTypeService;
-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.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api")
-public class OrderTypeController extends BaseController {
-
- @Autowired
- private OrderTypeService orderTypeService;
-
- @PreAuthorize("hasAuthority('asrs:orderType:list')")
- @PostMapping("/orderType/page")
- public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<OrderType, BaseParam> pageParam = new PageParam<>(baseParam, OrderType.class);
- return R.ok().add(orderTypeService.page(pageParam, pageParam.buildWrapper(true)));
- }
-
- @PreAuthorize("hasAuthority('asrs:orderType:list')")
- @PostMapping("/orderType/list")
- public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(orderTypeService.list());
- }
-
- @PreAuthorize("hasAuthority('asrs:orderType:list')")
- @GetMapping("/orderType/{id}")
- public R get(@PathVariable("id") Long id) {
- return R.ok().add(orderTypeService.getById(id));
- }
-
- @PreAuthorize("hasAuthority('asrs:orderType:save')")
- @OperationLog("娣诲姞鍗曟嵁绫诲瀷")
- @PostMapping("/orderType/save")
- public R save(@RequestBody OrderType orderType) {
- if (!orderTypeService.save(orderType)) {
- return R.error("娣诲姞澶辫触");
- }
- return R.ok("娣诲姞鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:orderType:update')")
- @OperationLog("淇敼鍗曟嵁绫诲瀷")
- @PostMapping("/orderType/update")
- public R update(@RequestBody OrderType orderType) {
- if (!orderTypeService.updateById(orderType)) {
- return R.error("淇敼澶辫触");
- }
- return R.ok("淇敼鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:orderType:remove')")
- @OperationLog("鍒犻櫎鍗曟嵁绫诲瀷")
- @PostMapping("/orderType/remove/{ids}")
- public R remove(@PathVariable Long[] ids) {
- if (!orderTypeService.removeByIds(Arrays.asList(ids))) {
- return R.error("鍒犻櫎澶辫触");
- }
- return R.ok("鍒犻櫎鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:orderType:list')")
- @PostMapping("/orderType/query")
- public R query(@RequestParam(required = false) String condition, @RequestParam(required = false) Integer type) {
- List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<OrderType> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(OrderType::getName, condition);
- }
- if (!Cools.isEmpty(type)) {
- wrapper.eq(OrderType::getType, type);
- }
- orderTypeService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getName()))
- );
- return R.ok().add(vos);
- }
-
- @PreAuthorize("hasAuthority('asrs:orderType:list')")
- @PostMapping("/orderType/export")
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(orderTypeService.list(), OrderType.class), response);
- }
-
-}
+package com.zy.asrs.wms.asrs.controller;
+
+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.CacheData;
+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.OrderType;
+import com.zy.asrs.wms.asrs.service.OrderTypeService;
+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 OrderTypeController extends BaseController {
+
+ @Autowired
+ private OrderTypeService orderTypeService;
+
+ @PreAuthorize("hasAuthority('asrs:orderType:list')")
+ @PostMapping("/orderType/page")
+ @CacheData(tableName = {"man_order_type"})
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderType, BaseParam> pageParam = new PageParam<>(baseParam, OrderType.class);
+ return R.ok().add(orderTypeService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderType:list')")
+ @PostMapping("/orderType/list")
+ @CacheData(tableName = {"man_order_type"})
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(orderTypeService.list());
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderType:list')")
+ @GetMapping("/orderType/{id}")
+ @CacheData(tableName = {"man_order_type"})
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(orderTypeService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderType:save')")
+ @OperationLog("娣诲姞鍗曟嵁绫诲瀷")
+ @PostMapping("/orderType/save")
+ public R save(@RequestBody OrderType orderType) {
+ if (!orderTypeService.save(orderType)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderType:update')")
+ @OperationLog("淇敼鍗曟嵁绫诲瀷")
+ @PostMapping("/orderType/update")
+ public R update(@RequestBody OrderType orderType) {
+ if (!orderTypeService.updateById(orderType)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderType:remove')")
+ @OperationLog("鍒犻櫎鍗曟嵁绫诲瀷")
+ @PostMapping("/orderType/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!orderTypeService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderType:list')")
+ @PostMapping("/orderType/query")
+ public R query(@RequestParam(required = false) String condition, @RequestParam(required = false) Integer type) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<OrderType> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(OrderType::getName, condition);
+ }
+ if (!Cools.isEmpty(type)) {
+ wrapper.eq(OrderType::getType, type);
+ }
+ orderTypeService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+
+// @PreAuthorize("hasAuthority('asrs:orderType:list')")
+// @PostMapping("/orderType/all/list")
+// public R query(@RequestBody HashMap<String, Object> params) {
+// List<KeyValVo> vos = new ArrayList<>();
+// List<Integer> types = (List<Integer>) params.get("type");
+// String condition = (String) params.get("condition");
+// List<OrderType> orderTypes = orderTypeService.list(new LambdaQueryWrapper<OrderType>().like(!Cools.isEmpty(condition), OrderType::getName, condition).in(!types.isEmpty(), OrderType::getType, types));
+// orderTypes.forEach(item -> {
+// vos.add(new KeyValVo(item.getId(), item.getName()));
+// });
+//
+// return R.ok().add(vos);
+// }
+
+ @PreAuthorize("hasAuthority('asrs:orderType:list')")
+ @PostMapping("/orderType/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(orderTypeService.list(), OrderType.class), response);
+ }
+
+}
--
Gitblit v1.9.1