From f330e285adc14c50c5b781dc23c27449f1c88792 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 15:48:12 +0800
Subject: [PATCH] 修改 新增任务工作档
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java | 9 ++++
rsf-admin/src/i18n/zh.js | 34 +++++++++++++++++
rsf-admin/src/i18n/en.js | 34 +++++++++++++++++
rsf-admin/src/page/ResourceContent.js | 10 +++-
4 files changed, 83 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 268f289..984d4cc 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -153,6 +153,8 @@
deviceSite: 'deviceSite',
waitPakin: 'WaitPakin',
waitPakinItem: 'WaitPakinItem',
+ task: 'Task',
+ taskItem: 'TaskItem',
},
table: {
field: {
@@ -662,6 +664,38 @@
qty: "qty",
batch: "batch",
},
+ task: {
+ taskCode: "TaskCode",
+ taskStatus: "Status",
+ taskType: "Type",
+ orgLoc: "orgLoc",
+ orgSite: "orgSite",
+ targLoc: "targLoc",
+ targSite: "targSite",
+ barcode: "barcode",
+ robotCode: "robotCode",
+ exceStatus: "exceStatus",
+ expDesc: "expDesc",
+ sort: "sort",
+ expCode: "expCode",
+ startTime: "startTime",
+ endTime: "endTime",
+ },
+ taskItem: {
+ taskId: "taskId",
+ orderId: "orderId",
+ orderType: "orderType",
+ orderItemId: "orderItemId",
+ sourceCode: "sourceCode",
+ matnrId: "matnrId",
+ maktx: "maktx",
+ matnrCode: "matnrCode",
+ unit: "unit",
+ anfme: "anfme",
+ batch: "batch",
+ spec: "spec",
+ model: "model",
+ },
}
},
page: {
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 9379808..9c94885 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -155,6 +155,8 @@
waitPakinItem: '缁勬嫋妗ｆ槑缁�',
waitPakinLog: '缁勬嫋鍘嗗彶妗�',
waitPakinItemLog: '缁勬嫋鍘嗗彶妗ｆ槑缁�',
+ task: '浠诲姟宸ヤ綔妗�',
+ taskItem: '浠诲姟妗ｆ槑缁�',
},
table: {
field: {
@@ -671,6 +673,38 @@
qty: "宸插畬鎴�",
batch: "鎵规",
},
+ task: {
+ taskCode: "浠诲姟鍙�",
+ taskStatus: "浠诲姟鐘舵��",
+ taskType: "浠诲姟绫诲瀷",
+ orgLoc: "婧愬簱浣�",
+ orgSite: "婧愮珯鐐�",
+ targLoc: "鐩爣搴撲綅",
+ targSite: "鐩爣绔欑偣",
+ barcode: "鎷栫洏鐮�",
+ robotCode: "鏈哄櫒缂栫爜",
+ exceStatus: "鎵ц鐘舵��",
+ expDesc: "寮傚父璇存槑",
+ sort: "浼樺厛绾�",
+ expCode: "寮傚父缂栫爜",
+ startTime: "寮�濮嬫椂闂�",
+ endTime: "缁撴潫鏃堕棿",
+ },
+ taskItem: {
+ taskId: "taskId",
+ orderId: "璁㈠崟ID",
+ orderType: "鍗曟嵁绫诲瀷",
+ orderItemId: "璁㈠崟鏄庣粏ID",
+ sourceCode: "璁㈠崟鍙�",
+ matnrId: "鐗╂枡ID",
+ maktx: "鐗╂枡鍚嶇О",
+ matnrCode: "鐗╂枡缂栫爜",
+ unit: "鍗曚綅",
+ anfme: "鏁伴噺",
+ batch: "鎵规",
+ spec: "瑙勬牸",
+ model: "鍨嬪彿",
+ },
}
},
page: {
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 1b3287b..c966560 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -46,6 +46,9 @@
import waitPakinItemLog from './waitPakinItemLog';
import asnOrderLog from './asnOrderLog';
import asnOrderItemLog from './asnOrderItemLog';
+import task from './task';
+import taskItem from './taskItem';
+
const ResourceContent = (node) => {
switch (node.component) {
@@ -133,9 +136,10 @@
return waitPakinLog;
case 'waitPakinItemLog':
return waitPakinItemLog;
-
-
-
+ case 'task':
+ return task;
+ case 'taskItem':
+ return taskItem;
default:
return {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
index 9697614..01ad01e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
@@ -100,7 +100,6 @@
* @return
* @time 2025/3/31 10:12
*/
-
@Override
public List<AsnOrder> getUnInspect(Map<String, Object> params) {
List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>()
@@ -110,6 +109,14 @@
return asnOrders;
}
+ /**
+ * @author Ryan
+ * @description 淇濆瓨
+ * @param
+ * @return
+ * @time 2025/3/31 14:54
+ */
+
@Override
@Transactional(rollbackFor = Exception.class)
public R saveSelected(IsptOrderParam param) {
--
Gitblit v1.9.1