wms / wms4_zhongputaicang · Commits

Commit 91d12a91ac59506b5b3b07c43c2e4ab41b859638

Authored by pengyongcheng
1 parent 2dd92ddd
develop

操作日志记录增删改操作，不记录查询操作

Inline Side-by-side
Showing 20 changed files with 550 additions and 678 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/controller/AuditController.java
  View file @91d12a9
1 1 package org.jeecg.modules.wms.audit.controller;
2 2  
3   -import java.util.Arrays;
4   -import java.util.List;
5   -import java.util.Map;
6   -import java.util.stream.Collectors;
7   -import java.io.IOException;
8   -import java.io.UnsupportedEncodingException;
9   -import java.net.URLDecoder;
10   -import javax.servlet.http.HttpServletRequest;
11   -import javax.servlet.http.HttpServletResponse;
12   -import org.jeecg.common.api.vo.Result;
13   -import org.jeecg.common.system.query.QueryGenerator;
14   -import org.jeecg.common.util.oConvertUtils;
15   -import org.jeecg.modules.wms.audit.entity.Audit;
16   -import org.jeecg.modules.wms.audit.entity.AuditFlow;
17   -import org.jeecg.modules.wms.audit.service.IAuditService;
18   -
19 3 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
20 4 import com.baomidou.mybatisplus.core.metadata.IPage;
21 5 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  6 +import io.swagger.annotations.Api;
  7 +import io.swagger.annotations.ApiOperation;
22 8 import lombok.extern.slf4j.Slf4j;
23   -
24   -import org.jeecgframework.poi.excel.ExcelImportUtil;
25   -import org.jeecgframework.poi.excel.def.NormalExcelConstants;
26   -import org.jeecgframework.poi.excel.entity.ExportParams;
27   -import org.jeecgframework.poi.excel.entity.ImportParams;
28   -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
  9 +import org.jeecg.common.api.vo.Result;
  10 +import org.jeecg.common.aspect.annotation.AutoLog;
29 11 import org.jeecg.common.system.base.controller.JeecgController;
  12 +import org.jeecg.common.system.query.QueryGenerator;
  13 +import org.jeecg.modules.wms.audit.entity.Audit;
  14 +import org.jeecg.modules.wms.audit.entity.AuditFlow;
  15 +import org.jeecg.modules.wms.audit.service.IAuditService;
30 16 import org.springframework.beans.factory.annotation.Autowired;
31 17 import org.springframework.web.bind.annotation.*;
32   -import org.springframework.web.multipart.MultipartFile;
33   -import org.springframework.web.multipart.MultipartHttpServletRequest;
34 18 import org.springframework.web.servlet.ModelAndView;
35   -import com.alibaba.fastjson.JSON;
36   -import io.swagger.annotations.Api;
37   -import io.swagger.annotations.ApiOperation;
38   -import org.jeecg.common.aspect.annotation.AutoLog;
39 19  
40   - /**
  20 +import javax.servlet.http.HttpServletRequest;
  21 +import javax.servlet.http.HttpServletResponse;
  22 +import java.util.Arrays;
  23 +
  24 +/**
41 25 * @Description: 审核表
42 26 * @Author: jeecg-boot
43   - * @Date: 2023-07-26
  27 + * @Date: 2023-07-26
44 28 * @Version: V1.0
45 29 */
46   -@Api(tags="审核表")
  30 +@Api(tags = "审核表")
47 31 @RestController
48 32 @RequestMapping("/audit/audit")
49 33 @Slf4j
50 34 public class AuditController extends JeecgController<Audit, IAuditService> {
51   - @Autowired
52   - private IAuditService auditService;
53   -
54   - /**
55   - * 分页列表查询
56   - *
57   - * @param audit
58   - * @param pageNo
59   - * @param pageSize
60   - * @param req
61   - * @return
62   - */
63   - //@AutoLog(value = "审核表-分页列表查询")
64   - @ApiOperation(value="审核表-分页列表查询", notes="审核表-分页列表查询")
65   - @GetMapping(value = "/list")
66   - public Result<IPage<Audit>> queryPageList(Audit audit,
67   - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
68   - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
69   - HttpServletRequest req) {
70   - QueryWrapper<Audit> queryWrapper = QueryGenerator.initQueryWrapper(audit, req.getParameterMap());
71   - Page<Audit> page = new Page<Audit>(pageNo, pageSize);
72   - IPage<Audit> pageList = auditService.page(page, queryWrapper);
73   - return Result.OK(pageList);
74   - }
75   -
76   - /**
77   - * 添加
78   - *
79   - * @param audit
80   - * @return
81   - */
82   - @AutoLog(value = "审核表-添加")
83   - @ApiOperation(value="审核表-添加", notes="审核表-添加")
84   - @PostMapping(value = "/add")
85   - public Result<String> add(@RequestBody Audit audit) {
86   - auditService.save(audit);
87   - return Result.OK("添加成功！");
88   - }
89   -
90   - /**
91   - * 编辑
92   - *
93   - * @param audit
94   - * @return
95   - */
96   - @AutoLog(value = "审核表-编辑")
97   - @ApiOperation(value="审核表-编辑", notes="审核表-编辑")
98   - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
99   - public Result<String> edit(@RequestBody Audit audit) {
100   - auditService.updateById(audit);
101   - return Result.OK("编辑成功!");
102   - }
103   -
104   - /**
105   - * 通过id删除
106   - *
107   - * @param id
108   - * @return
109   - */
110   - @AutoLog(value = "审核表-通过id删除")
111   - @ApiOperation(value="审核表-通过id删除", notes="审核表-通过id删除")
112   - @DeleteMapping(value = "/delete")
113   - public Result<String> delete(@RequestParam(name="id",required=true) String id) {
114   - auditService.removeById(id);
115   - return Result.OK("删除成功!");
116   - }
117   -
118   - /**
119   - * 批量删除
120   - *
121   - * @param ids
122   - * @return
123   - */
124   - @AutoLog(value = "审核表-批量删除")
125   - @ApiOperation(value="审核表-批量删除", notes="审核表-批量删除")
126   - @DeleteMapping(value = "/deleteBatch")
127   - public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
128   - this.auditService.removeByIds(Arrays.asList(ids.split(",")));
129   - return Result.OK("批量删除成功!");
130   - }
131   -
132   - /**
133   - * 通过id查询
134   - *
135   - * @param id
136   - * @return
137   - */
138   - //@AutoLog(value = "审核表-通过id查询")
139   - @ApiOperation(value="审核表-通过id查询", notes="审核表-通过id查询")
140   - @GetMapping(value = "/queryById")
141   - public Result<Audit> queryById(@RequestParam(name="id",required=true) String id) {
142   - Audit audit = auditService.getById(id);
143   - if(audit==null) {
144   - return Result.error("未找到对应数据");
145   - }
146   - return Result.OK(audit);
147   - }
  35 + @Autowired
  36 + private IAuditService auditService;
148 37  
149 38 /**
150   - * 导出excel
151   - *
152   - * @param request
153   - * @param audit
154   - */
  39 + * 分页列表查询
  40 + *
  41 + * @param audit
  42 + * @param pageNo
  43 + * @param pageSize
  44 + * @param req
  45 + * @return
  46 + */
  47 + //@AutoLog(value = "审核表-分页列表查询")
  48 + @ApiOperation(value = "审核表-分页列表查询", notes = "审核表-分页列表查询")
  49 + @GetMapping(value = "/list")
  50 + public Result<IPage<Audit>> queryPageList(Audit audit,
  51 + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
  52 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
  53 + HttpServletRequest req) {
  54 + QueryWrapper<Audit> queryWrapper = QueryGenerator.initQueryWrapper(audit, req.getParameterMap());
  55 + Page<Audit> page = new Page<Audit>(pageNo, pageSize);
  56 + IPage<Audit> pageList = auditService.page(page, queryWrapper);
  57 + return Result.OK(pageList);
  58 + }
  59 +
  60 + /**
  61 + * 添加
  62 + *
  63 + * @param audit
  64 + * @return
  65 + */
  66 + @AutoLog(value = "审核表-添加")
  67 + @ApiOperation(value = "审核表-添加", notes = "审核表-添加")
  68 + @PostMapping(value = "/add")
  69 + public Result<String> add(@RequestBody Audit audit) {
  70 + auditService.save(audit);
  71 + return Result.OK("添加成功！");
  72 + }
  73 +
  74 + /**
  75 + * 编辑
  76 + *
  77 + * @param audit
  78 + * @return
  79 + */
  80 + @AutoLog(value = "审核表-编辑")
  81 + @ApiOperation(value = "审核表-编辑", notes = "审核表-编辑")
  82 + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
  83 + public Result<String> edit(@RequestBody Audit audit) {
  84 + auditService.updateById(audit);
  85 + return Result.OK("编辑成功!");
  86 + }
  87 +
  88 + /**
  89 + * 通过id删除
  90 + *
  91 + * @param id
  92 + * @return
  93 + */
  94 + @AutoLog(value = "审核表-通过id删除")
  95 + @ApiOperation(value = "审核表-通过id删除", notes = "审核表-通过id删除")
  96 + @DeleteMapping(value = "/delete")
  97 + public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
  98 + auditService.removeById(id);
  99 + return Result.OK("删除成功!");
  100 + }
  101 +
  102 + /**
  103 + * 批量删除
  104 + *
  105 + * @param ids
  106 + * @return
  107 + */
  108 + @AutoLog(value = "审核表-批量删除")
  109 + @ApiOperation(value = "审核表-批量删除", notes = "审核表-批量删除")
  110 + @DeleteMapping(value = "/deleteBatch")
  111 + public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
  112 + this.auditService.removeByIds(Arrays.asList(ids.split(",")));
  113 + return Result.OK("批量删除成功!");
  114 + }
  115 +
  116 + /**
  117 + * 通过id查询
  118 + *
  119 + * @param id
  120 + * @return
  121 + */
  122 + //@AutoLog(value = "审核表-通过id查询")
  123 + @ApiOperation(value = "审核表-通过id查询", notes = "审核表-通过id查询")
  124 + @GetMapping(value = "/queryById")
  125 + public Result<Audit> queryById(@RequestParam(name = "id", required = true) String id) {
  126 + Audit audit = auditService.getById(id);
  127 + if (audit == null) {
  128 + return Result.error("未找到对应数据");
  129 + }
  130 + return Result.OK(audit);
  131 + }
  132 +
  133 + /**
  134 + * 导出excel
  135 + *
  136 + * @param request
  137 + * @param audit
  138 + */
155 139 @RequestMapping(value = "/exportXls")
156 140 public ModelAndView exportXls(HttpServletRequest request, Audit audit) {
157 141 return super.exportXls(request, audit, Audit.class, "审核表");
158 142 }
159 143  
160 144 /**
161   - * 通过excel导入数据
162   - *
163   - * @param request
164   - * @param response
165   - * @return
166   - */
  145 + * 通过excel导入数据
  146 + *
  147 + * @param request
  148 + * @param response
  149 + * @return
  150 + */
167 151 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
168 152 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
169 153 return super.importExcel(request, response, Audit.class);
170 154 }
171 155  
172   - @ApiOperation(value="提交入库单审核", notes="提交入库单审核")
173   - @GetMapping(value = "/createReceiptAuditFlow")
174   - public Result<Audit> createReceiptAuditFlow(Audit audit) {
175   - return auditService.createReceiptAuditFlow(audit);
176   - }
177   -
178   - @ApiOperation(value="入库单审核", notes="入库单审核")
179   - @GetMapping(value = "/auditReceipt")
180   - public Result<Audit> auditReceipt(Audit audit) {
181   - return auditService.auditReceipt(audit);
182   - }
183   -
184   - @ApiOperation(value="查询审核流程进度", notes="查询审核流程进度")
185   - @GetMapping(value = "/searchAuditFlow")
186   - public AuditFlow searchAuditFlow(Audit audit) {
187   - return auditService.searchAuditFlow(audit);
188   - }
189   -
190   - @ApiOperation(value="提交出库单审核", notes="提交出库单审核")
191   - @GetMapping(value = "/createShipmentAuditFlow")
192   - public Result<Audit> createShipmentAuditFlow(Audit audit) {
193   - return auditService.createShipmentAuditFlow(audit);
194   - }
195   -
196   - @ApiOperation(value="出库单审核", notes="出库单审核")
197   - @GetMapping(value = "/auditShipment")
198   - public Result<Audit> auditShipment(Audit audit) {
199   - return auditService.auditShipment(audit);
200   - }
  156 + @AutoLog(value = "审核表-提交入库单审核", operateType = 2)
  157 + @ApiOperation(value = "提交入库单审核", notes = "提交入库单审核")
  158 + @GetMapping(value = "/createReceiptAuditFlow")
  159 + public Result<Audit> createReceiptAuditFlow(Audit audit) {
  160 + return auditService.createReceiptAuditFlow(audit);
  161 + }
  162 +
  163 + @AutoLog(value = "审核表-入库单审核", operateType = 3)
  164 + @ApiOperation(value = "入库单审核", notes = "入库单审核")
  165 + @GetMapping(value = "/auditReceipt")
  166 + public Result<Audit> auditReceipt(Audit audit) {
  167 + return auditService.auditReceipt(audit);
  168 + }
  169 +
  170 + @ApiOperation(value = "查询审核流程进度", notes = "查询审核流程进度")
  171 + @GetMapping(value = "/searchAuditFlow")
  172 + public AuditFlow searchAuditFlow(Audit audit) {
  173 + return auditService.searchAuditFlow(audit);
  174 + }
201 175  
  176 + @AutoLog(value = "审核表-提交出库单审核", operateType = 2)
  177 + @ApiOperation(value = "提交出库单审核", notes = "提交出库单审核")
  178 + @GetMapping(value = "/createShipmentAuditFlow")
  179 + public Result<Audit> createShipmentAuditFlow(Audit audit) {
  180 + return auditService.createShipmentAuditFlow(audit);
  181 + }
202 182  
  183 + @AutoLog(value = "审核表-出库单审核", operateType = 3)
  184 + @ApiOperation(value = "出库单审核", notes = "出库单审核")
  185 + @GetMapping(value = "/auditShipment")
  186 + public Result<Audit> auditShipment(Audit audit) {
  187 + return auditService.auditShipment(audit);
  188 + }
203 189 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
  View file @91d12a9
... ... @@ -152,16 +152,8 @@ public class ContainerController extends JeecgController&lt;Container, IContainerSe
152 152 return Result.OK("批量删除成功!");
153 153 }
154 154  
155   - /**
156   - * 获取打印数据
157   - *
158   - * @param ids
159   - * @return
160   - */
161   - @AutoLog(value = "容器管理-获取打印数据")
162 155 @ApiOperation(value = "容器管理-获取打印数据", notes = "容器管理-获取打印数据")
163 156 @PostMapping(value = "/getPrintContent")
164   - @ResponseBody
165 157 public Result getPrintContent(@RequestParam(name = "ids", required = true) String ids) {
166 158 List<String> idlist = Arrays.asList(ids.split(","));
167 159 List<Container> containerList = containerService.listByIds(idlist);
... ... @@ -174,10 +166,9 @@ public class ContainerController extends JeecgController&lt;Container, IContainerSe
174 166 * @param ids
175 167 * @return
176 168 */
177   - @AutoLog(value = "容器管理-设置打印次数")
  169 + @AutoLog(value = "容器管理-设置打印次数", operateType = 3)
178 170 @ApiOperation(value = "容器管理-设置打印次数", notes = "容器管理-设置打印次数")
179 171 @PostMapping(value = "/setPrintTimes")
180   - @ResponseBody
181 172 public Result setPrintTimes(@RequestParam(name = "ids", required = true) String ids) {
182 173 List<String> idlist = Arrays.asList(ids.split(","));
183 174 List<Container> containerList = containerService.listByIds(idlist);
... ... @@ -233,13 +224,6 @@ public class ContainerController extends JeecgController&lt;Container, IContainerSe
233 224 return super.importExcel(request, response, Container.class);
234 225 }
235 226  
236   - /**
237   - * 选取空闲的托盘
238   - *
239   - * @param container
240   - * @return
241   - */
242   - @AutoLog(value = "选取空闲的托盘")
243 227 @ApiOperation(value = "库位管理-选取空闲的托盘", notes = "库位管理-选取空闲的托盘")
244 228 @GetMapping(value = "/getEmptyAllContainer")
245 229 public Result getEmptyAllContainer(Container container, HttpServletRequest req) {
... ... @@ -254,7 +238,6 @@ public class ContainerController extends JeecgController&lt;Container, IContainerSe
254 238 * @param container
255 239 * @return
256 240 */
257   - @AutoLog(value = "选取空闲的托盘")
258 241 @ApiOperation(value = "库位管理-选取空闲的托盘", notes = "库位管理-选取空闲的托盘")
259 242 @GetMapping(value = "/getCanUseListContainer")
260 243 public Result getCanUseListContainer(Container container, HttpServletRequest req) {
... ... @@ -263,7 +246,6 @@ public class ContainerController extends JeecgController&lt;Container, IContainerSe
263 246 return Result.OK(containerList);
264 247 }
265 248  
266   - @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
267 249 @PassApiAuthentication
268 250 @GetMapping(value = "/listPrintContent")
269 251 public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
  View file @91d12a9
... ... @@ -166,16 +166,8 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
166 166 return result;
167 167 }
168 168  
169   - /**
170   - * 获取打印数据
171   - *
172   - * @param ids
173   - * @return
174   - */
175   - @AutoLog(value = "库位管理-获取打印数据")
176 169 @ApiOperation(value = "库位管理-获取打印数据", notes = "库位管理-获取打印数据")
177 170 @PostMapping(value = "/getPrintContent")
178   - @ResponseBody
179 171 public Result getPrintContent(@RequestParam(name = "ids", required = true) String ids) {
180 172 List<String> idlist = Arrays.asList(ids.split(","));
181 173 List<Location> locationList = locationService.listByIds(idlist);
... ... @@ -286,13 +278,6 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
286 278 return super.importExcel(request, response, Location.class);
287 279 }
288 280  
289   - /**
290   - * WCS库位信息比较
291   - *
292   - * @param location
293   - * @return
294   - */
295   - @AutoLog(value = "WCS库位信息比较")
296 281 @ApiOperation(value = "库位管理-WCS库位信息比较", notes = "库位管理-WCS库位信息比较")
297 282 @GetMapping(value = "/compareWcsLocation")
298 283 public Result compareWcsLocation(@Validated QueryCompareLocationDto queryCompareLocationDto, HttpServletRequest request) {
... ... @@ -304,7 +289,6 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
304 289 /**
305 290 * WCS库位信息比较
306 291 *
307   - * @param location
308 292 * @return
309 293 */
310 294 @ApiOperation(value = "库位管理-WCS库位任务信息比较", notes = "库位管理-WCS库位任务信息比较")
... ... @@ -329,7 +313,6 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
329 313 return Result.OK(compareContainerTaskDtoPage);
330 314 }
331 315  
332   - @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
333 316 @PassApiAuthentication
334 317 @GetMapping(value = "/listPrintContent")
335 318 public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
  View file @91d12a9
... ... @@ -158,17 +158,10 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
158 158 return super.exportXls(request, material, Material.class, "物料管理");
159 159 }
160 160  
161   - /**
162   - * 获取打印数据
163   - *
164   - * @param ids
165   - * @return
166   - */
167   - @AutoLog(value = "物料管理-获取打印数据")
  161 +
168 162 @ApiOperation(value = "物料管理-获取打印数据", notes = "物料管理-获取打印数据")
169 163 @RequiresPermissions("material:print")
170 164 @PostMapping(value = "/getPrintContent")
171   - @ResponseBody
172 165 public Result getPrintContent(@RequestParam(name = "ids", required = true) String ids) {
173 166 List<String> idlist = Arrays.asList(ids.split(","));
174 167 List<Material> materialList = materialService.listByIds(idlist);
... ... @@ -258,7 +251,6 @@ public class MaterialController extends JeecgController&lt;Material, IMaterialServi
258 251 return Result.OK(searchDomainList);
259 252 }
260 253  
261   - @ApiOperation(value = "物料管理-分页列表查询", notes = "物料管理-分页列表查询")
262 254 @PassApiAuthentication
263 255 @GetMapping(value = "/listPrintContent")
264 256 public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialSn/controller/MaterialSnController.java
  View file @91d12a9
... ... @@ -168,7 +168,6 @@ public class MaterialSnController extends JeecgController&lt;MaterialSn, IMaterialS
168 168 return super.importExcel(request, response, MaterialSn.class);
169 169 }
170 170  
171   - @ApiOperation(value = "容器管理-分页列表查询", notes = "容器管理-分页列表查询")
172 171 @PassApiAuthentication
173 172 @GetMapping(value = "/listPrintContent")
174 173 public JimuReportResult listPrintContent(@RequestParam(name = "ids", required = true) String ids) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/flow/controller/FlowHeaderController.java
  View file @91d12a9
1 1 package org.jeecg.modules.wms.flow.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4   -import org.jeecg.common.system.query.QueryGenerator;
5 4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6 5 import com.baomidou.mybatisplus.core.metadata.IPage;
7 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import io.swagger.annotations.Api;
  8 +import io.swagger.annotations.ApiOperation;
8 9 import lombok.extern.slf4j.Slf4j;
9   -import org.jeecg.common.system.base.controller.JeecgController;
  10 +import org.apache.shiro.SecurityUtils;
10 11 import org.jeecg.common.api.vo.Result;
  12 +import org.jeecg.common.aspect.annotation.AutoLog;
  13 +import org.jeecg.common.system.base.controller.JeecgController;
  14 +import org.jeecg.common.system.query.QueryGenerator;
  15 +import org.jeecg.common.system.vo.LoginUser;
  16 +import org.jeecg.common.util.oConvertUtils;
11 17 import org.jeecg.modules.system.entity.SysUser;
12 18 import org.jeecg.modules.system.service.ISysUserService;
13   -import org.springframework.beans.factory.annotation.Autowired;
14   -import org.springframework.web.bind.annotation.*;
15   -
16   -import javax.annotation.Resource;
17   -import javax.servlet.http.HttpServletRequest;
18   -import javax.servlet.http.HttpServletResponse;
19   -import org.springframework.web.servlet.ModelAndView;
20   -
21   -import java.util.ArrayList;
22   -import java.util.Arrays;
23   -import org.jeecg.common.util.oConvertUtils;
24 19 import org.jeecg.modules.wms.flow.entity.FlowDetail;
25 20 import org.jeecg.modules.wms.flow.entity.FlowHeader;
26   -import org.jeecg.modules.wms.flow.service.IFlowHeaderService;
27 21 import org.jeecg.modules.wms.flow.service.IFlowDetailService;
28   -import io.swagger.annotations.Api;
29   -import io.swagger.annotations.ApiOperation;
30   -import org.jeecg.common.aspect.annotation.AutoLog;
31   -import org.apache.shiro.SecurityUtils;
32   -import org.jeecg.common.system.vo.LoginUser;
  22 +import org.jeecg.modules.wms.flow.service.IFlowHeaderService;
33 23 import org.jeecgframework.poi.excel.ExcelImportUtil;
34 24 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
35 25 import org.jeecgframework.poi.excel.entity.ExportParams;
36 26 import org.jeecgframework.poi.excel.entity.ImportParams;
37 27 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
  28 +import org.springframework.beans.factory.annotation.Autowired;
  29 +import org.springframework.web.bind.annotation.*;
38 30 import org.springframework.web.multipart.MultipartFile;
39 31 import org.springframework.web.multipart.MultipartHttpServletRequest;
  32 +import org.springframework.web.servlet.ModelAndView;
  33 +
  34 +import javax.annotation.Resource;
  35 +import javax.servlet.http.HttpServletRequest;
  36 +import javax.servlet.http.HttpServletResponse;
40 37 import java.io.IOException;
  38 +import java.util.ArrayList;
  39 +import java.util.Arrays;
41 40 import java.util.List;
42 41 import java.util.Map;
43 42 import java.util.stream.Collectors;
44 43  
45   - /**
  44 +/**
46 45 * @Description: 流程头表
47 46 * @Author: jeecg-boot
48   - * @Date: 2023-07-25
  47 + * @Date: 2023-07-25
49 48 * @Version: V1.0
50 49 */
51   -@Api(tags="流程头表")
  50 +@Api(tags = "流程头表")
52 51 @RestController
53 52 @RequestMapping("/flow/flowHeader")
54 53 @Slf4j
55 54 public class FlowHeaderController extends JeecgController<FlowHeader, IFlowHeaderService> {
56 55  
57   - @Autowired
58   - private IFlowHeaderService flowHeaderService;
  56 + @Autowired
  57 + private IFlowHeaderService flowHeaderService;
59 58  
60   - @Autowired
61   - private IFlowDetailService flowDetailService;
  59 + @Autowired
  60 + private IFlowDetailService flowDetailService;
62 61  
63   - @Resource
64   - private ISysUserService iSysUserService;
  62 + @Resource
  63 + private ISysUserService iSysUserService;
65 64  
66 65  
67   - /*---------------------------------主表处理-begin-------------------------------------*/
  66 + /*---------------------------------主表处理-begin-------------------------------------*/
68 67  
69   - /**
70   - * 分页列表查询
71   - * @param flowHeader
72   - * @param pageNo
73   - * @param pageSize
74   - * @param req
75   - * @return
76   - */
77   - //@AutoLog(value = "流程头表-分页列表查询")
78   - @ApiOperation(value="流程头表-分页列表查询", notes="流程头表-分页列表查询")
79   - @GetMapping(value = "/list")
80   - public Result<IPage<FlowHeader>> queryPageList(FlowHeader flowHeader,
81   - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
82   - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
83   - HttpServletRequest req) {
84   - QueryWrapper<FlowHeader> queryWrapper = QueryGenerator.initQueryWrapper(flowHeader, req.getParameterMap());
85   - Page<FlowHeader> page = new Page<FlowHeader>(pageNo, pageSize);
86   - IPage<FlowHeader> pageList = flowHeaderService.page(page, queryWrapper);
87   - return Result.OK(pageList);
88   - }
  68 + /**
  69 + * 分页列表查询
  70 + *
  71 + * @param flowHeader
  72 + * @param pageNo
  73 + * @param pageSize
  74 + * @param req
  75 + * @return
  76 + */
  77 + //@AutoLog(value = "流程头表-分页列表查询")
  78 + @ApiOperation(value = "流程头表-分页列表查询", notes = "流程头表-分页列表查询")
  79 + @GetMapping(value = "/list")
  80 + public Result<IPage<FlowHeader>> queryPageList(FlowHeader flowHeader,
  81 + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
  82 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
  83 + HttpServletRequest req) {
  84 + QueryWrapper<FlowHeader> queryWrapper = QueryGenerator.initQueryWrapper(flowHeader, req.getParameterMap());
  85 + Page<FlowHeader> page = new Page<FlowHeader>(pageNo, pageSize);
  86 + IPage<FlowHeader> pageList = flowHeaderService.page(page, queryWrapper);
  87 + return Result.OK(pageList);
  88 + }
89 89  
90   - /**
91   - * 添加
  90 + /**
  91 + * 添加
  92 + *
92 93 * @param flowHeader
93 94 * @return
94 95 */
95 96 @AutoLog(value = "流程头表-添加")
96   - @ApiOperation(value="流程头表-添加", notes="流程头表-添加")
  97 + @ApiOperation(value = "流程头表-添加", notes = "流程头表-添加")
97 98 @PostMapping(value = "/add")
98 99 public Result<String> add(@RequestBody FlowHeader flowHeader) {
99   - if (flowHeaderService.getFlowHead(flowHeader.getFlowType(),flowHeader.getDocumentType())){
100   - flowHeaderService.save(flowHeader);
101   - return Result.OK("添加成功！");
102   - }else {
103   - return Result.error("不能存在相同的流程!!");
104   - }
  100 + if (flowHeaderService.getFlowHead(flowHeader.getFlowType(), flowHeader.getDocumentType())) {
  101 + flowHeaderService.save(flowHeader);
  102 + return Result.OK("添加成功！");
  103 + } else {
  104 + return Result.error("不能存在相同的流程!!");
  105 + }
105 106  
106 107 }
107 108  
108 109 /**
109   - * 编辑
  110 + * 编辑
  111 + *
110 112 * @param flowHeader
111 113 * @return
112 114 */
113 115 @AutoLog(value = "流程头表-编辑")
114   - @ApiOperation(value="流程头表-编辑", notes="流程头表-编辑")
115   - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
  116 + @ApiOperation(value = "流程头表-编辑", notes = "流程头表-编辑")
  117 + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
116 118 public Result<String> edit(@RequestBody FlowHeader flowHeader) {
117 119 flowHeaderService.updateById(flowHeader);
118 120 return Result.OK("编辑成功!");
... ... @@ -120,32 +122,35 @@ public class FlowHeaderController extends JeecgController&lt;FlowHeader, IFlowHeade
120 122  
121 123 /**
122 124 * 通过id删除
  125 + *
123 126 * @param id
124 127 * @return
125 128 */
126 129 @AutoLog(value = "流程头表-通过id删除")
127   - @ApiOperation(value="流程头表-通过id删除", notes="流程头表-通过id删除")
  130 + @ApiOperation(value = "流程头表-通过id删除", notes = "流程头表-通过id删除")
128 131 @DeleteMapping(value = "/delete")
129   - public Result<String> delete(@RequestParam(name="id",required=true) String id) {
  132 + public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
130 133 flowHeaderService.delMain(id);
131 134 return Result.OK("删除成功!");
132 135 }
133 136  
134 137 /**
135 138 * 批量删除
  139 + *
136 140 * @param ids
137 141 * @return
138 142 */
139 143 @AutoLog(value = "流程头表-批量删除")
140   - @ApiOperation(value="流程头表-批量删除", notes="流程头表-批量删除")
  144 + @ApiOperation(value = "流程头表-批量删除", notes = "流程头表-批量删除")
141 145 @DeleteMapping(value = "/deleteBatch")
142   - public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
  146 + public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
143 147 this.flowHeaderService.delBatchMain(Arrays.asList(ids.split(",")));
144 148 return Result.OK("批量删除成功!");
145 149 }
146 150  
147 151 /**
148 152 * 导出
  153 + *
149 154 * @return
150 155 */
151 156 @RequestMapping(value = "/exportXls")
... ... @@ -155,180 +160,185 @@ public class FlowHeaderController extends JeecgController&lt;FlowHeader, IFlowHeade
155 160  
156 161 /**
157 162 * 导入
  163 + *
158 164 * @return
159 165 */
160 166 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
161 167 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
162 168 return super.importExcel(request, response, FlowHeader.class);
163 169 }
164   - /*---------------------------------主表处理-end-------------------------------------*/
  170 + /*---------------------------------主表处理-end-------------------------------------*/
165 171  
166 172  
167 173 /*--------------------------------子表处理-流程配置明细-begin----------------------------------------------*/
168   - /**
169   - * 通过主表ID查询
170   - * @return
171   - */
172   - //@AutoLog(value = "流程配置明细-通过主表ID查询")
173   - @ApiOperation(value="流程配置明细-通过主表ID查询", notes="流程配置明细-通过主表ID查询")
174   - @GetMapping(value = "/listFlowDetailByMainId")
  174 +
  175 + /**
  176 + * 通过主表ID查询
  177 + *
  178 + * @return
  179 + */
  180 + //@AutoLog(value = "流程配置明细-通过主表ID查询")
  181 + @ApiOperation(value = "流程配置明细-通过主表ID查询", notes = "流程配置明细-通过主表ID查询")
  182 + @GetMapping(value = "/listFlowDetailByMainId")
175 183 public Result<IPage<FlowDetail>> listFlowDetailByMainId(FlowDetail flowDetail,
176   - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
177   - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
178   - HttpServletRequest req) {
  184 + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
  185 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
  186 + HttpServletRequest req) {
179 187 QueryWrapper<FlowDetail> queryWrapper = QueryGenerator.initQueryWrapper(flowDetail, req.getParameterMap());
180 188 Page<FlowDetail> page = new Page<FlowDetail>(pageNo, pageSize);
181 189 IPage<FlowDetail> pageList = flowDetailService.page(page, queryWrapper);
182 190 return Result.OK(pageList);
183 191 }
184 192  
185   - /**
186   - * 添加
187   - * @param flowDetail
188   - * @return
189   - */
190   - @AutoLog(value = "流程配置明细-添加")
191   - @ApiOperation(value="流程配置明细-添加", notes="流程配置明细-添加")
192   - @PostMapping(value = "/addFlowDetail")
193   - public Result<String> addFlowDetail(@RequestBody FlowDetail flowDetail) {
194   - String [] users=flowDetail.getAuditorId().split(",");
195   - //批量新增的时候,按前台选择用户的顺序,生成审核顺序
196   - LambdaQueryWrapper<FlowDetail>lambdaQueryWrapper=new LambdaQueryWrapper<>();
197   - lambdaQueryWrapper.eq(FlowDetail::getHeadId,flowDetail.getHeadId())
198   - .orderByDesc(FlowDetail::getSequence).last("limit 1");
199   - FlowDetail detail=flowDetailService.getOne(lambdaQueryWrapper);
200   - Integer sequence=0;
201   - if (detail!=null){
202   - sequence=detail.getSequence();
203   - }
204   - List<FlowDetail>flowDetailList=new ArrayList<>();
205   - for (int i=0;i<users.length;i++){
206   - sequence++;
207   - FlowDetail flowDetail1=new FlowDetail();
208   - flowDetail1.setHeadId(flowDetail.getHeadId());
209   - flowDetail1.setSequence(sequence);
210   - flowDetail1.setRemark(flowDetail.getRemark());
211   - //查询用户姓名
212   - SysUser user=iSysUserService.getUserByName(users[i]);
213   - flowDetail1.setAuditor(user.getRealname());
214   - flowDetail1.setAuditorId(users[i]);
215   - flowDetailList.add(flowDetail1);
216   - }
217   - flowDetailService.saveBatch(flowDetailList);
218   - return Result.OK("添加成功！");
219   - }
  193 + /**
  194 + * 添加
  195 + *
  196 + * @param flowDetail
  197 + * @return
  198 + */
  199 + @AutoLog(value = "流程配置明细-添加")
  200 + @ApiOperation(value = "流程配置明细-添加", notes = "流程配置明细-添加")
  201 + @PostMapping(value = "/addFlowDetail")
  202 + public Result<String> addFlowDetail(@RequestBody FlowDetail flowDetail) {
  203 + String[] users = flowDetail.getAuditorId().split(",");
  204 + //批量新增的时候,按前台选择用户的顺序,生成审核顺序
  205 + LambdaQueryWrapper<FlowDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
  206 + lambdaQueryWrapper.eq(FlowDetail::getHeadId, flowDetail.getHeadId())
  207 + .orderByDesc(FlowDetail::getSequence).last("limit 1");
  208 + FlowDetail detail = flowDetailService.getOne(lambdaQueryWrapper);
  209 + Integer sequence = 0;
  210 + if (detail != null) {
  211 + sequence = detail.getSequence();
  212 + }
  213 + List<FlowDetail> flowDetailList = new ArrayList<>();
  214 + for (int i = 0; i < users.length; i++) {
  215 + sequence++;
  216 + FlowDetail flowDetail1 = new FlowDetail();
  217 + flowDetail1.setHeadId(flowDetail.getHeadId());
  218 + flowDetail1.setSequence(sequence);
  219 + flowDetail1.setRemark(flowDetail.getRemark());
  220 + //查询用户姓名
  221 + SysUser user = iSysUserService.getUserByName(users[i]);
  222 + flowDetail1.setAuditor(user.getRealname());
  223 + flowDetail1.setAuditorId(users[i]);
  224 + flowDetailList.add(flowDetail1);
  225 + }
  226 + flowDetailService.saveBatch(flowDetailList);
  227 + return Result.OK("添加成功！");
  228 + }
220 229  
221 230 /**
222   - * 编辑
223   - * @param flowDetail
224   - * @return
225   - */
226   - @AutoLog(value = "流程配置明细-编辑")
227   - @ApiOperation(value="流程配置明细-编辑", notes="流程配置明细-编辑")
228   - @RequestMapping(value = "/editFlowDetail", method = {RequestMethod.PUT,RequestMethod.POST})
229   - public Result<String> editFlowDetail(@RequestBody FlowDetail flowDetail) {
230   - flowDetailService.updateById(flowDetail);
231   - return Result.OK("编辑成功!");
232   - }
  231 + * 编辑
  232 + *
  233 + * @param flowDetail
  234 + * @return
  235 + */
  236 + @AutoLog(value = "流程配置明细-编辑")
  237 + @ApiOperation(value = "流程配置明细-编辑", notes = "流程配置明细-编辑")
  238 + @RequestMapping(value = "/editFlowDetail", method = {RequestMethod.PUT, RequestMethod.POST})
  239 + public Result<String> editFlowDetail(@RequestBody FlowDetail flowDetail) {
  240 + flowDetailService.updateById(flowDetail);
  241 + return Result.OK("编辑成功!");
  242 + }
233 243  
234   - /**
235   - * 通过id删除
236   - * @param id
237   - * @return
238   - */
239   - @AutoLog(value = "流程配置明细-通过id删除")
240   - @ApiOperation(value="流程配置明细-通过id删除", notes="流程配置明细-通过id删除")
241   - @DeleteMapping(value = "/deleteFlowDetail")
242   - public Result<String> deleteFlowDetail(@RequestParam(name="id",required=true) String id) {
243   - flowDetailService.removeById(id);
244   - return Result.OK("删除成功!");
245   - }
  244 + /**
  245 + * 通过id删除
  246 + *
  247 + * @param id
  248 + * @return
  249 + */
  250 + @AutoLog(value = "流程配置明细-通过id删除")
  251 + @ApiOperation(value = "流程配置明细-通过id删除", notes = "流程配置明细-通过id删除")
  252 + @DeleteMapping(value = "/deleteFlowDetail")
  253 + public Result<String> deleteFlowDetail(@RequestParam(name = "id", required = true) String id) {
  254 + flowDetailService.removeById(id);
  255 + return Result.OK("删除成功!");
  256 + }
246 257  
247   - /**
248   - * 批量删除
249   - * @param ids
250   - * @return
251   - */
252   - @AutoLog(value = "流程配置明细-批量删除")
253   - @ApiOperation(value="流程配置明细-批量删除", notes="流程配置明细-批量删除")
254   - @DeleteMapping(value = "/deleteBatchFlowDetail")
255   - public Result<String> deleteBatchFlowDetail(@RequestParam(name="ids",required=true) String ids) {
256   - this.flowDetailService.removeByIds(Arrays.asList(ids.split(",")));
257   - return Result.OK("批量删除成功!");
258   - }
  258 + /**
  259 + * 批量删除
  260 + *
  261 + * @param ids
  262 + * @return
  263 + */
  264 + @AutoLog(value = "流程配置明细-批量删除")
  265 + @ApiOperation(value = "流程配置明细-批量删除", notes = "流程配置明细-批量删除")
  266 + @DeleteMapping(value = "/deleteBatchFlowDetail")
  267 + public Result<String> deleteBatchFlowDetail(@RequestParam(name = "ids", required = true) String ids) {
  268 + this.flowDetailService.removeByIds(Arrays.asList(ids.split(",")));
  269 + return Result.OK("批量删除成功!");
  270 + }
259 271  
260 272 /**
261 273 * 导出
  274 + *
262 275 * @return
263 276 */
264 277 @RequestMapping(value = "/exportFlowDetail")
265 278 public ModelAndView exportFlowDetail(HttpServletRequest request, FlowDetail flowDetail) {
266   - // Step.1 组装查询条件
267   - QueryWrapper<FlowDetail> queryWrapper = QueryGenerator.initQueryWrapper(flowDetail, request.getParameterMap());
268   - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
269   -
270   - // Step.2 获取导出数据
271   - List<FlowDetail> pageList = flowDetailService.list(queryWrapper);
272   - List<FlowDetail> exportList = null;
273   -
274   - // 过滤选中数据
275   - String selections = request.getParameter("selections");
276   - if (oConvertUtils.isNotEmpty(selections)) {
277   - List<String> selectionList = Arrays.asList(selections.split(","));
278   - exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
279   - } else {
280   - exportList = pageList;
281   - }
282   -
283   - // Step.3 AutoPoi 导出Excel
284   - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
285   - mv.addObject(NormalExcelConstants.FILE_NAME, "流程配置明细"); //此处设置的filename无效 ,前端会重更新设置一下
286   - mv.addObject(NormalExcelConstants.CLASS, FlowDetail.class);
287   - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("流程配置明细报表", "导出人:" + sysUser.getRealname(), "流程配置明细"));
288   - mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
289   - return mv;
  279 + // Step.1 组装查询条件
  280 + QueryWrapper<FlowDetail> queryWrapper = QueryGenerator.initQueryWrapper(flowDetail, request.getParameterMap());
  281 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
  282 +
  283 + // Step.2 获取导出数据
  284 + List<FlowDetail> pageList = flowDetailService.list(queryWrapper);
  285 + List<FlowDetail> exportList = null;
  286 +
  287 + // 过滤选中数据
  288 + String selections = request.getParameter("selections");
  289 + if (oConvertUtils.isNotEmpty(selections)) {
  290 + List<String> selectionList = Arrays.asList(selections.split(","));
  291 + exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
  292 + } else {
  293 + exportList = pageList;
  294 + }
  295 +
  296 + // Step.3 AutoPoi 导出Excel
  297 + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
  298 + mv.addObject(NormalExcelConstants.FILE_NAME, "流程配置明细"); //此处设置的filename无效 ,前端会重更新设置一下
  299 + mv.addObject(NormalExcelConstants.CLASS, FlowDetail.class);
  300 + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("流程配置明细报表", "导出人:" + sysUser.getRealname(), "流程配置明细"));
  301 + mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
  302 + return mv;
290 303 }
291 304  
292 305 /**
293 306 * 导入
  307 + *
294 308 * @return
295 309 */
296 310 @RequestMapping(value = "/importFlowDetail/{mainId}")
297 311 public Result<?> importFlowDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
298   - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
299   - Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
300   - for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
301   - MultipartFile file = entity.getValue();// 获取上传文件对象
302   - ImportParams params = new ImportParams();
303   - params.setTitleRows(2);
304   - params.setHeadRows(1);
305   - params.setNeedSave(true);
306   - try {
307   - List<FlowDetail> list = ExcelImportUtil.importExcel(file.getInputStream(), FlowDetail.class, params);
308   - for (FlowDetail temp : list) {
  312 + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
  313 + Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
  314 + for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
  315 + MultipartFile file = entity.getValue();// 获取上传文件对象
  316 + ImportParams params = new ImportParams();
  317 + params.setTitleRows(2);
  318 + params.setHeadRows(1);
  319 + params.setNeedSave(true);
  320 + try {
  321 + List<FlowDetail> list = ExcelImportUtil.importExcel(file.getInputStream(), FlowDetail.class, params);
  322 + for (FlowDetail temp : list) {
309 323 temp.setHeadId(mainId);
310   - }
311   - long start = System.currentTimeMillis();
312   - flowDetailService.saveBatch(list);
313   - log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
314   - return Result.OK("文件导入成功！数据行数：" + list.size());
315   - } catch (Exception e) {
316   - log.error(e.getMessage(), e);
317   - return Result.error("文件导入失败:" + e.getMessage());
318   - } finally {
319   - try {
320   - file.getInputStream().close();
321   - } catch (IOException e) {
322   - e.printStackTrace();
323   - }
324   - }
325   - }
326   - return Result.error("文件导入失败！");
  324 + }
  325 + long start = System.currentTimeMillis();
  326 + flowDetailService.saveBatch(list);
  327 + log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
  328 + return Result.OK("文件导入成功！数据行数：" + list.size());
  329 + } catch (Exception e) {
  330 + log.error(e.getMessage(), e);
  331 + return Result.error("文件导入失败:" + e.getMessage());
  332 + } finally {
  333 + try {
  334 + file.getInputStream().close();
  335 + } catch (IOException e) {
  336 + e.printStackTrace();
  337 + }
  338 + }
  339 + }
  340 + return Result.error("文件导入失败！");
327 341 }
328 342  
329 343 /*--------------------------------子表处理-流程配置明细-end----------------------------------------------*/
330   -
331   -
332   -
333   -
334 344 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryAge/controller/InventoryAgeAlarmController.java
  View file @91d12a9
... ... @@ -11,7 +11,10 @@ import org.jeecg.modules.wms.config.materialWarning.service.IMaterialWarningServ
11 11 import org.jeecg.modules.wms.inventory.inventoryAge.entity.InventoryAgeAlarm;
12 12 import org.jeecg.modules.wms.inventory.inventoryAge.service.IInventoryAgeAlarmService;
13 13 import org.springframework.beans.factory.annotation.Autowired;
14   -import org.springframework.web.bind.annotation.*;
  14 +import org.springframework.web.bind.annotation.GetMapping;
  15 +import org.springframework.web.bind.annotation.RequestMapping;
  16 +import org.springframework.web.bind.annotation.RequestParam;
  17 +import org.springframework.web.bind.annotation.RestController;
15 18 import org.springframework.web.servlet.ModelAndView;
16 19  
17 20 import javax.servlet.http.HttpServletRequest;
... ... @@ -19,70 +22,68 @@ import javax.servlet.http.HttpServletRequest;
19 22 /**
20 23 * @Description: inventory_level_alarm
21 24 * @Author: jeecg-boot
22   - * @Date: 2023-10-30
  25 + * @Date: 2023-10-30
23 26 * @Version: V1.0
24 27 */
25   -@Api(tags="inventory_age_alarm")
  28 +@Api(tags = "inventory_age_alarm")
26 29 @RestController
27 30 @RequestMapping("/inventory/inventoryAge")
28 31 @Slf4j
29 32 public class InventoryAgeAlarmController extends JeecgController<InventoryAgeAlarm, IInventoryAgeAlarmService> {
30   - @Autowired
31   - private IInventoryAgeAlarmService iInventoryAgeAlarmService;
  33 + @Autowired
  34 + private IInventoryAgeAlarmService iInventoryAgeAlarmService;
32 35  
33   - @Autowired
34   - private IMaterialWarningService iMaterialWarningService;
  36 + @Autowired
  37 + private IMaterialWarningService iMaterialWarningService;
35 38  
36   - /**
37   - * 分页列表查询
38   - *
39   - * @param pageNo
40   - * @param pageSize
41   - * @param req
42   - * @return
43   - */
44   - //@AutoLog(value = "inventory_level_alarm-分页列表查询")
45   - @ApiOperation(value="inventory_level_alarm-分页列表查询", notes="inventory_level_alarm-分页列表查询")
46   - @GetMapping(value = "/list")
47   - public Result<IPage<InventoryAgeAlarm>> queryPageList(String materialCode, String materialName, String alarmStatus,
48   - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
49   - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
50   - HttpServletRequest req) {
  39 + /**
  40 + * 分页列表查询
  41 + *
  42 + * @param pageNo
  43 + * @param pageSize
  44 + * @param req
  45 + * @return
  46 + */
  47 + //@AutoLog(value = "inventory_level_alarm-分页列表查询")
  48 + @ApiOperation(value = "inventory_level_alarm-分页列表查询", notes = "inventory_level_alarm-分页列表查询")
  49 + @GetMapping(value = "/list")
  50 + public Result<IPage<InventoryAgeAlarm>> queryPageList(String materialCode, String materialName, String alarmStatus,
  51 + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
  52 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
  53 + HttpServletRequest req) {
51 54  
52   - Page<InventoryAgeAlarm> page = new Page<>(pageNo, pageSize);
53   - IPage<InventoryAgeAlarm> pageList = iInventoryAgeAlarmService.queryAgeAlarm(page, materialCode, materialName, alarmStatus);
54   - //对list分页处理
55   - return Result.OK(pageList);
56   - }
  55 + Page<InventoryAgeAlarm> page = new Page<>(pageNo, pageSize);
  56 + IPage<InventoryAgeAlarm> pageList = iInventoryAgeAlarmService.queryAgeAlarm(page, materialCode, materialName, alarmStatus);
  57 + //对list分页处理
  58 + return Result.OK(pageList);
  59 + }
57 60  
58 61  
59   - /**
60   - * 通过id查询
61   - *
62   - * @param id
63   - * @return
64   - */
65   - //@AutoLog(value = "inventory_age_alarm-通过id查询")
66   - @ApiOperation(value="inventory_age_alarm-通过id查询", notes="inventory_age_alarm-通过id查询")
67   - @GetMapping(value = "/queryById")
68   - public Result<InventoryAgeAlarm> queryById(@RequestParam(name="id",required=true) String id) {
69   - InventoryAgeAlarm inventoryageAlarm = iInventoryAgeAlarmService.getById(id);
70   - if(inventoryageAlarm ==null) {
71   - return Result.error("未找到对应数据");
72   - }
73   - return Result.OK(inventoryageAlarm);
74   - }
  62 + /**
  63 + * 通过id查询
  64 + *
  65 + * @param id
  66 + * @return
  67 + */
  68 + //@AutoLog(value = "inventory_age_alarm-通过id查询")
  69 + @ApiOperation(value = "inventory_age_alarm-通过id查询", notes = "inventory_age_alarm-通过id查询")
  70 + @GetMapping(value = "/queryById")
  71 + public Result<InventoryAgeAlarm> queryById(@RequestParam(name = "id", required = true) String id) {
  72 + InventoryAgeAlarm inventoryageAlarm = iInventoryAgeAlarmService.getById(id);
  73 + if (inventoryageAlarm == null) {
  74 + return Result.error("未找到对应数据");
  75 + }
  76 + return Result.OK(inventoryageAlarm);
  77 + }
75 78  
76 79 /**
77   - * 导出excel
78   - *
79   - * @param request
80   - * @param inventoryAgeAlarm
81   - */
  80 + * 导出excel
  81 + *
  82 + * @param request
  83 + * @param inventoryAgeAlarm
  84 + */
82 85 @RequestMapping(value = "/exportXls")
83 86 public ModelAndView exportXls(HttpServletRequest request, InventoryAgeAlarm inventoryAgeAlarm) {
84 87 return super.exportXls(request, inventoryAgeAlarm, InventoryAgeAlarm.class, "inventory_level_alarm");
85 88 }
86   -
87   -
88 89 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
  View file @91d12a9
... ... @@ -385,7 +385,7 @@ public class InventoryDetailController extends JeecgController&lt;InventoryDetail,
385 385 * @param inventoryDetail
386 386 * @return
387 387 */
388   - @AutoLog(value = "库存详情-新增库存数量")
  388 + @AutoLog(value = "库存详情-新增库存数量", operateType = 3)
389 389 @ApiOperation(value = "库存详情-新增库存数量", notes = "库存详情-新增库存数量")
390 390 @RequestMapping(value = "/increaseInventoryDetail", method = {RequestMethod.PUT, RequestMethod.POST})
391 391 public Result increaseInventoryDetail(@RequestBody InventoryDetail inventoryDetail) {
... ... @@ -400,7 +400,7 @@ public class InventoryDetailController extends JeecgController&lt;InventoryDetail,
400 400 * @param inventoryDetail
401 401 * @return
402 402 */
403   - @AutoLog(value = "库存详情-扣减库存数量")
  403 + @AutoLog(value = "库存详情-扣减库存数量", operateType = 3)
404 404 @ApiOperation(value = "库存详情-扣减库存数量", notes = "库存详情-扣减库存数量")
405 405 @RequestMapping(value = "/reduceInventoryDetail", method = {RequestMethod.PUT, RequestMethod.POST})
406 406 public Result reduceInventoryDetail(@RequestBody InventoryDetail inventoryDetail) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java
  View file @91d12a9
... ... @@ -376,10 +376,9 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
376 376  
377 377 /*--------------------------------子表处理-库存详情-end----------------------------------------------*/
378 378  
379   - @AutoLog("库存详情-释放受控")
  379 + @AutoLog(value = "库存详情-释放受控", operateType = 3)
380 380 @ApiOperation(value = "释放受控", notes = "释放受控")
381 381 @PostMapping(value = "/releaseController")
382   - @ResponseBody
383 382 public Result releaseController(@RequestBody List<Integer> ids, HttpServletRequest req) {
384 383 if (StringUtils.isEmpty(ids)) {
385 384 throw new JeecgBootException("库存明细id为空");
... ... @@ -387,10 +386,9 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
387 386 return inventoryDetailService.releaseController(ids);
388 387 }
389 388  
390   - @AutoLog("库存详情-批量受控")
  389 + @AutoLog(value = "库存详情-批量受控", operateType = 3)
391 390 @ApiOperation(value = "批量受控", notes = "批量受控")
392 391 @PostMapping("/controller")
393   - @ResponseBody
394 392 public Result controller(@RequestBody List<Integer> ids) {
395 393 if (StringUtils.isEmpty(ids)) {
396 394 return Result.error("库存明细id为空");
... ... @@ -398,11 +396,10 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
398 396 return inventoryDetailService.controller(ids);
399 397 }
400 398  
401   - @AutoLog("库存头-批量出整托库存")
  399 + @AutoLog(value = "库存头-批量出整托库存", operateType = 4)
402 400 @ApiOperation(value = "批量出整托库存", notes = "批量出整托库存")
403 401 @ApiLogger(apiName = "批量出整托库存")
404 402 @PostMapping("/shipmentInventoryHeader")
405   - @ResponseBody
406 403 public Result shipmentInventoryHeader(@RequestBody List<InventoryHeader> inventoryHeaderList, HttpServletRequest req) {
407 404 if (StringUtils.isEmpty(inventoryHeaderList)) {
408 405 return Result.error("库存头为空");
... ... @@ -411,11 +408,10 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
411 408 return inventoryHeaderService.shipmentInventoryHeader(inventoryHeaderList, warehouseCode);
412 409 }
413 410  
414   - @AutoLog("库存头-批量出库存详情")
  411 + @AutoLog(value = "库存头-批量出库存详情", operateType = 4)
415 412 @ApiOperation(value = "批量出库存详情", notes = "批量出库存详情")
416 413 @ApiLogger(apiName = "批量出库存详情")
417 414 @PostMapping("/shipmentInventoryDetail")
418   - @ResponseBody
419 415 public Result shipmentInventoryDetail(@RequestBody List<InventoryDetail> inventoryDetailList, HttpServletRequest req) {
420 416 if (StringUtils.isEmpty(inventoryDetailList)) {
421 417 return Result.error("库存明细为空");
... ... @@ -424,10 +420,9 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
424 420 return inventoryHeaderService.shipmentInventoryDetail(inventoryDetailList, warehouseCode);
425 421 }
426 422  
427   - @AutoLog("批量出库存详情")
  423 + @AutoLog(value = "批量出库存详情", operateType = 4)
428 424 @ApiOperation(value = "批量出库存详情", notes = "批量出库存详情")
429 425 @PostMapping("/decuceInventoryDetail")
430   - @ResponseBody
431 426 public Result decuceInventoryDetail(@RequestBody List<InventoryDetail> inventoryDetailList, HttpServletRequest req) {
432 427 if (StringUtils.isEmpty(inventoryDetailList)) {
433 428 return Result.error("库存明细为空");
... ... @@ -436,10 +431,9 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader,
436 431 return inventoryHeaderService.decuceInventoryDetail(inventoryDetailList, warehouseCode);
437 432 }
438 433  
439   - @AutoLog("按照库存详情质检")
  434 + @AutoLog(value = "按照库存详情质检", operateType = 3)
440 435 @ApiOperation(value = "按照库存详情质检", notes = "按照库存详情质检")
441 436 @PostMapping("/qualityInventoryDetail")
442   - @ResponseBody
443 437 public Result qualityInventoryDetail(@RequestBody List<InventoryDetail> inventoryDetailList, HttpServletRequest req) {
444 438 if (StringUtils.isEmpty(inventoryDetailList)) {
445 439 return Result.error("库存明细为空");
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryLevel/controller/InventoryLevelAlarmController.java
  View file @91d12a9
1 1 package org.jeecg.modules.wms.inventory.inventoryLevel.controller;
2 2  
3   -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 3 import com.baomidou.mybatisplus.core.metadata.IPage;
6 4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 5 import io.swagger.annotations.Api;
... ... @@ -9,89 +7,78 @@ import io.swagger.annotations.ApiOperation;
9 7 import lombok.extern.slf4j.Slf4j;
10 8 import org.jeecg.common.api.vo.Result;
11 9 import org.jeecg.common.system.base.controller.JeecgController;
12   -import org.jeecg.common.system.query.QueryGenerator;
13   -import org.jeecg.modules.oss.entity.OSSFile;
14   -import org.jeecg.modules.wms.config.materialWarning.entity.MaterialWarning;
15   -import org.jeecg.modules.wms.config.materialWarning.service.IMaterialWarningService;
16 10 import org.jeecg.modules.wms.inventory.inventoryLevel.entity.InventoryLevelAlarm;
17 11 import org.jeecg.modules.wms.inventory.inventoryLevel.service.IInventoryLevelAlarmService;
18   -import org.jeecg.utils.StringUtils;
19 12 import org.springframework.beans.factory.annotation.Autowired;
20   -import org.springframework.web.bind.annotation.*;
  13 +import org.springframework.web.bind.annotation.GetMapping;
  14 +import org.springframework.web.bind.annotation.RequestMapping;
  15 +import org.springframework.web.bind.annotation.RequestParam;
  16 +import org.springframework.web.bind.annotation.RestController;
21 17 import org.springframework.web.servlet.ModelAndView;
22 18  
23 19 import javax.servlet.http.HttpServletRequest;
24   -import java.util.List;
25   -import java.util.stream.Collectors;
26 20  
27 21 /**
28 22 * @Description: inventory_level_alarm
29 23 * @Author: jeecg-boot
30   - * @Date: 2023-10-30
  24 + * @Date: 2023-10-30
31 25 * @Version: V1.0
32 26 */
33   -@Api(tags="inventory_level_alarm")
  27 +@Api(tags = "inventory_level_alarm")
34 28 @RestController
35 29 @RequestMapping("/inventory/inventoryLevel")
36 30 @Slf4j
37 31 public class InventoryLevelAlarmController extends JeecgController<InventoryLevelAlarm, IInventoryLevelAlarmService> {
38   - @Autowired
39   - private IInventoryLevelAlarmService iInventoryLevelAlarmService;
40 32  
41   - @Autowired
42   - private IMaterialWarningService iMaterialWarningService;
43   -
44   - /**
45   - * 分页列表查询
46   - *
47   - * @param inventoryLevelAlarm
48   - * @param pageNo
49   - * @param pageSize
50   - * @param req
51   - * @return
52   - */
53   - //@AutoLog(value = "inventory_level_alarm-分页列表查询")
54   - @ApiOperation(value="inventory_level_alarm-分页列表查询", notes="inventory_level_alarm-分页列表查询")
55   - @GetMapping(value = "/list")
56   - public Result<IPage<InventoryLevelAlarm>> queryPageList(String materialCode, String materialName, String alarmStatus,
57   - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
58   - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
59   - HttpServletRequest req) {
60   -
61   - Page<InventoryLevelAlarm> page = new Page<>(pageNo, pageSize);
62   - IPage<InventoryLevelAlarm> pageList = iInventoryLevelAlarmService.queryLevelAlarm(page, materialCode, materialName, alarmStatus);
63   - //对list分页处理
64   - return Result.OK(pageList);
65   - }
  33 + @Autowired
  34 + private IInventoryLevelAlarmService iInventoryLevelAlarmService;
66 35  
  36 + /**
  37 + * 分页列表查询
  38 + *
  39 + * @param pageNo
  40 + * @param pageSize
  41 + * @param req
  42 + * @return
  43 + */
  44 + //@AutoLog(value = "inventory_level_alarm-分页列表查询")
  45 + @ApiOperation(value = "inventory_level_alarm-分页列表查询", notes = "inventory_level_alarm-分页列表查询")
  46 + @GetMapping(value = "/list")
  47 + public Result<IPage<InventoryLevelAlarm>> queryPageList(String materialCode, String materialName, String alarmStatus,
  48 + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
  49 + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
  50 + HttpServletRequest req) {
  51 + Page<InventoryLevelAlarm> page = new Page<>(pageNo, pageSize);
  52 + IPage<InventoryLevelAlarm> pageList = iInventoryLevelAlarmService.queryLevelAlarm(page, materialCode, materialName, alarmStatus);
  53 + //对list分页处理
  54 + return Result.OK(pageList);
  55 + }
67 56  
68   - /**
69   - * 通过id查询
70   - *
71   - * @param id
72   - * @return
73   - */
74   - //@AutoLog(value = "inventory_level_alarm-通过id查询")
75   - @ApiOperation(value="inventory_level_alarm-通过id查询", notes="inventory_level_alarm-通过id查询")
76   - @GetMapping(value = "/queryById")
77   - public Result<InventoryLevelAlarm> queryById(@RequestParam(name="id",required=true) String id) {
78   - InventoryLevelAlarm inventoryLevelAlarm = iInventoryLevelAlarmService.getById(id);
79   - if(inventoryLevelAlarm ==null) {
80   - return Result.error("未找到对应数据");
81   - }
82   - return Result.OK(inventoryLevelAlarm);
83   - }
  57 + /**
  58 + * 通过id查询
  59 + *
  60 + * @param id
  61 + * @return
  62 + */
  63 + //@AutoLog(value = "inventory_level_alarm-通过id查询")
  64 + @ApiOperation(value = "inventory_level_alarm-通过id查询", notes = "inventory_level_alarm-通过id查询")
  65 + @GetMapping(value = "/queryById")
  66 + public Result<InventoryLevelAlarm> queryById(@RequestParam(name = "id", required = true) String id) {
  67 + InventoryLevelAlarm inventoryLevelAlarm = iInventoryLevelAlarmService.getById(id);
  68 + if (inventoryLevelAlarm == null) {
  69 + return Result.error("未找到对应数据");
  70 + }
  71 + return Result.OK(inventoryLevelAlarm);
  72 + }
84 73  
85 74 /**
86   - * 导出excel
87   - *
88   - * @param request
89   - * @param inventoryLevelAlarm
90   - */
  75 + * 导出excel
  76 + *
  77 + * @param request
  78 + * @param inventoryLevelAlarm
  79 + */
91 80 @RequestMapping(value = "/exportXls")
92 81 public ModelAndView exportXls(HttpServletRequest request, InventoryLevelAlarm inventoryLevelAlarm) {
93 82 return super.exportXls(request, inventoryLevelAlarm, InventoryLevelAlarm.class, "inventory_level_alarm");
94 83 }
95   -
96   -
97 84 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/qualityHeader/controller/QualityHeaderController.java
  View file @91d12a9
... ... @@ -310,7 +310,7 @@ public class QualityHeaderController extends JeecgController&lt;QualityHeader, IQua
310 310 * @param qualityDetail
311 311 * @return
312 312 */
313   - @AutoLog(value = "质检单详情-质检")
  313 + @AutoLog(value = "质检单详情-质检", operateType = 3)
314 314 @ApiOperation(value = "质检单详情-质检", notes = "质检单详情-质检")
315 315 @RequestMapping(value = "/qualityTesting", method = {RequestMethod.PUT, RequestMethod.POST})
316 316 public Result<String> qualityTesting(@RequestBody QualityDetail qualityDetail) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
  View file @91d12a9
... ... @@ -342,9 +342,9 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
342 342 * 创建任务
343 343 * @return
344 344 */
  345 + @AutoLog(value = "入库组盘-创建任务", operateType = 2)
345 346 @ApiOperation(value = "入库组盘-创建任务", notes = "入库组盘-创建任务")
346 347 @PostMapping("/createReceiptTask")
347   - @ResponseBody
348 348 public Result createReceiptTask(@RequestBody ReceiptContainerHeader receiptContainerHeader, HttpServletRequest req) {
349 349 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
350 350 Result result = huahengMultiHandlerService.createReceiptTask(receiptContainerHeader, warehouseCode);
... ... @@ -355,9 +355,9 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
355 355 * 创建任务
356 356 * @return
357 357 */
  358 + @AutoLog(value = "入库组盘-创建任务", operateType = 2)
358 359 @ApiOperation(value = "入库组盘-创建任务", notes = "入库组盘-创建任务")
359 360 @PostMapping("/createReceiptBatchTask")
360   - @ResponseBody
361 361 public Result createReceiptBatchTask(@RequestBody List<ReceiptContainerHeader> receiptContainerHeaderList, HttpServletRequest req) {
362 362 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
363 363 if (CollectionUtils.isEmpty(receiptContainerHeaderList)) {
... ... @@ -402,7 +402,6 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
402 402 */
403 403 @ApiOperation(value = "出库配盘-选择分拣口", notes = "出库配盘-选择分拣口")
404 404 @PostMapping("/selectSupplePort")
405   - @ResponseBody
406 405 public Result selectSupplePort(@RequestBody ReceiptContainerHeader receiptContainerHeader, HttpServletRequest req) {
407 406 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
408 407 String fromLocationCode = receiptContainerHeader.getFromLocationCode();
... ... @@ -439,7 +438,7 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
439 438 * 指定库位
440 439 * @return
441 440 */
442   - @AutoLog(value = "入库组盘-指定库位")
  441 + @AutoLog(value = "入库组盘-指定库位", operateType = 3)
443 442 @ApiOperation(value = "入库组盘-指定库位", notes = "入库组盘-指定库位")
444 443 @RequestMapping(value = "/allocation", method = {RequestMethod.PUT, RequestMethod.POST})
445 444 public Result<String> allocation(@RequestBody ReceiptContainerHeader receiptContainerHeader) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @91d12a9
... ... @@ -406,7 +406,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
406 406 * @param receiptHeader
407 407 * @return
408 408 */
409   - @AutoLog(value = "回传入库单")
  409 + @AutoLog(value = "回传入库单", operateType = 3)
410 410 @ApiOperation(value = "回传入库单", notes = "回传入库单")
411 411 @RequiresPermissions("receiptHeader:back")
412 412 @RequestMapping(value = "/backErpReceipt", method = {RequestMethod.PUT, RequestMethod.POST})
... ... @@ -414,10 +414,9 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
414 414 return huahengMultiHandlerService.backReceipt(receiptHeader);
415 415 }
416 416  
417   - @AutoLog(value = "PDA入库-快速入库")
  417 + @AutoLog(value = "PDA入库-快速入库", operateType = 2)
418 418 @ApiOperation(value = "PDA入库-快速入库", notes = "快速入库")
419 419 @PostMapping("/quickReceipt")
420   - @ResponseBody
421 420 @ApiLogger(apiName = "PDA入库-快速入库", from = "PDA")
422 421 public Result<?> quickReceipt(@RequestBody QuickReceiptBean bean, HttpServletRequest req) {
423 422 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
... ... @@ -426,10 +425,9 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
426 425 return result;
427 426 }
428 427  
429   - @AutoLog(value = "PDA入库-呼叫料盒")
  428 + @AutoLog(value = "PDA入库-呼叫料盒", operateType = 2)
430 429 @ApiOperation(value = "PDA入库-呼叫料盒", notes = "创建空的补充入库任务，并返回任务id")
431 430 @PostMapping("/callbox")
432   - @ResponseBody
433 431 @ApiLogger(apiName = "PDA入库-呼叫料盒", from = "PDA")
434 432 public Result<?> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
435 433 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
... ... @@ -439,10 +437,9 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
439 437 return result;
440 438 }
441 439  
442   - @AutoLog(value = "PDA入库-批量呼叫料盒")
  440 + @AutoLog(value = "PDA入库-批量呼叫料盒", operateType = 2)
443 441 @ApiOperation(value = "PDA入库-批量呼叫料盒", notes = "创建空的补充入库任务，并返回任务id")
444 442 @PostMapping("/batchCallBox")
445   - @ResponseBody
446 443 @ApiLogger(apiName = "PDA入库-批量呼叫料盒", from = "PDA")
447 444 public Result<?> batchCallBox(@RequestBody List<CallBoxBean> callBoxBeanList, HttpServletRequest req) {
448 445 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
... ... @@ -455,10 +452,9 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
455 452 return result;
456 453 }
457 454  
458   - @AutoLog(value = "越库")
  455 + @AutoLog(value = "越库", operateType = 3)
459 456 @ApiOperation(value = "越库", notes = "越库")
460 457 @PostMapping("/crossDocking")
461   - @ResponseBody
462 458 @ApiLogger(apiName = "越库", from = "WMS")
463 459 public Result<?> crossDocking(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
464 460 return receiptHeaderService.crossDocking(id);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiveHeader/controller/ReceiveHeaderController.java
  View file @91d12a9
... ... @@ -335,7 +335,6 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
335 335 */
336 336 @ApiOperation(value = "入库单详情-通过详情ID查询", notes = "入库单详情-通过详情ID查询")
337 337 @PostMapping("/listReceiveByReceiveId")
338   - @ResponseBody
339 338 public Result listReceiveByReceiveId(@RequestBody ReceiveDetail receiveDetailDomain) {
340 339 List<Receive> receiveList = new ArrayList<>();
341 340 QueryWrapper<ReceiveDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiveDetailDomain, null);
... ... @@ -366,13 +365,11 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
366 365 *
367 366 * @return
368 367 */
369   - @AutoLog("收货单-收货")
  368 + @AutoLog(value = "收货单-收货", operateType = 2)
370 369 @ApiOperation(value = "收货单-收货", notes = "收货单-收货")
371 370 @PostMapping("/receive")
372   - @ResponseBody
373 371 public Result receive(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
374 372 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
375   - String lockKey = warehouseCode;
376 373 Result result = receiveDetailService.receive(receiveList, warehouseCode);
377 374 return result;
378 375 }
... ... @@ -382,13 +379,11 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
382 379 *
383 380 * @return
384 381 */
385   - @AutoLog("收货单-全部收货")
  382 + @AutoLog(value = "收货单-全部收货", operateType = 2)
386 383 @ApiOperation(value = "收货单-全部收货", notes = "收货单-全部收货")
387 384 @PostMapping("/receiveHeader")
388   - @ResponseBody
389 385 public Result receiveHeader(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
390 386 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
391   - String lockKey = warehouseCode;
392 387 Result result = receiveDetailService.receiveHeader(id, warehouseCode);
393 388 return result;
394 389 }
... ... @@ -398,13 +393,11 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
398 393 *
399 394 * @return
400 395 */
401   - @AutoLog("收货单-收货详情质检")
  396 + @AutoLog(value = "收货单-收货详情质检", operateType = 3)
402 397 @ApiOperation(value = "收货单-收货详情质检", notes = "收货单-收货详情质检")
403 398 @PostMapping("/receiveDetailToQuality")
404   - @ResponseBody
405 399 public Result receiveDetailToQuality(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
406 400 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
407   - String lockKey = warehouseCode;
408 401 Result result = receiveDetailService.receiveToQuality(id, warehouseCode);
409 402 return result;
410 403 }
... ... @@ -414,10 +407,9 @@ public class ReceiveHeaderController extends JeecgController&lt;ReceiveHeader, IRec
414 407 *
415 408 * @return
416 409 */
417   - @AutoLog("收货单-全部质检")
  410 + @AutoLog(value = "收货单-全部质检", operateType = 3)
418 411 @ApiOperation(value = "收货单-全部质检", notes = "收货单-全部质检")
419 412 @PostMapping("/receiveHeaderToQuality")
420   - @ResponseBody
421 413 public Result receiveHeaderToQuality(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
422 414 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
423 415 Result result = receiveHeaderService.receiveHeaderToQuality(id, warehouseCode);
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
  View file @91d12a9
... ... @@ -45,10 +45,6 @@ public class ReceiveController extends HuahengBaseController {
45 45 @Resource
46 46 private IContainerService containerService;
47 47 @Resource
48   - private ILocationService locationService;
49   - @Resource
50   - private IInventoryHeaderService inventoryHeaderService;
51   - @Resource
52 48 private IHuahengMultiHandlerService huahengMultiHandlerService;
53 49  
54 50 /**
... ... @@ -58,7 +54,6 @@ public class ReceiveController extends HuahengBaseController {
58 54 */
59 55 @ApiOperation(value = "入库单详情-通过详情ID查询", notes = "入库单详情-通过详情ID查询")
60 56 @PostMapping("/listReceiveByReceiptId")
61   - @ResponseBody
62 57 public Result listReceiveByReceiptId(@RequestBody ReceiptDetail receiptDetailDomain) {
63 58 List<Receive> receiveList = new ArrayList<>();
64 59 QueryWrapper<ReceiptDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiptDetailDomain, null);
... ... @@ -89,10 +84,9 @@ public class ReceiveController extends HuahengBaseController {
89 84 *
90 85 * @return
91 86 */
92   - @AutoLog("入库单-组盘")
  87 + @AutoLog(value = "入库单-组盘", operateType = 2)
93 88 @ApiOperation(value = "入库单-组盘", notes = "入库单-组盘")
94 89 @PostMapping("/receiving")
95   - @ResponseBody
96 90 public Result receiving(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
97 91 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
98 92 String lockKey = warehouseCode;
... ... @@ -111,10 +105,9 @@ public class ReceiveController extends HuahengBaseController {
111 105 *
112 106 * @return
113 107 */
114   - @AutoLog("入库单-生成任务")
  108 + @AutoLog(value = "入库单-生成任务", operateType = 2)
115 109 @ApiOperation(value = "入库单-生成任务", notes = "入库单-生成任务")
116 110 @PostMapping("/receivingAndCreateTask")
117   - @ResponseBody
118 111 public Result receivingAndCreateTask(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
119 112 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
120 113 String lockKey = warehouseCode;
... ... @@ -133,15 +126,12 @@ public class ReceiveController extends HuahengBaseController {
133 126 *
134 127 * @return
135 128 */
136   - @AutoLog("入库单-平库组盘")
  129 + @AutoLog(value = "入库单-平库组盘", operateType = 2)
137 130 @ApiOperation(value = "入库单-平库组盘", notes = "入库单-平库组盘")
138 131 @PostMapping("/flatReceive")
139   - @ResponseBody
140 132 public Result flatReceive(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
141 133 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
142 134 String lockKey = warehouseCode;
143   - Receive receive = receiveList.get(0);
144   - String containerCode = receive.getContainerCode();
145 135 Result result = handleMultiProcess("flatReceive", lockKey, new MultiProcessListener() {
146 136 @Override
147 137 public Result<?> doProcess() {
... ... @@ -157,10 +147,9 @@ public class ReceiveController extends HuahengBaseController {
157 147 *
158 148 * @return
159 149 */
160   - @AutoLog("入库单-平库上架")
  150 + @AutoLog(value = "入库单-平库上架", operateType = 2)
161 151 @ApiOperation(value = "入库单-平库上架", notes = "入库单-平库上架")
162 152 @PostMapping("/flatOnShell")
163   - @ResponseBody
164 153 public Result flatOnShell(@RequestBody OnShell onShell, HttpServletRequest req) {
165 154 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
166 155 String lockKey = warehouseCode;
... ... @@ -185,10 +174,9 @@ public class ReceiveController extends HuahengBaseController {
185 174 *
186 175 * @return
187 176 */
188   - @AutoLog("入库单-平库入库")
  177 + @AutoLog(value = "入库单-平库入库", operateType = 2)
189 178 @ApiOperation(value = "入库单-平库入库", notes = "入库单-平库入库")
190 179 @PostMapping("/flatReceipt")
191   - @ResponseBody
192 180 public Result flatReceipt(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
193 181 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
194 182 String lockKey = warehouseCode;
... ... @@ -221,10 +209,9 @@ public class ReceiveController extends HuahengBaseController {
221 209 *
222 210 * @return
223 211 */
224   - @AutoLog("入库单-AGV入库")
  212 + @AutoLog(value = "入库单-AGV入库", operateType = 2)
225 213 @ApiOperation(value = "入库单-AGV入库", notes = "入库单-AGV入库")
226 214 @PostMapping("/agvReceipt")
227   - @ResponseBody
228 215 public Result agvReceipt(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
229 216 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
230 217 String lockKey = warehouseCode;
... ... @@ -238,7 +225,7 @@ public class ReceiveController extends HuahengBaseController {
238 225 return result;
239 226 }
240 227  
241   - @AutoLog(value = "平库快速入库", operateType = 1)
  228 + @AutoLog(value = "平库快速入库", operateType = 2)
242 229 @ApiOperation(value = "平库快速入库", notes = "平库快速入库")
243 230 @PostMapping("/flatQuickReceipt")
244 231 public Result<?> flatQuickReceipt(@RequestBody QuickReceiptBean bean, HttpServletRequest req) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java
  View file @91d12a9
... ... @@ -76,7 +76,6 @@ public class ShipmentCombinationController extends HuahengBaseController {
76 76 * @return
77 77 */
78 78 @GetMapping("/getShipmentDetailListByShipmentCode")
79   - @ResponseBody
80 79 public Result getShipmentDetailListByShipmentCode(String shipmentCode, HttpServletRequest req) {
81 80 if (StringUtils.isEmpty(shipmentCode)) {
82 81 return Result.error("没有找到出库单号");
... ... @@ -93,10 +92,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
93 92 *
94 93 * @return
95 94 */
96   - @AutoLog("出库单-自动配盘")
  95 + @AutoLog(value = "出库单-自动配盘", operateType = 4)
97 96 @ApiOperation(value = "出库单-自动配盘", notes = "出库单-自动配盘")
98 97 @PostMapping("/autoCombination")
99   - @ResponseBody
100 98 public Result autoCombination(@RequestBody ShipmentHeader shipmentHeader) {
101 99 String shipmentCode = shipmentHeader.getCode();
102 100 String warehouseCode = shipmentHeader.getWarehouseCode();
... ... @@ -108,10 +106,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
108 106 *
109 107 * @return
110 108 */
111   - @AutoLog("出库单-配盘")
  109 + @AutoLog(value = "出库单-配盘", operateType = 4)
112 110 @ApiOperation(value = "出库单-配盘", notes = "出库单-配盘")
113 111 @PostMapping("/combination")
114   - @ResponseBody
115 112 public Result combination(@RequestBody CombinationParam combinationParam) {
116 113 return huahengMultiHandlerService.combination(combinationParam);
117 114 }
... ... @@ -121,9 +118,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
121 118 *
122 119 * @return
123 120 */
  121 + @AutoLog(value = "出库组盘-创建出库任务", operateType = 2)
124 122 @ApiOperation(value = "出库组盘-创建出库任务", notes = "出库组盘-创建出库任务")
125 123 @PostMapping("/createShipmentTask")
126   - @ResponseBody
127 124 public Result createShipmentTask(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
128 125 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
129 126 Result result = huahengMultiHandlerService.createShipmentTask(shipmentContainerHeader, warehouseCode, 0, 0, 0);
... ... @@ -135,9 +132,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
135 132 *
136 133 * @return
137 134 */
  135 + @AutoLog(value = "出库组盘-批量创建出库任务", operateType = 2)
138 136 @ApiOperation(value = "出库组盘-批量创建出库任务", notes = "出库组盘-批量创建出库任务")
139 137 @PostMapping("/createShipmentBatchTask")
140   - @ResponseBody
141 138 public Result createShipmentBatchTask(@RequestBody List<ShipmentContainerHeader> shipmentContainerHeaderList, HttpServletRequest req) {
142 139 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
143 140 if (CollectionUtils.isEmpty(shipmentContainerHeaderList)) {
... ... @@ -188,7 +185,6 @@ public class ShipmentCombinationController extends HuahengBaseController {
188 185 */
189 186 @ApiOperation(value = "出库组盘-选择分拣口", notes = "出库组盘-选择分拣口")
190 187 @PostMapping("/selectSortingPort")
191   - @ResponseBody
192 188 public Result selectSortingPort(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
193 189 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
194 190 String fromLocationCode = shipmentContainerHeader.getFromLocationCode();
... ... @@ -214,18 +210,13 @@ public class ShipmentCombinationController extends HuahengBaseController {
214 210 type = QuantityConstant.PORT_TYPE_OUT;
215 211 }
216 212 List<Port> portList = portService.getPortListByType(type, roadWay, zoneCode, warehouseCode);
217   - if (portList.size() == 0) {
  213 + if (portList.isEmpty()) {
218 214 return Result.error("选择分拣口时, 没有找到合适的分拣口");
219 215 }
220 216 return Result.OK(portList);
221 217 }
222 218  
223   - /**
224   - * 匹配库存
225   - *
226   - * @return
227   - */
228   - @AutoLog(value = "出库组盘-选取库存")
  219 +
229 220 @ApiOperation(value = "出库组盘-选取库存", notes = "出库组盘-选取库存")
230 221 @GetMapping("/getInventoryFromShipmentDetail")
231 222 public Result getInventoryFromShipmentDetail(ShipmentDetail shipmentDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
... ... @@ -234,15 +225,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
234 225 return shipmentCombinationService.getInventoryFromShipmentDetail(id);
235 226 }
236 227  
237   - /**
238   - * 通过详情ID查询
239   - *
240   - * @return
241   - */
242   - @AutoLog("出库单详情-通过详情ID查询")
  228 +
243 229 @ApiOperation(value = "出库单详情-通过详情ID查询", notes = "出库单详情-通过详情ID查询")
244 230 @PostMapping("/listShipmentByShipmentDetailId")
245   - @ResponseBody
246 231 public Result listShipmentByShipmentDetailId(@RequestBody ShipmentDetail shipmentDetail) {
247 232 shipmentDetail = shipmentDetailService.getById(shipmentDetail.getId());
248 233 Shipment shipment = new Shipment();
... ... @@ -266,8 +251,8 @@ public class ShipmentCombinationController extends HuahengBaseController {
266 251 *
267 252 * @return
268 253 */
269   - @AutoLog(value = "平库出库,通过托盘")
270   - @ApiOperation(value = "平库出库,通过托盘", notes = "平库出库,通过托盘")
  254 + @AutoLog(value = "平库出库，通过托盘", operateType = 4)
  255 + @ApiOperation(value = "平库出库，通过托盘", notes = "平库出库，通过托盘")
271 256 @PostMapping("/flatShipmentByContainerCode")
272 257 public Result flatShipmentByContainerCode(@RequestBody List<FlatShipment> flatShipmentList, HttpServletRequest req) {
273 258 FlatShipment flatShipment = flatShipmentList.get(0);
... ... @@ -281,7 +266,7 @@ public class ShipmentCombinationController extends HuahengBaseController {
281 266 *
282 267 * @return
283 268 */
284   - @AutoLog(value = "平库出库，通过库位")
  269 + @AutoLog(value = "平库出库，通过库位", operateType = 4)
285 270 @ApiOperation(value = "平库出库，通过库位", notes = "平库出库，通过库位")
286 271 @PostMapping("/flatShipmentByLocationCode")
287 272 public Result flatShipmentByLocationCode(@RequestBody List<FlatShipment> flatShipmentList, HttpServletRequest req) {
... ... @@ -296,9 +281,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
296 281 *
297 282 * @return
298 283 */
  284 + @AutoLog(value = "平库出库", operateType = 4)
299 285 @ApiOperation(value = "平库出库", notes = "平库出库")
300 286 @PostMapping("/completeFlatShipment")
301   - @ResponseBody
302 287 public Result completeFlatShipment(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
303 288 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
304 289 String lockKey = warehouseCode;
... ... @@ -318,9 +303,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
318 303 *
319 304 * @return
320 305 */
321   - @ApiOperation(value = "创建出库任务, 出库任务完成以后，AGV去接", notes = "创建出库任务, 出库任务完成以后，AGV去接")
  306 + @AutoLog(value = "创建出库任务，出库任务完成以后，AGV去接", operateType = 2)
  307 + @ApiOperation(value = "创建出库任务，出库任务完成以后，AGV去接", notes = "创建出库任务，出库任务完成以后，AGV去接")
322 308 @PostMapping("/createShipmentTaskByAgv")
323   - @ResponseBody
324 309 public Result createShipmentTaskByAgv(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
325 310 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
326 311 Result result = shipmentCombinationService.createShipmentTaskByAgv(shipmentContainerHeader, warehouseCode);
... ... @@ -333,9 +318,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
333 318 *
334 319 * @return
335 320 */
336   - @ApiOperation(value = "创建出库任务, 出库任务完成以后，AGV去接", notes = "创建出库任务, 出库任务完成以后，AGV去接")
  321 + @AutoLog(value = "创建出库任务，出库任务完成以后，AGV去接", operateType = 2)
  322 + @ApiOperation(value = "创建出库任务，出库任务完成以后，AGV去接", notes = "创建出库任务，出库任务完成以后，AGV去接")
337 323 @PostMapping("/createBatchShipmentTaskByAgv")
338   - @ResponseBody
339 324 public Result createBatchShipmentTaskByAgv(@RequestBody List<ShipmentContainerHeader> shipmentContainerHeaderList, HttpServletRequest req) {
340 325 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
341 326 for (ShipmentContainerHeader shipmentContainerHeader : shipmentContainerHeaderList) {
... ... @@ -353,9 +338,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
353 338 *
354 339 * @return
355 340 */
  341 + @AutoLog(value = "同时创建出库任务和AGV任务", operateType = 2)
356 342 @ApiOperation(value = "同时创建出库任务和AGV任务", notes = "同时创建出库任务和AGV任务")
357 343 @PostMapping("/createShipmentTaskAndAgvTask")
358   - @ResponseBody
359 344 public Result createShipmentTaskAndAgvTask(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
360 345 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
361 346 String lockKey = warehouseCode;
... ... @@ -375,9 +360,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
375 360 *
376 361 * @return
377 362 */
  363 + @AutoLog(value = "根据序列号扣减预配盘的库存", operateType = 4)
378 364 @ApiOperation(value = "根据序列号扣减预配盘的库存", notes = "根据序列号扣减预配盘的库存")
379 365 @PostMapping("/reduceInventoryDetailBySn")
380   - @ResponseBody
381 366 public Result reduceInventoryDetailBySn(@RequestParam(name = "snList", required = true) String snList, HttpServletRequest req) {
382 367 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
383 368 String lockKey = warehouseCode;
... ... @@ -396,9 +381,9 @@ public class ShipmentCombinationController extends HuahengBaseController {
396 381 *
397 382 * @return
398 383 */
  384 + @AutoLog(value = "出库复核", operateType = 3)
399 385 @ApiOperation(value = "出库复核", notes = "出库复核")
400 386 @PostMapping("/shipmentCheck")
401   - @ResponseBody
402 387 public Result shipmentCheck(@RequestBody List<ShipmentContainerAdvice> shipmentContainerAdviceList, HttpServletRequest req) {
403 388 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
404 389 String lockKey = warehouseCode;
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
  View file @91d12a9
... ... @@ -115,7 +115,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
115 115 return shipmentHeaderService.saveShipmentHeader(shipmentHeader);
116 116 }
117 117  
118   - @AutoLog(value = "出库单-单据合并")
  118 + @AutoLog(value = "出库单-单据合并", operateType = 3)
119 119 @ApiOperation(value = "出库单-单据合并", notes = "出库单-单据合并")
120 120 @PostMapping(value = "/mergeShipment")
121 121 @RequiresPermissions("shipmentHeader:mergeShipment")
... ... @@ -411,7 +411,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
411 411 * @param shipmentHeader
412 412 * @return
413 413 */
414   - @AutoLog(value = "回传出库单")
  414 + @AutoLog(value = "回传出库单", operateType = 3)
415 415 @ApiOperation(value = "回传出库单", notes = "回传出库单")
416 416 @RequiresPermissions("shipmentHeader:back")
417 417 @RequestMapping(value = "/backErpShipment", method = {RequestMethod.PUT, RequestMethod.POST})
... ... @@ -419,10 +419,9 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
419 419 return huahengMultiHandlerService.backShipment(shipmentHeader);
420 420 }
421 421  
422   - @AutoLog(value = "PDA出库-呼叫料盒")
  422 + @AutoLog(value = "PDA出库-呼叫料盒", operateType = 4)
423 423 @ApiOperation(value = "PDA出库-呼叫料盒", notes = "创建空的分拣出库任务，并返回任务id")
424 424 @PostMapping("/callbox")
425   - @ResponseBody
426 425 @ApiLogger(apiName = "PDA出库-呼叫料盒", from = "PDA")
427 426 public Result<TaskHeader> callBox(@RequestBody CallBoxBean bean, HttpServletRequest req) {
428 427 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
... ... @@ -432,10 +431,9 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
432 431 return result;
433 432 }
434 433  
435   - @AutoLog(value = "PDA出库-批量呼叫料盒")
  434 + @AutoLog(value = "PDA出库-批量呼叫料盒",operateType = 4)
436 435 @ApiOperation(value = "PDA出库-批量呼叫料盒", notes = "创建空的分拣出库任务，并返回任务id")
437 436 @PostMapping("/batchCallBox")
438   - @ResponseBody
439 437 @ApiLogger(apiName = "PDA出库-呼叫料盒", from = "PDA")
440 438 public Result<TaskHeader> batchCallBox(@RequestBody List<CallBoxBean> callBoxBeanList, HttpServletRequest req) {
441 439 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
... ... @@ -448,10 +446,9 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
448 446 return result;
449 447 }
450 448  
451   - @AutoLog(value = "快速出库")
  449 + @AutoLog(value = "快速出库",operateType = 4)
452 450 @ApiOperation(value = "快速出库", notes = "快速出库")
453 451 @PostMapping("/autoShipment")
454   - @ResponseBody
455 452 public Result<TaskHeader> autoShipment(@RequestBody ShipmentHeader shipmentHeader, HttpServletRequest req) {
456 453 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
457 454 String shipmentCode = shipmentHeader.getCode();
... ... @@ -459,10 +456,9 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
459 456 return result;
460 457 }
461 458  
462   - @AutoLog(value = "自动预配盘出库")
  459 + @AutoLog(value = "自动预配盘出库",operateType = 4)
463 460 @ApiOperation(value = "自动预配盘出库", notes = "自动预配盘出库")
464 461 @PostMapping("/autoShipmentAdvice")
465   - @ResponseBody
466 462 public Result<TaskHeader> autoShipmentAdvice(@RequestBody ShipmentHeader shipmentHeader, HttpServletRequest req) {
467 463 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
468 464 String shipmentCode = shipmentHeader.getCode();
... ... @@ -470,10 +466,9 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
470 466 return result;
471 467 }
472 468  
473   - @AutoLog(value = "平库路径指引")
  469 + @AutoLog(value = "平库路径指引", operateType = 4)
474 470 @ApiOperation(value = "平库路径指引", notes = "平库路径指引")
475 471 @PostMapping("/autoFlatShipmentAdvice")
476   - @ResponseBody
477 472 public Result<TaskHeader> autoFlatShipmentAdvice(@RequestBody ShipmentHeader shipmentHeader, HttpServletRequest req) {
478 473 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
479 474 String shipmentCode = shipmentHeader.getCode();
... ... @@ -481,10 +476,9 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
481 476 return result;
482 477 }
483 478  
484   - @AutoLog(value = "备货")
  479 + @AutoLog(value = "备货",operateType = 4)
485 480 @ApiOperation(value = "备货", notes = "备货")
486 481 @PostMapping("/stockUp")
487   - @ResponseBody
488 482 public Result stockUp(@RequestBody List<ShipmentHeader> shipmentHeaderList, HttpServletRequest req) {
489 483 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
490 484 Result result = huahengMultiHandlerService.stockUp(shipmentHeaderList, warehouseCode);
... ... @@ -498,7 +492,6 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
498 492 */
499 493 @ApiOperation(value = "获取出库单物料库存信息", notes = "获取出库单物料库存信息")
500 494 @PostMapping(value = "/getInventoryByShipmentDetail")
501   - @ResponseBody
502 495 public Result<?> getInventoryByShipmentDetail(@RequestBody ShipmentInventory shipmentInventory, HttpServletRequest req) {
503 496 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
504 497 ShipmentHeader shipmentHeader = shipmentHeaderService.getById(shipmentInventory.getShipmentId());
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
  View file @91d12a9
... ... @@ -189,7 +189,7 @@ public class CycleCountDetailController extends HuahengBaseController {
189 189 /**
190 190 * 生成单条盘点任务
191 191 */
192   - @AutoLog(value = "生成单条盘点任务")
  192 + @AutoLog(value = "生成单条盘点任务", operateType = 2)
193 193 @ApiOperation(value = "生成单条盘点任务", notes = "生成单条盘点任务")
194 194 @PostMapping(value = "/createCycleCoutTaskByDetailId")
195 195 public Result createCycleCoutTaskByDetailId(@RequestParam(name = "cycleId") Integer cycleId, @RequestParam(name = "toPort") String toPort,
... ... @@ -207,7 +207,6 @@ public class CycleCountDetailController extends HuahengBaseController {
207 207 */
208 208 @ApiOperation(value = "盘点-选择分拣口", notes = "盘点-选择分拣口")
209 209 @PostMapping("/inventoryPort")
210   - @ResponseBody
211 210 public Result inventoryPort(@RequestBody CycleCountDetail cycleCountDetail, HttpServletRequest req) {
212 211 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
213 212 String fromLocationCode = cycleCountDetail.getLocationCode();
... ... @@ -238,7 +237,7 @@ public class CycleCountDetailController extends HuahengBaseController {
238 237 /**
239 238 * 添加盘点
240 239 */
241   - @AutoLog(value = "盘点明细新增")
  240 + @AutoLog(value = "盘点明细新增", operateType = 2)
242 241 @ApiOperation(value = "盘点明细新增-根据选取的库存新增", notes = "盘点明细新增-根据选取的库存新增")
243 242 @PostMapping(value = "/createCycleCountDetailByInventory")
244 243 public Result<?> createCycleCountDetailByInventory(@RequestBody CycleCountDetailByInventoryDto cycleCountDetailByInventoryDto) {
... ... @@ -268,8 +267,9 @@ public class CycleCountDetailController extends HuahengBaseController {
268 267 * 实盘登记
269 268 * @return
270 269 */
  270 + @AutoLog(value = "实盘登记", operateType = 3)
  271 + @ApiOperation(value = "实盘登记", notes = "盘点明细新增-实盘登记")
271 272 @PostMapping("/confirmGapQty")
272   - @ResponseBody
273 273 public Result confirmGapQty(@RequestBody Map<String, String> map) {
274 274 String id = map.get("id");
275 275 String countedQty = map.get("countedQty");
... ... @@ -281,8 +281,9 @@ public class CycleCountDetailController extends HuahengBaseController {
281 281 * 实盘登记
282 282 * @return
283 283 */
  284 + @AutoLog(value = "实盘登记", operateType = 3)
  285 + @ApiOperation(value = "实盘登记", notes = "盘点明细新增-实盘登记")
284 286 @PostMapping("/batchConfirmGapQty")
285   - @ResponseBody
286 287 public Result batchConfirmGapQty(@RequestBody List<CycleCountDetailChild> cycleCountDetailChildList) {
287 288 if (CollectionUtils.isEmpty(cycleCountDetailChildList)) {
288 289 return Result.error("批量实盘登记失败参数为空");
... ... @@ -327,7 +328,6 @@ public class CycleCountDetailController extends HuahengBaseController {
327 328 }
328 329  
329 330 @PostMapping("/listCycleDetailChildByDetailId")
330   - @ResponseBody
331 331 public Result listCycleDetailChildByDetailId(@RequestBody CycleCountDetail cycleCountDetail) {
332 332 LambdaQueryWrapper<CycleCountDetailChild> cycleCountDetailChildLambdaQueryWrapper = Wrappers.lambdaQuery();
333 333 cycleCountDetailChildLambdaQueryWrapper.eq(CycleCountDetailChild::getCycleCountDetailid, cycleCountDetail.getId());
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/controller/AgvTaskController.java
  View file @91d12a9
... ... @@ -153,7 +153,7 @@ public class AgvTaskController extends JeecgController&lt;AgvTask, IAgvTaskService&gt;
153 153 /**
154 154 * 执行任务
155 155 */
156   - @AutoLog(value = "AGV任务-执行任务")
  156 + @AutoLog(value = "AGV任务-执行任务", operateType = 3)
157 157 @ApiOperation(value = "AGV任务-执行任务", notes = "AGV任务-执行任务")
158 158 @PostMapping("/execute")
159 159 @RequiresPermissions("agvTask:executeTask")
... ... @@ -165,7 +165,7 @@ public class AgvTaskController extends JeecgController&lt;AgvTask, IAgvTaskService&gt;
165 165 /**
166 166 * 完成任务
167 167 */
168   - @AutoLog(value = "AGV任务-完成任务")
  168 + @AutoLog(value = "AGV任务-完成任务", operateType = 3)
169 169 @ApiOperation(value = "AGV任务-完成任务", notes = "AGV任务-完成任务")
170 170 @PostMapping("/complete")
171 171 @RequiresPermissions("agvTask:completeTask")
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
  View file @91d12a9
... ... @@ -355,7 +355,7 @@ public class TaskHeaderController extends HuahengBaseController {
355 355 /**
356 356 * 完成任务
357 357 */
358   - @AutoLog(value = "任务表-完成任务")
  358 + @AutoLog(value = "任务表-完成任务", operateType = 3)
359 359 @ApiOperation(value = "任务表-完成任务", notes = "任务表-完成任务")
360 360 @PostMapping("/completeTaskByWMS")
361 361 @RequiresPermissions("taskHeader:completeTask")
... ... @@ -376,10 +376,9 @@ public class TaskHeaderController extends HuahengBaseController {
376 376 /**
377 377 * 取消任务
378 378 */
379   - @AutoLog(value = "任务表-取消任务")
  379 + @AutoLog(value = "任务表-取消任务", operateType = 1)
380 380 @ApiOperation(value = "任务表-取消任务", notes = "任务表-取消任务")
381 381 @PostMapping("/cancelTask")
382   - @ResponseBody
383 382 @RequiresPermissions("taskHeader:cancelTask")
384 383 public Result cancelTask(@RequestParam(name = "ids", required = true) String ids) {
385 384 if (StringUtils.isEmpty(ids)) {
... ... @@ -408,10 +407,9 @@ public class TaskHeaderController extends HuahengBaseController {
408 407 /**
409 408 * 任务切换
410 409 */
411   - @AutoLog(value = "任务表-任务切换")
  410 + @AutoLog(value = "任务表-任务切换", operateType = 3)
412 411 @ApiOperation(value = "任务表-任务切换", notes = "任务表-任务切换")
413 412 @PostMapping("/switchTask")
414   - @ResponseBody
415 413 @RequiresPermissions("taskHeader:switchTask")
416 414 public Result switchTask(@RequestParam(name = "ids", required = true) String ids) {
417 415 if (StringUtils.isEmpty(ids)) {
... ... @@ -433,7 +431,7 @@ public class TaskHeaderController extends HuahengBaseController {
433 431 /**
434 432 * 执行任务
435 433 */
436   - @AutoLog(value = "任务表-执行任务")
  434 + @AutoLog(value = "任务表-执行任务", operateType = 3)
437 435 @ApiOperation(value = "任务表-执行任务", notes = "任务表-执行任务")
438 436 @PostMapping("/execute")
439 437 @RequiresPermissions("taskHeader:executeTask")
... ... @@ -448,7 +446,7 @@ public class TaskHeaderController extends HuahengBaseController {
448 446 /**
449 447 * 创建空托入库任务
450 448 */
451   - @AutoLog(value = "任务表-创建空托入库任务")
  449 + @AutoLog(value = "任务表-创建空托入库任务", operateType = 2)
452 450 @ApiOperation(value = "任务表-创建空托入库任务", notes = "任务表-创建空托入库任务")
453 451 @PostMapping("/createEmptyIn")
454 452 @RequiresPermissions("taskHeader:emptyIn")
... ... @@ -470,7 +468,7 @@ public class TaskHeaderController extends HuahengBaseController {
470 468 /**
471 469 * 创建空托出库任务
472 470 */
473   - @AutoLog(value = "任务表-创建空托出库任务")
  471 + @AutoLog(value = "任务表-创建空托出库任务", operateType = 2)
474 472 @ApiOperation(value = "任务表-创建空托出库任务", notes = "任务表-创建空托出库任务")
475 473 @RequiresPermissions("taskHeader:emptyOut")
476 474 @PostMapping("/createEmptyOut")
... ... @@ -491,7 +489,7 @@ public class TaskHeaderController extends HuahengBaseController {
491 489 /**
492 490 * 创建空托出库任务
493 491 */
494   - @AutoLog(value = "任务表-创建空托出库任务")
  492 + @AutoLog(value = "任务表-创建空托出库任务", operateType = 1)
495 493 @ApiOperation(value = "任务表-创建空托出库任务", notes = "任务表-创建空托出库任务")
496 494 @RequiresPermissions("taskHeader:emptyOut")
497 495 @PostMapping("/batchCreateEmptyOut")
... ... @@ -513,7 +511,7 @@ public class TaskHeaderController extends HuahengBaseController {
513 511 /**
514 512 * 创建移库任务
515 513 */
516   - @AutoLog(value = "任务表-创建移库任务")
  514 + @AutoLog(value = "任务表-创建移库任务",operateType = 2)
517 515 @ApiOperation(value = "任务表-创建移库任务", notes = "任务表-创建移库任务")
518 516 @RequiresPermissions("taskHeader:transfer")
519 517 @PostMapping("/createTransferTask")
... ... @@ -534,7 +532,7 @@ public class TaskHeaderController extends HuahengBaseController {
534 532 /**
535 533 * 创建出库查看任务
536 534 */
537   - @AutoLog(value = "任务表-创建出库查看任务")
  535 + @AutoLog(value = "任务表-创建出库查看任务", operateType = 2)
538 536 @ApiOperation(value = "任务表-创建出库查看任务", notes = "任务表-创建出库查看任务")
539 537 @PostMapping("/batchCreateCheckOut")
540 538 @RequiresPermissions("taskHeader:checkOut")
... ... @@ -558,7 +556,7 @@ public class TaskHeaderController extends HuahengBaseController {
558 556 /**
559 557 * 创建出库查看任务
560 558 */
561   - @AutoLog(value = "任务表-创建出库查看任务")
  559 + @AutoLog(value = "任务表-创建出库查看任务", operateType = 1)
562 560 @ApiOperation(value = "任务表-创建出库查看任务", notes = "任务表-创建出库查看任务")
563 561 @PostMapping("/createCheckOutTask")
564 562 @RequiresPermissions("taskHeader:checkOut")
... ... @@ -579,7 +577,7 @@ public class TaskHeaderController extends HuahengBaseController {
579 577 /**
580 578 * 创建跨站任务
581 579 */
582   - @AutoLog(value = "任务表-创建跨站任务")
  580 + @AutoLog(value = "任务表-创建跨站任务", operateType = 1)
583 581 @ApiOperation(value = "任务表-创建跨站任务", notes = "任务表-创建跨站任务")
584 582 @RequiresPermissions("taskHeader:overStation")
585 583 @PostMapping("/createOverStationTask")
... ... @@ -601,7 +599,7 @@ public class TaskHeaderController extends HuahengBaseController {
601 599 /**
602 600 * 创建空托盘组入库
603 601 */
604   - @AutoLog(value = "任务表-创建空托盘组入库")
  602 + @AutoLog(value = "任务表-创建空托盘组入库", operateType = 1)
605 603 @ApiOperation(value = "任务表-创建空托盘组入库", notes = "任务表-创建空托盘组入库")
606 604 @PostMapping("/createManyEmptyIn")
607 605 @RequiresPermissions("taskHeader:manyEmptyIn")
... ... @@ -622,7 +620,7 @@ public class TaskHeaderController extends HuahengBaseController {
622 620 /**
623 621 * 创建空托盘组出库
624 622 */
625   - @AutoLog(value = "任务表-创建空托盘组出库")
  623 + @AutoLog(value = "任务表-创建空托盘组出库", operateType = 1)
626 624 @ApiOperation(value = "任务表-创建空托盘组出库", notes = "任务表-创建空托盘组出库")
627 625 @RequiresPermissions("taskHeader:manyEmptyOut")
628 626 @PostMapping("/createManyEmptyOut")
... ... @@ -646,7 +644,6 @@ public class TaskHeaderController extends HuahengBaseController {
646 644 */
647 645 @ApiOperation(value = "任务表-选择整出口", notes = "任务表-选择整出口")
648 646 @PostMapping("/selectOutPort")
649   - @ResponseBody
650 647 public Result selectOutPort(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
651 648 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
652 649 String containerCode = taskHeader.getContainerCode();
... ... @@ -688,7 +685,6 @@ public class TaskHeaderController extends HuahengBaseController {
688 685 */
689 686 @ApiOperation(value = "任务表-选择整出口", notes = "任务表-选择整出口")
690 687 @PostMapping("/selectEmptyOutPort")
691   - @ResponseBody
692 688 public Result selectEmptyOutPort(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
693 689 String zoneCode = taskHeader.getZoneCode();
694 690 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
... ... @@ -713,7 +709,6 @@ public class TaskHeaderController extends HuahengBaseController {
713 709 */
714 710 @ApiOperation(value = "任务表-选择空托盘组出库整出口", notes = "任务表-选择空托盘组出库整出口")
715 711 @PostMapping("/selectManyEmptyOutPort")
716   - @ResponseBody
717 712 public Result selectManyEmptyOutPort(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
718 713 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
719 714 String containerCode = taskHeader.getContainerCode();
... ... @@ -755,7 +750,6 @@ public class TaskHeaderController extends HuahengBaseController {
755 750 */
756 751 @ApiOperation(value = "任务表-选择分拣口", notes = "任务表-选择分拣口")
757 752 @PostMapping("/selectPickPort")
758   - @ResponseBody
759 753 public Result selectPickPort(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
760 754 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
761 755 String containerCode = taskHeader.getContainerCode();
... ... @@ -797,7 +791,6 @@ public class TaskHeaderController extends HuahengBaseController {
797 791 */
798 792 @ApiOperation(value = "任务表-选择站台", notes = "任务表-选择站台")
799 793 @PostMapping("/selectPort")
800   - @ResponseBody
801 794 public Result selectPort(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
802 795 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
803 796 String containerCode = taskHeader.getContainerCode();
... ... @@ -821,10 +814,9 @@ public class TaskHeaderController extends HuahengBaseController {
821 814 * 修复空出的数据
822 815 * @return
823 816 */
824   - @AutoLog(value = "修复空出的数据")
  817 + @AutoLog(value = "修复空出的数据", operateType = 3)
825 818 @PostMapping("/handleEmptyOut")
826 819 @ApiOperation("修复空出的数据")
827   - @ResponseBody
828 820 @ApiLogger(apiName = "修复空出的数据", from = "WMS")
829 821 public Result handleEmptyOut(@RequestParam(name = "id", required = true) String id) {
830 822 Result result = handleMultiProcess("handleEmptyOut", new MultiProcessListener() {
... ... @@ -841,10 +833,9 @@ public class TaskHeaderController extends HuahengBaseController {
841 833 * 修复重入的数据
842 834 * @return
843 835 */
844   - @AutoLog(value = "修复重入的数据")
  836 + @AutoLog(value = "修复重入的数据", operateType = 3)
845 837 @PostMapping("/handleDoubleIn")
846 838 @ApiOperation("修复重入的数据")
847   - @ResponseBody
848 839 @ApiLogger(apiName = "修复重入的数据", from = "WMS")
849 840 public Result handleDoubleIn(@RequestParam(name = "id", required = true) String id) {
850 841 Result result = handleMultiProcess("handleDoubleIn", new MultiProcessListener() {
... ... @@ -861,10 +852,9 @@ public class TaskHeaderController extends HuahengBaseController {
861 852 * 修复取货错的数据
862 853 * @return
863 854 */
864   - @AutoLog(value = "修复取货错的数据")
  855 + @AutoLog(value = "修复取货错的数据", operateType = 3)
865 856 @PostMapping("handlePickupError")
866 857 @ApiOperation("修复取货错的数据")
867   - @ResponseBody
868 858 @ApiLogger(apiName = "修复取货错的数据", from = "WMS")
869 859 public Result handlePickupError(@RequestParam(name = "id", required = true) String id) {
870 860 Result result = handleMultiProcess("handlePickupError", new MultiProcessListener() {
... ... @@ -881,10 +871,9 @@ public class TaskHeaderController extends HuahengBaseController {
881 871 * 快速入库
882 872 * @return
883 873 */
884   - @AutoLog(value = "快速入库")
  874 + @AutoLog(value = "快速入库", operateType = 2)
885 875 @PostMapping("quickReceipt")
886 876 @ApiOperation("快速入库")
887   - @ResponseBody
888 877 public Result quickReceipt(@RequestBody QucikReceiptEntity qucikReceiptEntity, HttpServletRequest req) {
889 878 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
890 879 qucikReceiptEntity.setWarehouseCode(warehouseCode);
... ... @@ -902,10 +891,9 @@ public class TaskHeaderController extends HuahengBaseController {
902 891 * 快速出库
903 892 * @return
904 893 */
905   - @AutoLog(value = "快速出库")
  894 + @AutoLog(value = "快速出库", operateType = 3)
906 895 @PostMapping("quickShipment")
907 896 @ApiOperation("快速出库")
908   - @ResponseBody
909 897 public Result quickShipment(@RequestBody QucikReceiptEntity qucikReceiptEntity, HttpServletRequest req) {
910 898 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
911 899 qucikReceiptEntity.setWarehouseCode(warehouseCode);
... ... @@ -923,10 +911,9 @@ public class TaskHeaderController extends HuahengBaseController {
923 911 * 质检登记
924 912 * @return
925 913 */
926   - @AutoLog(value = "质检登记")
  914 + @AutoLog(value = "质检登记", operateType = 3)
927 915 @PostMapping("qualityRegister")
928 916 @ApiOperation("质检登记")
929   - @ResponseBody
930 917 public Result qualityRegister(@RequestBody TaskDetail taskDetail, HttpServletRequest req) {
931 918 int id = taskDetail.getId();
932 919 BigDecimal qualityfiedQty = taskDetail.getQualityfiedQty();
... ... @@ -946,10 +933,9 @@ public class TaskHeaderController extends HuahengBaseController {
946 933 * 修改优先级
947 934 * @return
948 935 */
949   - @AutoLog(value = "修改优先级")
  936 + @AutoLog(value = "修改优先级", operateType = 3)
950 937 @PostMapping("updatePriority")
951 938 @ApiOperation("修改优先级")
952   - @ResponseBody
953 939 public Result updatePriority(@RequestBody @RequestParam(name = "id") String id, @RequestParam(name = "priority") String priority, HttpServletRequest req) {
954 940 Result result = handleMultiProcess("updatePriority", new MultiProcessListener() {
955 941 @Override
... ...