From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java | 232 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 124 insertions(+), 108 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
index 7f193c6..a341b8b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
@@ -1,108 +1,124 @@
-package com.zy.asrs.wms.asrs.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.common.annotation.OperationLog;
-import com.zy.asrs.wms.common.domain.BaseParam;
-import com.zy.asrs.wms.common.domain.KeyValVo;
-import com.zy.asrs.wms.common.domain.PageParam;
-import com.zy.asrs.wms.asrs.entity.OrderDetlLog;
-import com.zy.asrs.wms.asrs.service.OrderDetlLogService;
-import com.zy.asrs.wms.system.controller.BaseController;
-import com.zy.asrs.wms.utils.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api")
-public class OrderDetlLogController extends BaseController {
-
- @Autowired
- private OrderDetlLogService orderDetlLogService;
-
- @PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
- @PostMapping("/orderDetlLog/page")
- public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<OrderDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetlLog.class);
- return R.ok().add(orderDetlLogService.page(pageParam, pageParam.buildWrapper(true)));
- }
-
- @PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
- @PostMapping("/orderDetlLog/list")
- public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(orderDetlLogService.list());
- }
-
- @PreAuthorize("hasAuthority('asrs:orderDetl:list')")
- @GetMapping("/orderDetlLog/orderId/{orderId}")
- public R list(@PathVariable("orderId") Long orderId) {
- return R.ok().add(orderDetlLogService.getOrderDetlByOrderId(orderId));
- }
-
- @PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
- @GetMapping("/orderDetlLog/{id}")
- public R get(@PathVariable("id") Long id) {
- return R.ok().add(orderDetlLogService.getById(id));
- }
-
- @PreAuthorize("hasAuthority('asrs:orderDetlLog:save')")
- @OperationLog("娣诲姞璁㈠崟鏄庣粏鍘嗗彶绠＄悊")
- @PostMapping("/orderDetlLog/save")
- public R save(@RequestBody OrderDetlLog orderDetlLog) {
- if (!orderDetlLogService.save(orderDetlLog)) {
- return R.error("娣诲姞澶辫触");
- }
- return R.ok("娣诲姞鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:orderDetlLog:update')")
- @OperationLog("淇敼璁㈠崟鏄庣粏鍘嗗彶绠＄悊")
- @PostMapping("/orderDetlLog/update")
- public R update(@RequestBody OrderDetlLog orderDetlLog) {
- if (!orderDetlLogService.updateById(orderDetlLog)) {
- return R.error("淇敼澶辫触");
- }
- return R.ok("淇敼鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:orderDetlLog:remove')")
- @OperationLog("鍒犻櫎璁㈠崟鏄庣粏鍘嗗彶绠＄悊")
- @PostMapping("/orderDetlLog/remove/{ids}")
- public R remove(@PathVariable Long[] ids) {
- if (!orderDetlLogService.removeByIds(Arrays.asList(ids))) {
- return R.error("鍒犻櫎澶辫触");
- }
- return R.ok("鍒犻櫎鎴愬姛");
- }
-
- @PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
- @PostMapping("/orderDetlLog/query")
- public R query(@RequestParam(required = false) String condition) {
- List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<OrderDetlLog> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(OrderDetlLog::getId, condition);
- }
- orderDetlLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getId()))
- );
- return R.ok().add(vos);
- }
-
- @PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
- @PostMapping("/orderDetlLog/export")
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(orderDetlLogService.list(), OrderDetlLog.class), response);
- }
-
-}
+package com.zy.asrs.wms.asrs.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.OrderDetl;
+import com.zy.asrs.wms.common.annotation.CacheData;
+import com.zy.asrs.wms.common.annotation.OperationLog;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.KeyValVo;
+import com.zy.asrs.wms.common.domain.PageParam;
+import com.zy.asrs.wms.asrs.entity.OrderDetlLog;
+import com.zy.asrs.wms.asrs.service.OrderDetlLogService;
+import com.zy.asrs.wms.system.controller.BaseController;
+import com.zy.asrs.wms.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@RestController
+@RequestMapping("/api")
+public class OrderDetlLogController extends BaseController {
+
+ @Autowired
+ private OrderDetlLogService orderDetlLogService;
+
+ @PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
+ @PostMapping("/orderDetlLog/page")
+ @CacheData(tableName = {"man_order_detl_log"})
+ public R page(@RequestBody Map<String, Object> map) {
+ if (!Objects.isNull(map.get("orderType"))) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetl, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetl.class);
+ QueryWrapper<OrderDetl> queryWrapper = pageParam.buildWrapper(true);
+ IPage<OrderDetl> detls = orderDetlLogService.pageByType(pageParam, queryWrapper);
+ return R.ok().add(detls);
+ } else {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetlLog.class);
+ return R.ok().add(orderDetlLogService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
+ @PostMapping("/orderDetlLog/list")
+ @CacheData(tableName = {"man_order_detl_log"})
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(orderDetlLogService.list());
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderDetl:list')")
+ @GetMapping("/orderDetlLog/orderId/{orderId}")
+ @CacheData(tableName = {"man_order_detl_log"})
+ public R list(@PathVariable("orderId") String orderId) {
+ return R.ok().add(orderDetlLogService.getOrderDetlByOrderId(orderId));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
+ @GetMapping("/orderDetlLog/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(orderDetlLogService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderDetlLog:save')")
+ @OperationLog("娣诲姞璁㈠崟鏄庣粏鍘嗗彶绠＄悊")
+ @PostMapping("/orderDetlLog/save")
+ public R save(@RequestBody OrderDetlLog orderDetlLog) {
+ if (!orderDetlLogService.save(orderDetlLog)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderDetlLog:update')")
+ @OperationLog("淇敼璁㈠崟鏄庣粏鍘嗗彶绠＄悊")
+ @PostMapping("/orderDetlLog/update")
+ public R update(@RequestBody OrderDetlLog orderDetlLog) {
+ if (!orderDetlLogService.updateById(orderDetlLog)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderDetlLog:remove')")
+ @OperationLog("鍒犻櫎璁㈠崟鏄庣粏鍘嗗彶绠＄悊")
+ @PostMapping("/orderDetlLog/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!orderDetlLogService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
+ @PostMapping("/orderDetlLog/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<OrderDetlLog> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(OrderDetlLog::getId, condition);
+ }
+ orderDetlLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
+ @PostMapping("/orderDetlLog/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetlLog.class);
+ List<OrderDetlLog> data = orderDetlLogService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, OrderDetlLog.class), response);
+ }
+
+}
--
Gitblit v1.9.1