From 296f1c190847ebefc779211320704ce502fa10d2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 14:42:08 +0800
Subject: [PATCH] #修改 1. 新增任务档 2. 新增任务档明细 3. 修改组拖接口源
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java | 110 +++
rsf-server/src/main/resources/mapper/manager/TaskItemLogMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskLogMapper.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 30
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 35 +
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskLogService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskItemServiceImpl.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 250 ++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 294 +++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskItemLogServiceImpl.java | 12
rsf-server/src/main/resources/mapper/manager/TaskMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java | 8
rsf-server/src/main/resources/mapper/manager/TaskItemMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 33 -
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskMapper.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskItemMapper.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 47 +
rsf-server/src/main/resources/mapper/manager/TaskLogMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java | 110 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java | 302 +++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java | 258 ++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemLogController.java | 110 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskItemService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskLogServiceImpl.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskItemLogMapper.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskItemLogService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 110 +++
32 files changed, 1,812 insertions(+), 45 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
index 4495118..3de8e21 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
@@ -1,10 +1,13 @@
package com.vincent.rsf.server.api.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;
import com.vincent.rsf.server.api.controller.params.ReceiptParams;
import com.vincent.rsf.server.api.service.MobileService;
+import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
+import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import io.swagger.annotations.Api;
@@ -119,4 +122,48 @@
}
+ @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @ApiOperation("鑾峰彇璁㈠崟鐗╂枡鏄庣粏")
+ @GetMapping("/asnOrderItem/trackCode/{code}")
+ public R getItemByTrackCode(@PathVariable String code) {
+ if (StringUtils.isBlank(code)) {
+ return R.error("缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(mobileService.getDeltByCode(code));
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:update')")
+ @ApiOperation("缁勬嫋")
+ @PostMapping("/waitPakin/merge")
+ public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
+ if (Objects.isNull(waitPakin)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (org.apache.commons.lang3.StringUtils.isBlank(waitPakin.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
+ return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ return R.ok(mobileService.mergeItems(waitPakin));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:update')")
+ @ApiOperation("缁勬嫋瑙ｇ粦")
+ @PostMapping("/waitPakin/unbind")
+ public R pakinUnBind(@RequestBody WaitPakinParam param) {
+ if (Objects.isNull(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (org.apache.commons.lang3.StringUtils.isBlank(param.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
+ return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ return R.ok(mobileService.unBind(param));
+
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index a4f69d4..6475f1c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -3,7 +3,9 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;
import com.vincent.rsf.server.api.controller.params.ReceiptParams;
+import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import com.vincent.rsf.server.system.entity.Fields;
@@ -32,4 +34,10 @@
R getReceiptAreas();
List<Fields> getDynamicFields();
+
+ R getDeltByCode(String code);
+
+ WaitPakin mergeItems(WaitPakinParam waitPakin);
+
+ WaitPakin unBind(WaitPakinParam param);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 923f464..ec32e23 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -14,12 +14,10 @@
import com.vincent.rsf.server.common.security.JwtSubject;
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.JwtUtil;
+import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.*;
-import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;
-import com.vincent.rsf.server.manager.service.AsnOrderLogService;
-import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
-import com.vincent.rsf.server.manager.service.WarehouseAreasService;
+import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.CodeRes;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.param.LoginParam;
@@ -87,6 +85,12 @@
@Autowired
private AsnOrderLogService asnOrderLogService;
+
+ @Autowired
+ private WaitPakinService waitPakinService;
+
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
@Autowired
private AsnOrderItemLogService asnOrderItemLogService;
@@ -391,6 +395,29 @@
return fieldsMapper.selectList(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));
}
+ @Override
+ public R getDeltByCode(String code) {
+ return R.ok(asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, code)));
+ }
+
+ /**
+ * @author Ryan
+ * @description PDA缁勬嫋
+ * @param
+ * @return
+ * @time 2025/3/29 14:26
+ */
+ @Override
+ public WaitPakin mergeItems(WaitPakinParam waitPakin) {
+ return waitPakinService.mergeItems(waitPakin);
+ }
+
+ @Override
+ public WaitPakin unBind(WaitPakinParam param) {
+
+ return waitPakinService.unBind(param);
+ }
+
/**
* 鑾峰彇ReceiptDetlsDtos
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index 8e84939..57cdb25 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_wait_pakin_item_log";
- generator.tableDesc="缁勬嫋鏄庣粏鍘嗗彶妗�";
+ generator.table="man_task_log";
+ generator.tableDesc="浠诲姟宸ヤ綔鍘嗗彶妗�";
generator.packagePath="com.vincent.rsf.server.manager";
generator.build();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
index 60e27ce..650a15d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -134,12 +134,6 @@
return asnOrderItemService.generateBarcode(orders);
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
- @ApiOperation("鑾峰彇璁㈠崟鐗╂枡鏄庣粏")
- @GetMapping("/asnOrderItem/trackCode/{code}")
- public R getItemByTrackCode(@PathVariable String code) {
- return R.ok(asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, code)));
- }
/**
* ASN鍗曟嵁鏄庣粏瀵煎叆
* @param file
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
new file mode 100644
index 0000000..0e9be0e
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.Task;
+import com.vincent.rsf.server.manager.service.TaskService;
+import com.vincent.rsf.server.system.controller.BaseController;
+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
+public class TaskController extends BaseController {
+
+ @Autowired
+ private TaskService taskService;
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/task/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
+ return R.ok().add(taskService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/task/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(taskService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping({"/task/many/{ids}", "/tasks/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(taskService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @GetMapping("/task/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(taskService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:save')")
+ @OperationLog("Create 浠诲姟宸ヤ綔妗�")
+ @PostMapping("/task/save")
+ public R save(@RequestBody Task task) {
+ task.setCreateBy(getLoginUserId());
+ task.setCreateTime(new Date());
+ task.setUpdateBy(getLoginUserId());
+ task.setUpdateTime(new Date());
+ if (!taskService.save(task)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(task);
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @OperationLog("Update 浠诲姟宸ヤ綔妗�")
+ @PostMapping("/task/update")
+ public R update(@RequestBody Task task) {
+ task.setUpdateBy(getLoginUserId());
+ task.setUpdateTime(new Date());
+ if (!taskService.updateById(task)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(task);
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:remove')")
+ @OperationLog("Delete 浠诲姟宸ヤ綔妗�")
+ @PostMapping("/task/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!taskService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/task/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Task::getId, condition);
+ }
+ taskService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:task:list')")
+ @PostMapping("/task/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(taskService.list(), Task.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java
new file mode 100644
index 0000000..ca1b80d
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.TaskItem;
+import com.vincent.rsf.server.manager.service.TaskItemService;
+import com.vincent.rsf.server.system.controller.BaseController;
+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
+public class TaskItemController extends BaseController {
+
+ @Autowired
+ private TaskItemService taskItemService;
+
+ @PreAuthorize("hasAuthority('manager:taskItem:list')")
+ @PostMapping("/taskItem/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<TaskItem, BaseParam> pageParam = new PageParam<>(baseParam, TaskItem.class);
+ return R.ok().add(taskItemService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItem:list')")
+ @PostMapping("/taskItem/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(taskItemService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItem:list')")
+ @PostMapping({"/taskItem/many/{ids}", "/taskItems/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(taskItemService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItem:list')")
+ @GetMapping("/taskItem/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(taskItemService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItem:save')")
+ @OperationLog("Create 浠诲姟宸ヤ綔妗�")
+ @PostMapping("/taskItem/save")
+ public R save(@RequestBody TaskItem taskItem) {
+ taskItem.setCreateBy(getLoginUserId());
+ taskItem.setCreateTime(new Date());
+ taskItem.setUpdateBy(getLoginUserId());
+ taskItem.setUpdateTime(new Date());
+ if (!taskItemService.save(taskItem)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(taskItem);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItem:update')")
+ @OperationLog("Update 浠诲姟宸ヤ綔妗�")
+ @PostMapping("/taskItem/update")
+ public R update(@RequestBody TaskItem taskItem) {
+ taskItem.setUpdateBy(getLoginUserId());
+ taskItem.setUpdateTime(new Date());
+ if (!taskItemService.updateById(taskItem)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(taskItem);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItem:remove')")
+ @OperationLog("Delete 浠诲姟宸ヤ綔妗�")
+ @PostMapping("/taskItem/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!taskItemService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItem:list')")
+ @PostMapping("/taskItem/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<TaskItem> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(TaskItem::getId, condition);
+ }
+ taskItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItem:list')")
+ @PostMapping("/taskItem/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(taskItemService.list(), TaskItem.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemLogController.java
new file mode 100644
index 0000000..908568e
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskItemLogController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.TaskItemLog;
+import com.vincent.rsf.server.manager.service.TaskItemLogService;
+import com.vincent.rsf.server.system.controller.BaseController;
+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
+public class TaskItemLogController extends BaseController {
+
+ @Autowired
+ private TaskItemLogService taskItemLogService;
+
+ @PreAuthorize("hasAuthority('manager:taskItemLog:list')")
+ @PostMapping("/taskItemLog/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<TaskItemLog, BaseParam> pageParam = new PageParam<>(baseParam, TaskItemLog.class);
+ return R.ok().add(taskItemLogService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItemLog:list')")
+ @PostMapping("/taskItemLog/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(taskItemLogService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItemLog:list')")
+ @PostMapping({"/taskItemLog/many/{ids}", "/taskItemLogs/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(taskItemLogService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItemLog:list')")
+ @GetMapping("/taskItemLog/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(taskItemLogService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItemLog:save')")
+ @OperationLog("Create 浠诲姟宸ヤ綔鍘嗗彶妗�")
+ @PostMapping("/taskItemLog/save")
+ public R save(@RequestBody TaskItemLog taskItemLog) {
+ taskItemLog.setCreateBy(getLoginUserId());
+ taskItemLog.setCreateTime(new Date());
+ taskItemLog.setUpdateBy(getLoginUserId());
+ taskItemLog.setUpdateTime(new Date());
+ if (!taskItemLogService.save(taskItemLog)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(taskItemLog);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItemLog:update')")
+ @OperationLog("Update 浠诲姟宸ヤ綔鍘嗗彶妗�")
+ @PostMapping("/taskItemLog/update")
+ public R update(@RequestBody TaskItemLog taskItemLog) {
+ taskItemLog.setUpdateBy(getLoginUserId());
+ taskItemLog.setUpdateTime(new Date());
+ if (!taskItemLogService.updateById(taskItemLog)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(taskItemLog);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItemLog:remove')")
+ @OperationLog("Delete 浠诲姟宸ヤ綔鍘嗗彶妗�")
+ @PostMapping("/taskItemLog/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!taskItemLogService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItemLog:list')")
+ @PostMapping("/taskItemLog/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<TaskItemLog> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(TaskItemLog::getId, condition);
+ }
+ taskItemLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskItemLog:list')")
+ @PostMapping("/taskItemLog/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(taskItemLogService.list(), TaskItemLog.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
new file mode 100644
index 0000000..6cdf20f
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskLogController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.TaskLog;
+import com.vincent.rsf.server.manager.service.TaskLogService;
+import com.vincent.rsf.server.system.controller.BaseController;
+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
+public class TaskLogController extends BaseController {
+
+ @Autowired
+ private TaskLogService taskLogService;
+
+ @PreAuthorize("hasAuthority('manager:taskLog:list')")
+ @PostMapping("/taskLog/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<TaskLog, BaseParam> pageParam = new PageParam<>(baseParam, TaskLog.class);
+ return R.ok().add(taskLogService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskLog:list')")
+ @PostMapping("/taskLog/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(taskLogService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskLog:list')")
+ @PostMapping({"/taskLog/many/{ids}", "/taskLogs/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(taskLogService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskLog:list')")
+ @GetMapping("/taskLog/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(taskLogService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskLog:save')")
+ @OperationLog("Create 浠诲姟宸ヤ綔鍘嗗彶妗�")
+ @PostMapping("/taskLog/save")
+ public R save(@RequestBody TaskLog taskLog) {
+ taskLog.setCreateBy(getLoginUserId());
+ taskLog.setCreateTime(new Date());
+ taskLog.setUpdateBy(getLoginUserId());
+ taskLog.setUpdateTime(new Date());
+ if (!taskLogService.save(taskLog)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(taskLog);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskLog:update')")
+ @OperationLog("Update 浠诲姟宸ヤ綔鍘嗗彶妗�")
+ @PostMapping("/taskLog/update")
+ public R update(@RequestBody TaskLog taskLog) {
+ taskLog.setUpdateBy(getLoginUserId());
+ taskLog.setUpdateTime(new Date());
+ if (!taskLogService.updateById(taskLog)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(taskLog);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskLog:remove')")
+ @OperationLog("Delete 浠诲姟宸ヤ綔鍘嗗彶妗�")
+ @PostMapping("/taskLog/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!taskLogService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskLog:list')")
+ @PostMapping("/taskLog/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<TaskLog> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(TaskLog::getId, condition);
+ }
+ taskLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:taskLog:list')")
+ @PostMapping("/taskLog/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(taskLogService.list(), TaskLog.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index 385b535..b1175b6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -113,37 +113,4 @@
}
- @PreAuthorize("hasAuthority('manager:waitPakin:update')")
- @ApiOperation("缁勬嫋")
- @PostMapping("/waitPakin/merge")
- public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
- if (Objects.isNull(waitPakin)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- if (StringUtils.isBlank(waitPakin.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
- }
- if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
- return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
- }
- return R.ok(waitPakinService.mergeItems(waitPakin));
- }
-
- @PreAuthorize("hasAuthority('manager:waitPakin:update')")
- @ApiOperation("缁勬嫋瑙ｇ粦")
- @PostMapping("/waitPakin/unbind")
- public R pakinUnBind(@RequestBody WaitPakinParam param) {
- if (Objects.isNull(param)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- if (StringUtils.isBlank(param.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
- }
- if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
- return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
- }
- return R.ok(waitPakinService);
-
- }
-
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
new file mode 100644
index 0000000..d43295f
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -0,0 +1,294 @@
+package com.vincent.rsf.server.manager.entity;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_task")
+public class Task implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ private String taskCode;
+
+ /**
+ * 浠诲姟鐘舵��
+ */
+ @ApiModelProperty(value= "浠诲姟鐘舵��")
+ private Short taskStatus;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ private Short taskType;
+
+ /**
+ * 婧愬簱浣�
+ */
+ @ApiModelProperty(value= "婧愬簱浣�")
+ private String orgLoc;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅")
+ private String targLoc;
+
+ /**
+ * 鎵樼洏鐮�
+ */
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ private String barcode;
+
+ /**
+ * 鏈哄櫒浜虹紪鐮�
+ */
+ @ApiModelProperty(value= "鏈哄櫒浜虹紪鐮�")
+ private String robotCode;
+
+ /**
+ * 鎵ц鐘舵��
+ */
+ @ApiModelProperty(value= "鎵ц鐘舵��")
+ private Short exceStatus;
+
+ /**
+ * 寮傚父鎻忚堪
+ */
+ @ApiModelProperty(value= "寮傚父鎻忚堪")
+ private String expDesc;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Short sort;
+
+ /**
+ * 寮傚父缂栫爜
+ */
+ @ApiModelProperty(value= "寮傚父缂栫爜")
+ private String expCode;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value= "寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public Task() {}
+
+ public Task(String taskCode,Short taskStatus,Short taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.taskCode = taskCode;
+ this.taskStatus = taskStatus;
+ this.taskType = taskType;
+ this.orgLoc = orgLoc;
+ this.targLoc = targLoc;
+ this.barcode = barcode;
+ this.robotCode = robotCode;
+ this.exceStatus = exceStatus;
+ this.expDesc = expDesc;
+ this.sort = sort;
+ this.expCode = expCode;
+ this.startTime = startTime;
+ this.endTime = endTime;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// Task task = new Task(
+// null, // 浠诲姟鍙�
+// null, // 浠诲姟鐘舵��
+// null, // 浠诲姟绫诲瀷
+// null, // 婧愬簱浣�
+// null, // 鐩爣搴撲綅
+// null, // 鎵樼洏鐮�
+// null, // 鏈哄櫒浜虹紪鐮�
+// null, // 鎵ц鐘舵��
+// null, // 寮傚父鎻忚堪
+// null, // 浼樺厛绾�
+// null, // 寮傚父缂栫爜
+// null, // 寮�濮嬫椂闂�
+// null, // 缁撴潫鏃堕棿
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getStartTime$(){
+ if (Cools.isEmpty(this.startTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
+ }
+
+ public String getEndTime$(){
+ if (Cools.isEmpty(this.endTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
new file mode 100644
index 0000000..8d6420f
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -0,0 +1,250 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_task_item")
+public class TaskItem implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 涓诲崟ID
+ */
+ @ApiModelProperty(value= "涓诲崟ID")
+ private Long taskId;
+
+ /**
+ * 鐗╂枡ID
+ */
+ @ApiModelProperty(value= "鐗╂枡ID")
+ private Long matnrId;
+
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ private String maktx;
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ private String matnrCode;
+
+ /**
+ * 搴撳瓨鍗曚綅
+ */
+ @ApiModelProperty(value= "搴撳瓨鍗曚綅")
+ private String unit;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 搴撳瓨鎵规
+ */
+ @ApiModelProperty(value= "搴撳瓨鎵规")
+ private String batch;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value= "瑙勬牸")
+ private String spec;
+
+ /**
+ * 鍨嬪彿
+ */
+ @ApiModelProperty(value= "鍨嬪彿")
+ private String model;
+
+ /**
+ * 瀛楁绱㈠紩
+ */
+ @ApiModelProperty(value= "瀛楁绱㈠紩")
+ private String fieldsIndex;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public TaskItem() {}
+
+ public TaskItem(Long taskId,Long matnrId,String maktx,String matnrCode,String unit,Double anfme,String batch,String spec,String model,String fieldsIndex,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.taskId = taskId;
+ this.matnrId = matnrId;
+ this.maktx = maktx;
+ this.matnrCode = matnrCode;
+ this.unit = unit;
+ this.anfme = anfme;
+ this.batch = batch;
+ this.spec = spec;
+ this.model = model;
+ this.fieldsIndex = fieldsIndex;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// TaskItem taskItem = new TaskItem(
+// null, // 涓诲崟ID
+// null, // 鐗╂枡ID
+// null, // 鐗╂枡鍚嶇О
+// null, // 鐗╂枡缂栫爜
+// null, // 搴撳瓨鍗曚綅
+// null, // 鏁伴噺
+// null, // 搴撳瓨鎵规
+// null, // 瑙勬牸
+// null, // 鍨嬪彿
+// null, // 瀛楁绱㈠紩
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
new file mode 100644
index 0000000..9816e65
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
@@ -0,0 +1,258 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_task_item_log")
+public class TaskItemLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 涓诲崟ID
+ */
+ @ApiModelProperty(value= "涓诲崟ID")
+ private Long taskId;
+
+ /**
+ * 浠诲姟鏄庣粏ID
+ */
+ @ApiModelProperty(value= "浠诲姟鏄庣粏ID")
+ private Long taskItemId;
+
+ /**
+ * 鐗╂枡ID
+ */
+ @ApiModelProperty(value= "鐗╂枡ID")
+ private Long matnrId;
+
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ private String maktx;
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ private String matnrCode;
+
+ /**
+ * 搴撳瓨鍗曚綅
+ */
+ @ApiModelProperty(value= "搴撳瓨鍗曚綅")
+ private String unit;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 搴撳瓨鎵规
+ */
+ @ApiModelProperty(value= "搴撳瓨鎵规")
+ private String batch;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value= "瑙勬牸")
+ private String spec;
+
+ /**
+ * 鍨嬪彿
+ */
+ @ApiModelProperty(value= "鍨嬪彿")
+ private String model;
+
+ /**
+ * 瀛楁绱㈠紩
+ */
+ @ApiModelProperty(value= "瀛楁绱㈠紩")
+ private String fieldsIndex;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public TaskItemLog() {}
+
+ public TaskItemLog(Long taskId,Long taskItemId,Long matnrId,String maktx,String matnrCode,String unit,Double anfme,String batch,String spec,String model,String fieldsIndex,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.taskId = taskId;
+ this.taskItemId = taskItemId;
+ this.matnrId = matnrId;
+ this.maktx = maktx;
+ this.matnrCode = matnrCode;
+ this.unit = unit;
+ this.anfme = anfme;
+ this.batch = batch;
+ this.spec = spec;
+ this.model = model;
+ this.fieldsIndex = fieldsIndex;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// TaskItemLog taskItemLog = new TaskItemLog(
+// null, // 涓诲崟ID
+// null, // 浠诲姟鏄庣粏ID
+// null, // 鐗╂枡ID
+// null, // 鐗╂枡鍚嶇О
+// null, // 鐗╂枡缂栫爜
+// null, // 搴撳瓨鍗曚綅
+// null, // 鏁伴噺
+// null, // 搴撳瓨鎵规
+// null, // 瑙勬牸
+// null, // 鍨嬪彿
+// null, // 瀛楁绱㈠紩
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
new file mode 100644
index 0000000..9dffe19
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
@@ -0,0 +1,302 @@
+package com.vincent.rsf.server.manager.entity;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_task_log")
+public class TaskLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 浠诲姟ID
+ */
+ @ApiModelProperty(value= "浠诲姟ID")
+ private Long taskId;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ private String taskCode;
+
+ /**
+ * 浠诲姟鐘舵��
+ */
+ @ApiModelProperty(value= "浠诲姟鐘舵��")
+ private Short taskStatus;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ private Short taskType;
+
+ /**
+ * 婧愬簱浣�
+ */
+ @ApiModelProperty(value= "婧愬簱浣�")
+ private String orgLoc;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅")
+ private String targLoc;
+
+ /**
+ * 鎵樼洏鐮�
+ */
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ private String barcode;
+
+ /**
+ * 鏈哄櫒浜虹紪鐮�
+ */
+ @ApiModelProperty(value= "鏈哄櫒浜虹紪鐮�")
+ private String robotCode;
+
+ /**
+ * 鎵ц鐘舵��
+ */
+ @ApiModelProperty(value= "鎵ц鐘舵��")
+ private Short exceStatus;
+
+ /**
+ * 寮傚父鎻忚堪
+ */
+ @ApiModelProperty(value= "寮傚父鎻忚堪")
+ private String expDesc;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Short sort;
+
+ /**
+ * 寮傚父缂栫爜
+ */
+ @ApiModelProperty(value= "寮傚父缂栫爜")
+ private String expCode;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value= "寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public TaskLog() {}
+
+ public TaskLog(Long taskId,String taskCode,Short taskStatus,Short taskType,String orgLoc,String targLoc,String barcode,String robotCode,Short exceStatus,String expDesc,Short sort,String expCode,Date startTime,Date endTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.taskId = taskId;
+ this.taskCode = taskCode;
+ this.taskStatus = taskStatus;
+ this.taskType = taskType;
+ this.orgLoc = orgLoc;
+ this.targLoc = targLoc;
+ this.barcode = barcode;
+ this.robotCode = robotCode;
+ this.exceStatus = exceStatus;
+ this.expDesc = expDesc;
+ this.sort = sort;
+ this.expCode = expCode;
+ this.startTime = startTime;
+ this.endTime = endTime;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// TaskLog taskLog = new TaskLog(
+// null, // 浠诲姟ID
+// null, // 浠诲姟鍙�
+// null, // 浠诲姟鐘舵��
+// null, // 浠诲姟绫诲瀷
+// null, // 婧愬簱浣�
+// null, // 鐩爣搴撲綅
+// null, // 鎵樼洏鐮�
+// null, // 鏈哄櫒浜虹紪鐮�
+// null, // 鎵ц鐘舵��
+// null, // 寮傚父鎻忚堪
+// null, // 浼樺厛绾�
+// null, // 寮傚父缂栫爜
+// null, // 寮�濮嬫椂闂�
+// null, // 缁撴潫鏃堕棿
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getStartTime$(){
+ if (Cools.isEmpty(this.startTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
+ }
+
+ public String getEndTime$(){
+ if (Cools.isEmpty(this.endTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskItemLogMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskItemLogMapper.java
new file mode 100644
index 0000000..2b2e595
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskItemLogMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.TaskItemLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface TaskItemLogMapper extends BaseMapper<TaskItemLog> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskItemMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskItemMapper.java
new file mode 100644
index 0000000..1ee8449
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskItemMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.TaskItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface TaskItemMapper extends BaseMapper<TaskItem> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskLogMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskLogMapper.java
new file mode 100644
index 0000000..8e59142
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskLogMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.TaskLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface TaskLogMapper extends BaseMapper<TaskLog> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskMapper.java
new file mode 100644
index 0000000..9d928aa
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/TaskMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.Task;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface TaskMapper extends BaseMapper<Task> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskItemLogService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskItemLogService.java
new file mode 100644
index 0000000..d09afdc
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskItemLogService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.manager.entity.TaskItemLog;
+
+public interface TaskItemLogService extends IService<TaskItemLog> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskItemService.java
new file mode 100644
index 0000000..e7d7261
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskItemService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.manager.entity.TaskItem;
+
+public interface TaskItemService extends IService<TaskItem> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskLogService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskLogService.java
new file mode 100644
index 0000000..2ba6620
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskLogService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.manager.entity.TaskLog;
+
+public interface TaskLogService extends IService<TaskLog> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
new file mode 100644
index 0000000..24be116
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.manager.entity.Task;
+
+public interface TaskService extends IService<Task> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java
index 14162bb..32752f4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java
@@ -7,4 +7,6 @@
public interface WaitPakinService extends IService<WaitPakin> {
WaitPakin mergeItems(WaitPakinParam waitPakin);
+
+ WaitPakin unBind(WaitPakinParam param);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskItemLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskItemLogServiceImpl.java
new file mode 100644
index 0000000..bb3663d
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskItemLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.TaskItemLogMapper;
+import com.vincent.rsf.server.manager.entity.TaskItemLog;
+import com.vincent.rsf.server.manager.service.TaskItemLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("taskItemLogService")
+public class TaskItemLogServiceImpl extends ServiceImpl<TaskItemLogMapper, TaskItemLog> implements TaskItemLogService {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskItemServiceImpl.java
new file mode 100644
index 0000000..a6c204e
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskItemServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.TaskItemMapper;
+import com.vincent.rsf.server.manager.entity.TaskItem;
+import com.vincent.rsf.server.manager.service.TaskItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("taskItemService")
+public class TaskItemServiceImpl extends ServiceImpl<TaskItemMapper, TaskItem> implements TaskItemService {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskLogServiceImpl.java
new file mode 100644
index 0000000..c597316
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.TaskLogMapper;
+import com.vincent.rsf.server.manager.entity.TaskLog;
+import com.vincent.rsf.server.manager.service.TaskLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("taskLogService")
+public class TaskLogServiceImpl extends ServiceImpl<TaskLogMapper, TaskLog> implements TaskLogService {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
new file mode 100644
index 0000000..3cfa531
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.TaskMapper;
+import com.vincent.rsf.server.manager.entity.Task;
+import com.vincent.rsf.server.manager.service.TaskService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("taskService")
+public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index e0e0b76..4a42f57 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -35,6 +35,9 @@
private AsnOrderItemService asnOrderItemService;
@Autowired
private AsnOrderService asnOrderService;
+
+ @Autowired
+ private WaitPakinService waitPakinService;
@Autowired
private WaitPakinItemService waitPakinItemService;
@@ -116,4 +119,31 @@
}
return pakin;
}
+
+ @Override
+ public WaitPakin unBind(WaitPakinParam param) {
+ String barcode = param.getBarcode();
+ if (StringUtils.isNotBlank(barcode)) {
+ WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode), false);
+ if (Objects.isNull(waitPakins)) {
+ throw new CoolException("缁勬嫋涓嶅瓨鍦紒锛�");
+ }
+ List<PakinItem> paramItems = param.getItems();
+ if (Objects.isNull(paramItems) || paramItems.isEmpty()) {
+ throw new CoolException("瑙ｇ粦鐗╂枡涓嶈兘涓虹┖锛侊紒");
+ }
+ List<Long> list = paramItems.stream().map(PakinItem::getMatnrId).collect(Collectors.toList());
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
+ .eq(WaitPakinItem::getPakinId, waitPakins.getId())
+ .eq(WaitPakinItem::getMatnrId, list));
+ if (pakinItems.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪锛侊紒");
+ }
+ if (!waitPakinItemService.removeByIds(pakinItems)) {
+ throw new CoolException("缁勬嫋鏄庣粏瑙ｇ粦澶辫触锛侊紒");
+ }
+ return waitPakins;
+ }
+ return new WaitPakin();
+ }
}
diff --git a/rsf-server/src/main/resources/mapper/manager/TaskItemLogMapper.xml b/rsf-server/src/main/resources/mapper/manager/TaskItemLogMapper.xml
new file mode 100644
index 0000000..de43bf1
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/TaskItemLogMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.vincent.rsf.server.manager.mapper.TaskItemLogMapper">
+
+</mapper>
diff --git a/rsf-server/src/main/resources/mapper/manager/TaskItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/TaskItemMapper.xml
new file mode 100644
index 0000000..43290d3
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/TaskItemMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.vincent.rsf.server.manager.mapper.TaskItemMapper">
+
+</mapper>
diff --git a/rsf-server/src/main/resources/mapper/manager/TaskLogMapper.xml b/rsf-server/src/main/resources/mapper/manager/TaskLogMapper.xml
new file mode 100644
index 0000000..1a42ee8
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/TaskLogMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.vincent.rsf.server.manager.mapper.TaskLogMapper">
+
+</mapper>
diff --git a/rsf-server/src/main/resources/mapper/manager/TaskMapper.xml b/rsf-server/src/main/resources/mapper/manager/TaskMapper.xml
new file mode 100644
index 0000000..f6ec773
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/TaskMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.vincent.rsf.server.manager.mapper.TaskMapper">
+
+</mapper>
--
Gitblit v1.9.1