From 4fb06a58ed5df46f29af1e9fa65cfd40335263ad Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 18 一月 2025 17:06:18 +0800
Subject: [PATCH] # 6. 大屏添加作业类型 (全盘，还是分拣 IOType) 10.平库出库时，当前平库ID是写死在Sql里，需修改 11.平库出库没有判断是否预约出库，且生成拣货单时没有锁定库存,需确认是否考虑回库问题 26. 已拣过货的任务明细，可以再次拣货，拣货明细需添加一个拣货状态 47. 确认发货前，需判断是否已绑定至集货区 48. CTU出库后，库位103不再删除原有库位信息
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java | 97 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java
index afa390b..a7b9a62 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java
@@ -1,48 +1,49 @@
-package com.zy.asrs.wms.asrs.controller.statistics;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkCountIn;
-import com.zy.asrs.wms.asrs.mapper.statistics.ViewWorkCountInMapper;
-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.Map;
-
-@RestController
-@RequestMapping("/api")
-public class ViewWorkCountInController extends BaseController {
-
- @Autowired
- private ViewWorkCountInMapper viewWorkCountInMapper;
-
- @PreAuthorize("hasAuthority('asrs:viewWorkCountIn:list')")
- @PostMapping("/viewWorkCountIn/page")
- @CacheData(tableName = {"view_work_count_in", "man_task_log", "man_task_detl_log"})
- public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<ViewWorkCountIn, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkCountIn.class);
- QueryWrapper<ViewWorkCountIn> queryWrapper = pageParam.buildWrapper(true, wrapper -> wrapper.orderByDesc("oneday"));
- PageParam<ViewWorkCountIn, BaseParam> page = viewWorkCountInMapper.selectPage(pageParam, queryWrapper);
- return R.ok().add(page);
- }
-
- @PreAuthorize("hasAuthority('asrs:viewWorkCountIn:list')")
- @PostMapping("/viewWorkCountIn/export")
- @CacheData(tableName = {"view_work_count_in", "man_task_log", "man_task_detl_log"})
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- QueryWrapper<ViewWorkCountIn> wrapper = new QueryWrapper<>();
- ExcelUtil.build(ExcelUtil.create(viewWorkCountInMapper.selectList(wrapper), ViewWorkCountIn.class), response);
- }
-
-}
+package com.zy.asrs.wms.asrs.controller.statistics;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.statistics.ViewWorkCountIn;
+import com.zy.asrs.wms.asrs.mapper.statistics.ViewWorkCountInMapper;
+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.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ViewWorkCountInController extends BaseController {
+
+ @Autowired
+ private ViewWorkCountInMapper viewWorkCountInMapper;
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkCountIn:list')")
+ @PostMapping("/viewWorkCountIn/page")
+ @CacheData(tableName = {"view_work_count_in", "man_task_log", "man_task_detl_log"})
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkCountIn, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkCountIn.class);
+ QueryWrapper<ViewWorkCountIn> queryWrapper = pageParam.buildWrapper(true, wrapper -> wrapper.orderByDesc("oneday"));
+ PageParam<ViewWorkCountIn, BaseParam> page = viewWorkCountInMapper.selectPage(pageParam, queryWrapper);
+ return R.ok().add(page);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:viewWorkCountIn:list')")
+ @PostMapping("/viewWorkCountIn/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkCountIn, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkCountIn.class);
+ QueryWrapper<ViewWorkCountIn> queryWrapper = pageParam.buildWrapper(true, wrapper -> wrapper.orderByDesc("oneday"));
+ ExcelUtil.build(ExcelUtil.create(viewWorkCountInMapper.selectList(queryWrapper), ViewWorkCountIn.class), response);
+ }
+
+}
--
Gitblit v1.9.1