diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index b84f1fe..0b6118d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -1,6 +1,10 @@
package com.ruoyi.job.mydojob.service.impl;
import java.util.List;
+
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.bas.basJobId.service.IBasJobIdService;
+import com.ruoyi.bas.taskNo.service.IBasTaskNoService;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,19 +14,23 @@ import com.ruoyi.job.mydojob.service.IMydoJobService;
/**
* 任务表Service业务层处理
- *
+ *
* @author ruoyi
* @date 2025-05-23
*/
@Service
-public class MydoJobServiceImpl implements IMydoJobService
+public class MydoJobServiceImpl implements IMydoJobService
{
@Autowired
private MydoJobMapper mydoJobMapper;
+ @Autowired
+ private IBasJobIdService basJobIdService;
+ @Autowired
+ private IBasTaskNoService basTaskNoService;
/**
* 查询任务表
- *
+ *
* @param jobId 任务表主键
* @return 任务表
*/
@@ -34,7 +42,7 @@ public class MydoJobServiceImpl implements IMydoJobService
/**
* 查询任务表列表
- *
+ *
* @param mydoJob 任务表
* @return 任务表
*/
@@ -46,7 +54,7 @@ public class MydoJobServiceImpl implements IMydoJobService
/**
* 新增任务表
- *
+ *
* @param mydoJob 任务表
* @return 结果
*/
@@ -54,12 +62,14 @@ public class MydoJobServiceImpl implements IMydoJobService
public int insertMydoJob(MydoJob mydoJob)
{
mydoJob.setCreateTime(DateUtils.getNowDate());
+ mydoJob.setJobId(basJobIdService.getJobId("RK"));
+ mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1")));
return mydoJobMapper.insertMydoJob(mydoJob);
}
/**
* 修改任务表
- *
+ *
* @param mydoJob 任务表
* @return 结果
*/
@@ -71,7 +81,7 @@ public class MydoJobServiceImpl implements IMydoJobService
/**
* 批量删除任务表
- *
+ *
* @param jobIds 需要删除的任务表主键
* @return 结果
*/
@@ -83,7 +93,7 @@ public class MydoJobServiceImpl implements IMydoJobService
/**
* 删除任务表信息
- *
+ *
* @param jobId 任务表主键
* @return 结果
*/
diff --git a/ruoyi-ui/src/api/job/mydoJob.js b/ruoyi-ui/src/api/job/mydoJob.js
new file mode 100644
index 0000000..962a6e0
--- /dev/null
+++ b/ruoyi-ui/src/api/job/mydoJob.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询任务表列表
+export function listMydoJob(query) {
+ return request({
+ url: '/job/mydoJob/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询任务表详细
+export function getMydoJob(jobId) {
+ return request({
+ url: '/job/mydoJob/' + jobId,
+ method: 'get'
+ })
+}
+
+// 新增任务表
+export function addMydoJob(data) {
+ return request({
+ url: '/job/mydoJob',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改任务表
+export function updateMydoJob(data) {
+ return request({
+ url: '/job/mydoJob',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除任务表
+export function delMydoJob(jobId) {
+ return request({
+ url: '/job/mydoJob/' + jobId,
+ method: 'delete'
+ })
+}
diff --git a/ruoyi-ui/src/api/job/mydoJobDetail.js b/ruoyi-ui/src/api/job/mydoJobDetail.js
new file mode 100644
index 0000000..4c5a839
--- /dev/null
+++ b/ruoyi-ui/src/api/job/mydoJobDetail.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询子任务表列表
+export function listMydoJobDetail(query) {
+ return request({
+ url: '/job/mydoJobDetail/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询子任务表详细
+export function getMydoJobDetail(jobId) {
+ return request({
+ url: '/job/mydoJobDetail/' + jobId,
+ method: 'get'
+ })
+}
+
+// 新增子任务表
+export function addMydoJobDetail(data) {
+ return request({
+ url: '/job/mydoJobDetail',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改子任务表
+export function updateMydoJobDetail(data) {
+ return request({
+ url: '/job/mydoJobDetail',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除子任务表
+export function delMydoJobDetail(jobId) {
+ return request({
+ url: '/job/mydoJobDetail/' + jobId,
+ method: 'delete'
+ })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js
index 659c19d..4ebc50a 100644
--- a/ruoyi-ui/src/lang/en.js
+++ b/ruoyi-ui/src/lang/en.js
@@ -64,5 +64,8 @@ export default {
totalAmount: 'Total Amount',
submit: 'Submit',
selectProduct: 'Select Product'
- }
+ },
+ menu: {
+ InboundManagement: 'InboundManagement'
+ },
}
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
new file mode 100644
index 0000000..46f6e89
--- /dev/null
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -0,0 +1,537 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 手动完成
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}
+
+
+
+
+ {{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+