From d5449236ef0b3adafb3e4cc872f50479efa0ce7b Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 三月 2025 16:10:29 +0800
Subject: [PATCH] 配置信息

---
 src/main/java/com/zy/asrs/controller/LocDetlController.java |   48 +++++++++++++++++++++++++-----------------------
 1 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 93d4845..6eedbc7 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -35,7 +35,7 @@
 
     @RequestMapping(value = "/locDetl/auth")
     @ManagerAuth
-    public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
+    public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos) {
         if (!locNos.isEmpty()) {
             List<LocDetl> res = new ArrayList<>();
             for (String locNo : new HashSet<>(locNos)) {
@@ -51,25 +51,27 @@
 
     @RequestMapping(value = "/locDetl/list/auth")// /locDetl/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<LocDetl> wrapper = new EntityWrapper<>();
         excludeTrash(param);
         convert(param, wrapper);
         allLike(LocDetl.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(locDetlService.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]));
@@ -94,10 +96,10 @@
         return R.ok();
     }
 
-	@RequestMapping(value = "/locDetl/update/auth")
-	@ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
-    public R update(LocDetl locDetl){
-        if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+    @RequestMapping(value = "/locDetl/update/auth")
+    @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
+    public R update(LocDetl locDetl) {
+        if (Cools.isEmpty(locDetl) || null == locDetl.getMatnr()) {
             return R.error();
         }
         locDetl.setModiUser(getUserId());
@@ -108,12 +110,12 @@
 
     @RequestMapping(value = "/locDetl/delete/auth")
     @ManagerAuth(memo = "搴撲綅鏄庣粏鍒犻櫎")
-    public R delete(@RequestParam String param){
+    public R delete(@RequestParam String param) {
         List<LocDetl> list = JSONArray.parseArray(param, LocDetl.class);
-        if (Cools.isEmpty(list)){
+        if (Cools.isEmpty(list)) {
             return R.error();
         }
-        for (LocDetl entity : list){
+        for (LocDetl entity : list) {
             locDetlService.delete(new EntityWrapper<>(entity));
         }
         return R.ok();
@@ -121,7 +123,7 @@
 
     @RequestMapping(value = "/locDetl/export/auth")
     @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
-    public R export(@RequestBody JSONObject param){
+    public R export(@RequestBody JSONObject param) {
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
         EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
         Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
@@ -131,15 +133,15 @@
             if (chooseRow.length() == 1) {
                 row = "0" + chooseRow;
                 map.remove("row");
-            }else {
+            } else {
                 row = chooseRow;
                 map.remove("row");
             }
         }
         convert(map, wrapper);
-        if (!row.equals("")){
+        if (!row.equals("")) {
             wrapper.and()
-                    .where("loc_no like '" +row +"%'");
+                    .where("loc_no like '" + row + "%'");
         }
         List<LocDetl> list = locDetlService.selectList(wrapper);
         return R.ok(exportSupport(list, fields));
@@ -152,7 +154,7 @@
         wrapper.like("matnr", condition);
         Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
-        for (LocDetl locDetl : page.getRecords()){
+        for (LocDetl locDetl : page.getRecords()) {
             Map<String, Object> map = new HashMap<>();
             map.put("id", locDetl.getMatnr());
             map.put("value", locDetl.getMatnr());

--
Gitblit v1.9.1