From a1e67a0b1bb0b60f87d2db7db17ec1b093e3b73e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 19 四月 2024 11:04:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PakoutController.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PakoutController.java b/src/main/java/com/zy/asrs/controller/PakoutController.java
index 9be81bd..aa021d7 100644
--- a/src/main/java/com/zy/asrs/controller/PakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/PakoutController.java
@@ -1,11 +1,14 @@
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.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.R;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
@@ -15,11 +18,8 @@
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.PakoutService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -53,6 +53,14 @@
EntityWrapper<Pakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+
+ User user = getUser();
+ if (user.getRoleId() != 2 || user.getRoleId() != 24) {
+ wrapper.eq("create_by", user.getId());
+ }
+
+
+
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(pakoutService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -65,7 +73,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.eq(entry.getKey(), val);
}
}
}
@@ -286,12 +294,25 @@
}
@RequestMapping(value = "/pakout/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- pakoutService.deleteById(id);
+ @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+ public R delete(@RequestParam String docNum){
+ try{
+ pakoutService.deletePakout(docNum);
+ }catch (Exception e){
+ return R.error(e+"");
}
- return R.ok();
+ return R.ok("鎷ｈ揣鍗曞垹闄ゆ垚鍔�");
+ }
+
+ @RequestMapping(value = "/pakout/deleteDetl/auth")
+ @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+ public R deleteDetl(@RequestParam String wrkNo){
+ try{
+ pakoutService.deletePakoutByWrkNo(wrkNo);
+ }catch (Exception e){
+ return R.error(e+"");
+ }
+ return R.ok("鎷ｈ揣鍗曞垹闄ゆ垚鍔�");
}
@RequestMapping(value = "/pakout/export/auth")
--
Gitblit v1.9.1