From 1de6b39bfe3967916dcab8122be0d69fbaba8cca Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 17:29:06 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/ResourceContent.js | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 3a81c8e..416d4cc 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,24 @@
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';
+import basContainer from './basicInfo/basContainer';
+import outBound from "./work/outBound";
+import checkOutBound from "./work/checkOutBound";
+import stockTransfer from "./work/stockTransfer";
const ResourceContent = (node) => {
switch (node.component) {
@@ -72,6 +83,8 @@
return warehouseAreas;
case 'warehouseAreasItem':
return warehouseAreasItem;
+ case 'warehouseStock':
+ return warehouseStock;
case 'loc':
return loc;
case 'container':
@@ -110,15 +123,34 @@
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;
+ case 'basContainer':
+ return basContainer;
+ case 'outBound':
+ return outBound;
+ case 'checkOutBound':
+ return checkOutBound;
+ case 'stockTransfer':
+ return stockTransfer;
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1