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/statistics/ViewWorkOutController.java | 120 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java
index 7ba92cf..5e690de 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java
@@ -1,60 +1,60 @@
-package com.zy.asrs.wms.asrs.controller.statistics;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.asrs.entity.TaskDetlFieldLog;
-import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkOut;
-import com.zy.asrs.wms.asrs.mapper.statistics.ViewWorkOutMapper;
-import com.zy.asrs.wms.asrs.service.TaskDetlFieldLogService;
-import com.zy.asrs.wms.common.annotation.CacheData;
-import com.zy.asrs.wms.common.domain.BaseParam;
-import com.zy.asrs.wms.common.domain.PageParam;
-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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api")
-public class ViewWorkOutController extends BaseController {
-
- @Autowired
- private ViewWorkOutMapper viewWorkOutMapper;
- @Autowired
- private TaskDetlFieldLogService taskDetlFieldLogService;
-
- @PreAuthorize("hasAuthority('asrs:viewWorkOut:list')")
- @PostMapping("/viewWorkOut/page")
- @CacheData(tableName = {"view_work_out", "man_task_log", "man_task_detl_log", "man_task_detl_field_log"})
- public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<ViewWorkOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkOut.class);
- QueryWrapper<ViewWorkOut> queryWrapper = pageParam.buildWrapper(true);
- PageParam<ViewWorkOut, BaseParam> page = viewWorkOutMapper.selectPage(pageParam, queryWrapper);
- List<ViewWorkOut> records = page.getRecords();
- for (ViewWorkOut record : records) {
- List<TaskDetlFieldLog> list = taskDetlFieldLogService.list(new LambdaQueryWrapper<TaskDetlFieldLog>().eq(TaskDetlFieldLog::getDetlId, record.getId()));
- record.syncField(list);
- }
- return R.ok().add(page);
- }
-
- @PreAuthorize("hasAuthority('asrs:viewWorkOut:list')")
- @PostMapping("/viewWorkOut/export")
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<ViewWorkOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkOut.class);
- QueryWrapper<ViewWorkOut> queryWrapper = pageParam.buildWrapper(true);
- ExcelUtil.build(ExcelUtil.create(viewWorkOutMapper.selectList(queryWrapper), ViewWorkOut.class), response);
- }
-
-}
+package com.zy.asrs.wms.asrs.controller.statistics;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.TaskDetlFieldLog;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkOut;
+import com.zy.asrs.wms.asrs.mapper.statistics.ViewWorkOutMapper;
+import com.zy.asrs.wms.asrs.service.TaskDetlFieldLogService;
+import com.zy.asrs.wms.common.annotation.CacheData;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ViewWorkOutController extends BaseController {
+
+ @Autowired
+ private ViewWorkOutMapper viewWorkOutMapper;
+ @Autowired
+ private TaskDetlFieldLogService taskDetlFieldLogService;
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkOut:list')")
+ @PostMapping("/viewWorkOut/page")
+ @CacheData(tableName = {"view_work_out", "man_task_log", "man_task_detl_log", "man_task_detl_field_log"})
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkOut.class);
+ QueryWrapper<ViewWorkOut> queryWrapper = pageParam.buildWrapper(true);
+ PageParam<ViewWorkOut, BaseParam> page = viewWorkOutMapper.selectPage(pageParam, queryWrapper);
+ List<ViewWorkOut> records = page.getRecords();
+ for (ViewWorkOut record : records) {
+ List<TaskDetlFieldLog> list = taskDetlFieldLogService.list(new LambdaQueryWrapper<TaskDetlFieldLog>().eq(TaskDetlFieldLog::getDetlId, record.getId()));
+ record.syncField(list);
+ }
+ return R.ok().add(page);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkOut:list')")
+ @PostMapping("/viewWorkOut/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkOut.class);
+ QueryWrapper<ViewWorkOut> queryWrapper = pageParam.buildWrapper(true);
+ ExcelUtil.build(ExcelUtil.create(viewWorkOutMapper.selectList(queryWrapper), ViewWorkOut.class), response);
+ }
+
+}
--
Gitblit v1.9.1