From 668590b860e572990b357747f39810e955823caf Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 19 五月 2025 20:16:53 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/ResourceContent.js | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 5a90285..1a87dd5 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -20,7 +20,7 @@
import loc from './basicInfo/loc';
import container from './container';
import contract from './contract';
-import qlyInspect from './qlyInspect';
+import qlyInspect from './orders/qlyInspect';
import dictType from './system/dicts/dictType';
import companys from './basicInfo/companys';
import locType from './basicInfo/locType';
@@ -34,13 +34,20 @@
import fields from './fields';
import fieldsItem from './fieldsItem';
import warehouseAreasItem from './warehouseAreasItem';
-import deviceSite from './basicInfo//deviceSite';
+import deviceSite from './basicInfo/deviceSite';
import waitPakin from './waitPakin';
-import waitPakinItem from './waitPakinItem';
-import waitPakinLog from './waitPakinLog';
-import asnOrderLog from './orders/asnOrderLog';
+import waitPakinLog from './histories/waitPakinLog';
+import asnOrderLog from './histories/asnOrderLog';
import task from './task';
-import taskLog from './taskLog';
+import taskLog from './histories/taskLog';
+import stock from './orders/stock';
+import delivery from './orders/delivery';
+import outStock from './orders/outStock';
+import deviceBind from './deviceBind';
+import wave from './orders/wave';
+import locItem from './locItem'
+import basStation from './basicInfo/basStation';
+import warehouseStock from './statistics/stockManage';
const ResourceContent = (node) => {
switch (node.component) {
@@ -72,6 +79,8 @@
return warehouseAreas;
case 'warehouseAreasItem':
return warehouseAreasItem;
+ case 'warehouseStock':
+ return warehouseStock;
case 'loc':
return loc;
case 'container':
@@ -80,8 +89,6 @@
return contract;
case 'qlyInspect':
return qlyInspect;
- case 'qlyIsptItem':
- return qlyIsptItem;
case 'dictType':
return dictType;
case 'companys':
@@ -92,8 +99,6 @@
return whMat;
case 'asnOrder':
return asnOrder;
- case 'asnOrderItem':
- return asnOrderItem;
case 'asnOrderLog':
return asnOrderLog;
case 'purchase':
@@ -114,15 +119,26 @@
return deviceSite;
case 'waitPakin':
return waitPakin;
- case 'waitPakinItem':
- return waitPakinItem;
case 'waitPakinLog':
return waitPakinLog;
case 'task':
return task;
case 'taskLog':
return taskLog;
-
+ case 'stock':
+ return stock;
+ case 'delivery':
+ return delivery;
+ case 'outStock':
+ return outStock;
+ case 'deviceBind':
+ return deviceBind;
+ case 'wave':
+ return wave;
+ case 'locItem':
+ return locItem;
+ case 'basStation':
+ return basStation;
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1