From ab3b55fd0812b16692b530b7e91f2daee2b4020f Mon Sep 17 00:00:00 2001
From: zf <27208084@qq.com>
Date: Mon, 27 Mar 2023 18:40:51 +0800
Subject: [PATCH] 站台任务看板接口修改，封闭任务类型，任务状态字段给前端
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/MobileController.java | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java | 23 -----------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java | 24 ------------------------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/TaskController.java | 61 -------------------------------------------------------------
4 files changed, 90 insertions(+), 108 deletions(-)
create mode 100644 huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/MobileController.java
delete mode 100644 huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java
delete mode 100644 huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
delete mode 100644 huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/TaskController.java
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/MobileController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/MobileController.java
new file mode 100644
index 0000000..96a1a66
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/MobileController.java
@@ -0,0 +1,90 @@
+package org.jeecg.modules.wms.api.mobile.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import io.swagger.annotations.Api;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.system.entity.SysDictItem;
+import org.jeecg.modules.system.service.impl.SysDictItemServiceImpl;
+import org.jeecg.modules.wms.api.mobile.entity.TvTaskVo;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
+import org.jeecg.modules.wms.task.taskHeader.service.impl.TaskDetailServiceImpl;
+import org.jeecg.modules.wms.task.taskHeader.service.impl.TaskHeaderServiceImpl;
+import org.jeecg.utils.StringUtils;
+import org.jeecg.utils.constant.QuantityConstant;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ */
+@Api(tags = "Mobile")
+@RestController
+@RequestMapping("/api/mobile")
+public class MobileController {
+
+ @Resource
+ private TaskHeaderServiceImpl taskHeaderService;
+
+ @Resource
+ private SysDictItemServiceImpl sysDictItemService;
+
+ @Resource
+ private TaskDetailServiceImpl taskDetailService;
+
+ @GetMapping("taskOfStation")
+ public Result<List<TvTaskVo>> importExcel(String code) {
+ List<String> stationList = new ArrayList<>();
+ if (StringUtils.isNotEmpty(code)) {
+ stationList = Arrays.asList(code.split(","));
+ }
+
+ HashMap<String, String> typeMap = new HashMap<>();
+ typeMap.put("100", "整盘入库");
+ typeMap.put("200", "补充入库");
+ typeMap.put("300", "整盘出库");
+ typeMap.put("400", "分拣出库");
+ typeMap.put("500", "空容器入库");
+ typeMap.put("600", "空容器出库");
+ typeMap.put("700", "盘点");
+ typeMap.put("800", "移库");
+ typeMap.put("900", "出库查看");
+ typeMap.put("1000", "换站");
+ typeMap.put("1100", "空托盘组入库");
+ typeMap.put("1200", "空托盘组出库");
+ typeMap.put("1300", "空托盘组换站");
+
+ HashMap<String, String> statusMap = new HashMap<>();
+ statusMap.put("1", "生成任务");
+ statusMap.put("10", "下发任务");
+ statusMap.put("50", "到达拣选台");
+ statusMap.put("100", "任务完成");
+
+ LambdaQueryWrapper<TaskHeader> hQuery = Wrappers.lambdaQuery();
+ hQuery.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_ARRIVED_STATION)
+ .in(stationList.size() > 0, TaskHeader::getToPortCode, stationList);
+ List<TaskHeader> headers = taskHeaderService.list(hQuery);
+
+ List<TvTaskVo> list = new ArrayList<>();
+ for (TaskHeader header : headers) {
+ header.setUserdef1(typeMap.get(header.getTaskType().toString()));
+ header.setUserdef2(statusMap.get(header.getStatus().toString()));
+ TvTaskVo vo = new TvTaskVo();
+ LambdaQueryWrapper<TaskDetail> dQuery = Wrappers.lambdaQuery();
+ dQuery.eq(TaskDetail::getTaskHeaderId, header.getId());
+ List<TaskDetail> details = taskDetailService.list(dQuery);
+
+ vo.setTaskHeader(header);
+ vo.setTaskDetailList(details);
+ list.add(vo);
+ }
+ return Result.OK("", list);
+ }
+}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java
deleted file mode 100644
index b2283a7..0000000
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.jeecg.modules.wms.api.mobile.controller;
-
-import javax.annotation.Resource;
-
-import org.jeecg.modules.wms.api.mobile.service.IMobileService;
-import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.annotations.Api;
-
-/**
- * PDA入库接口，整合复用PC端service层接口
- */
-@Api(tags = "Mobile")
-@RestController
-@RequestMapping("/mobile/receipt")
-public class ReceiptController extends HuahengBaseController {
-
- @Resource
- private IMobileService mobileService;
-
-}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
deleted file mode 100644
index 49b7759..0000000
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ShipmentController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jeecg.modules.wms.api.mobile.controller;
-
-import javax.annotation.Resource;
-
-import org.jeecg.modules.wms.api.mobile.service.IMobileService;
-import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.annotations.Api;
-
-/**
- * * PDA出库接口，整合复用PC端service层接口
- */
-@Api(tags = "Mobile")
-@RestController
-@RequestMapping("/mobile/shipment")
-public class ShipmentController extends HuahengBaseController {
-
- @Resource
- private IMobileService mobileService;
-
-
-}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/TaskController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/TaskController.java
deleted file mode 100644
index 729c33a..0000000
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/TaskController.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.jeecg.modules.wms.api.mobile.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import io.swagger.annotations.Api;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.wms.api.mobile.entity.TvTaskVo;
-import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail;
-import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
-import org.jeecg.modules.wms.task.taskHeader.service.impl.TaskDetailServiceImpl;
-import org.jeecg.modules.wms.task.taskHeader.service.impl.TaskHeaderServiceImpl;
-import org.jeecg.utils.StringUtils;
-import org.jeecg.utils.constant.QuantityConstant;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- */
-@Api(tags = "Mobile")
-@RestController
-@RequestMapping("/api/mobile/task")
-public class TaskController {
-
- @Resource
- private TaskHeaderServiceImpl taskHeaderService;
-
- @Resource
- private TaskDetailServiceImpl taskDetailService;
-
- @GetMapping("taskOfStation")
- public Result<List<TvTaskVo>> importExcel(String code) {
- List<String> stationList = new ArrayList<>();
- if (StringUtils.isNotEmpty(code)) {
- stationList = Arrays.asList(code.split(","));
- }
-
- LambdaQueryWrapper<TaskHeader> hQuery = Wrappers.lambdaQuery();
- hQuery.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_ARRIVED_STATION)
- .in(stationList.size() > 0, TaskHeader::getToPortCode, stationList);
- List<TaskHeader> headers = taskHeaderService.list(hQuery);
-
- List<TvTaskVo> list = new ArrayList<>();
- for (TaskHeader header : headers) {
- TvTaskVo vo = new TvTaskVo();
- LambdaQueryWrapper<TaskDetail> dQuery = Wrappers.lambdaQuery();
- dQuery.eq(TaskDetail::getTaskHeaderId, header.getId());
- List<TaskDetail> details = taskDetailService.list(dQuery);
-
- vo.setTaskHeader(header);
- vo.setTaskDetailList(details);
- list.add(vo);
- }
- return Result.OK("", list);
- }
-}
--
libgit2 0.22.2