From 313f0515b65ab69e6e811c199f4b33eb630509f3 Mon Sep 17 00:00:00 2001
From: Ryan <creaycat@gmail.com>
Date: 星期四, 03 四月 2025 19:09:38 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/ResourceContent.js | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index b17dc51..daf5821 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -28,6 +28,7 @@
import locType from './basicInfo/locType';
import locArea from './basicInfo//locArea';
import locAreaMatRela from './basicInfo/locAreaMatRela';
+import locAreaMat from './basicInfo/locAreaMat';
import serialRuleItem from './system/serialRuleItem';
import serialRule from './system/serialRule';
import whMat from './basicInfo/whMat';
@@ -38,6 +39,18 @@
import fields from './fields';
import fieldsItem from './fieldsItem';
import warehouseAreasItem from './warehouseAreasItem';
+import deviceSite from './basicInfo//deviceSite';
+import waitPakin from './waitPakin';
+import waitPakinItem from './waitPakinItem';
+import waitPakinLog from './waitPakinLog';
+import waitPakinItemLog from './waitPakinItemLog';
+import asnOrderLog from './asnOrderLog';
+import asnOrderItemLog from './asnOrderItemLog';
+import task from './task';
+import taskItem from './taskItem';
+import taskLog from './taskLog';
+import taskItemLog from './taskItemLog';
+
const ResourceContent = (node) => {
switch (node.component) {
@@ -95,6 +108,10 @@
return asnOrder;
case 'asnOrderItem':
return asnOrderItem;
+ case 'asnOrderLog':
+ return asnOrderLog;
+ case 'asnOrderItemLog':
+ return asnOrderItemLog;
case 'purchaseItem':
return purchaseItem;
case 'purchase':
@@ -109,7 +126,26 @@
return locArea;
case 'locAreaMatRela':
return locAreaMatRela;
-
+ case 'locAreaMat':
+ return locAreaMat;
+ case 'deviceSite':
+ return deviceSite;
+ case 'waitPakin':
+ return waitPakin;
+ case 'waitPakinItem':
+ return waitPakinItem;
+ case 'waitPakinLog':
+ return waitPakinLog;
+ case 'waitPakinItemLog':
+ return waitPakinItemLog;
+ case 'task':
+ return task;
+ case 'taskItem':
+ return taskItem;
+ case 'taskLog':
+ return taskLog;
+ case 'taskItemLog':
+ return taskItemLog;
default:
return {
--
Gitblit v1.9.1