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 | 75 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 3a8765b..1a87dd5 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -20,21 +20,34 @@
import loc from './basicInfo/loc';
import container from './container';
import contract from './contract';
-import qlyInspect from './qlyInspect';
-import qlyIsptItem from './qlyIsptItem';
+import qlyInspect from './orders/qlyInspect';
import dictType from './system/dicts/dictType';
-import dictData from './system/dicts/dictData';
import companys from './basicInfo/companys';
-import serialRuleItem from './system/serialRuleItem';
+import locType from './basicInfo/locType';
+import locArea from './basicInfo//locArea';
+import locAreaMatRela from './basicInfo/locAreaMatRela';
+import locAreaMat from './basicInfo/locAreaMat';
import serialRule from './system/serialRule';
import whMat from './basicInfo/whMat';
-import asnOrder from './asnOrder';
-import asnOrderItem from './asnOrderItem';
-import purchaseItem from './purchaseItem';
-import purchase from './purchase';
+import asnOrder from './orders/asnOrder';
+import purchase from './orders/purchase';
import fields from './fields';
import fieldsItem from './fieldsItem';
import warehouseAreasItem from './warehouseAreasItem';
+import deviceSite from './basicInfo/deviceSite';
+import waitPakin from './waitPakin';
+import waitPakinLog from './histories/waitPakinLog';
+import asnOrderLog from './histories/asnOrderLog';
+import task from './task';
+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) {
@@ -66,6 +79,8 @@
return warehouseAreas;
case 'warehouseAreasItem':
return warehouseAreasItem;
+ case 'warehouseStock':
+ return warehouseStock;
case 'loc':
return loc;
case 'container':
@@ -74,32 +89,56 @@
return contract;
case 'qlyInspect':
return qlyInspect;
- case 'qlyIsptItem':
- return qlyIsptItem;
case 'dictType':
return dictType;
- case 'dictData':
- return dictData;
case 'companys':
return companys;
- case 'serialRuleItem':
- return serialRuleItem;
case 'serialRule':
return serialRule;
case 'whMat':
return whMat;
case 'asnOrder':
return asnOrder;
- case 'asnOrderItem':
- return asnOrderItem;
- case 'purchaseItem':
- return purchaseItem;
+ case 'asnOrderLog':
+ return asnOrderLog;
case 'purchase':
return purchase;
case 'fields':
return fields;
case 'fieldsItem':
return fieldsItem;
+ case 'locType':
+ return locType;
+ case 'locArea':
+ return locArea;
+ case 'locAreaMatRela':
+ return locAreaMatRela;
+ case 'locAreaMat':
+ return locAreaMat;
+ case 'deviceSite':
+ return deviceSite;
+ case 'waitPakin':
+ return waitPakin;
+ 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