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/MatFieldController.java | 218 +++++++++++++++++++++++++++++-------------------------
1 files changed, 116 insertions(+), 102 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldController.java
index cb680b4..35671a5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatFieldController.java
@@ -1,102 +1,116 @@
-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.MatField;
-import com.zy.asrs.wms.asrs.service.MatFieldService;
-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 MatFieldController extends BaseController {
-
- @Autowired
- private MatFieldService matFieldService;
-
- @PreAuthorize("hasAuthority('asrs:matField:list')")
- @PostMapping("/matField/page")
- public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<MatField, BaseParam> pageParam = new PageParam<>(baseParam, MatField.class);
- return R.ok().add(matFieldService.page(pageParam, pageParam.buildWrapper(true)));
- }
-
- @PreAuthorize("hasAuthority('asrs:matField:list')")
- @PostMapping("/matField/list")
- public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(matFieldService.list());
- }
-
- @PreAuthorize("hasAuthority('asrs:matField:list')")
- @GetMapping("/matField/{id}")
- public R get(@PathVariable("id") Long id) {
- return R.ok().add(matFieldService.getById(id));
- }
-
- @PreAuthorize("hasAuthority('asrs:matField:save')")
- @OperationLog("娣诲姞鍟嗗搧灞炴�ф墿灞�")
- @PostMapping("/matField/save")
- public R save(@RequestBody MatField matField) {
- if (!matFieldService.save(matField)) {
- return R.error("娣诲姞澶辫触");
- }
- return R.ok("娣诲姞鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:matField:update')")
- @OperationLog("淇敼鍟嗗搧灞炴�ф墿灞�")
- @PostMapping("/matField/update")
- public R update(@RequestBody MatField matField) {
- if (!matFieldService.updateById(matField)) {
- return R.error("淇敼澶辫触");
- }
- return R.ok("淇敼鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:matField:remove')")
- @OperationLog("鍒犻櫎鍟嗗搧灞炴�ф墿灞�")
- @PostMapping("/matField/remove/{ids}")
- public R remove(@PathVariable Long[] ids) {
- if (!matFieldService.removeByIds(Arrays.asList(ids))) {
- return R.error("鍒犻櫎澶辫触");
- }
- return R.ok("鍒犻櫎鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:matField:list')")
- @PostMapping("/matField/query")
- public R query(@RequestParam(required = false) String condition) {
- List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<MatField> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(MatField::getId, condition);
- }
- matFieldService.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:matField:list')")
- @PostMapping("/matField/export")
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(matFieldService.list(), MatField.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.asrs.service.LocDetlFieldService;
+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.MatField;
+import com.zy.asrs.wms.asrs.service.MatFieldService;
+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 MatFieldController extends BaseController {
+
+ @Autowired
+ private MatFieldService matFieldService;
+
+ @PreAuthorize("hasAuthority('asrs:matField:list')")
+ @PostMapping("/matField/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<MatField, BaseParam> pageParam = new PageParam<>(baseParam, MatField.class);
+ return R.ok().add(matFieldService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:matField:list')")
+ @PostMapping("/matField/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ List<MatField> list = matFieldService.list();
+ if (map.containsKey("unique")) {
+ list = matFieldService.list(new LambdaQueryWrapper<MatField>().eq(MatField::getUnique, map.get("unique")));
+ }
+ if (map.containsKey("fieldType")) {
+ list = matFieldService.list(new LambdaQueryWrapper<MatField>().eq(MatField::getFieldType, map.get("fieldType")));
+ }
+ return R.ok().add(list);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:matField:list')")
+ @GetMapping("/matField/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(matFieldService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:matField:save')")
+ @OperationLog("娣诲姞鍟嗗搧灞炴�ф墿灞�")
+ @PostMapping("/matField/save")
+ public R save(@RequestBody MatField matField) {
+ if (!matFieldService.save(matField)) {
+ return R.error("娣诲姞澶辫触");
+ }
+
+ matFieldService.createView();//鏇存柊瑙嗗浘
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:matField:update')")
+ @OperationLog("淇敼鍟嗗搧灞炴�ф墿灞�")
+ @PostMapping("/matField/update")
+ public R update(@RequestBody MatField matField) {
+ if (!matFieldService.updateById(matField)) {
+ return R.error("淇敼澶辫触");
+ }
+
+ matFieldService.createView();//鏇存柊瑙嗗浘
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:matField:remove')")
+ @OperationLog("鍒犻櫎鍟嗗搧灞炴�ф墿灞�")
+ @PostMapping("/matField/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!matFieldService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+
+ matFieldService.createView();//鏇存柊瑙嗗浘
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:matField:list')")
+ @PostMapping("/matField/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<MatField> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(MatField::getId, condition);
+ }
+ matFieldService.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:matField:list')")
+ @PostMapping("/matField/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(matFieldService.list(), MatField.class), response);
+ }
+
+}
--
Gitblit v1.9.1