From b5749e71ad98172f5a128557ff20386cba2029db Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期三, 28 二月 2024 16:21:59 +0800 Subject: [PATCH] 拣货单管理新增客户名称展示 --- src/main/java/com/zy/asrs/controller/PakoutController.java | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 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..548eab0 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,10 +18,6 @@ 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -286,12 +285,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("鎷h揣鍗曞垹闄ゆ垚鍔�"); + } + + @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("鎷h揣鍗曞垹闄ゆ垚鍔�"); } @RequestMapping(value = "/pakout/export/auth") -- Gitblit v1.9.1