From c5e5befb594587bd0c5144695ec59503333a6b9b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 17:05:05 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/ResourceContent.js | 103 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 4f8c9b4..04eb0c5 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -13,18 +13,41 @@
import menu from './system/menu'
import user from './system/user';
import operationRecord from './system/operationRecord';
-import customer from './customer';
-import shipper from './shipper';
-import matnr from './matnr';
-import matnrGroup from './matnrGroup';
-import warehouse from './warehouse';
+import matnr from './basicInfo/matnr';
+import matnrGroup from './basicInfo/matnrGroup';
+import warehouse from './basicInfo/warehouse';
import warehouseAreas from './warehouseAreas';
-import loc from './loc';
+import loc from './basicInfo/loc';
import container from './container';
import contract from './contract';
-import stockItem from './stockItem';
-import stock from './stock';
import qlyInspect from './qlyInspect';
+import qlyIsptItem from './qlyIsptItem';
+import dictType from './system/dicts/dictType';
+import dictData from './system/dicts/dictData';
+import companys from './basicInfo/companys';
+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';
+import asnOrder from './asnOrder';
+import asnOrderItem from './asnOrderItem';
+import purchaseItem from './purchaseItem';
+import purchase from './purchase';
+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';
const ResourceContent = (node) => {
@@ -47,10 +70,6 @@
return user;
case 'operationRecord':
return operationRecord;
- case 'customer':
- return customer;
- case 'shipper':
- return shipper;
case 'matnr':
return matnr;
case 'matnrGroup':
@@ -59,18 +78,70 @@
return warehouse;
case 'warehouseAreas':
return warehouseAreas;
+ case 'warehouseAreasItem':
+ return warehouseAreasItem;
case 'loc':
return loc;
case 'container':
return container;
case 'contract':
return contract;
- case 'stockItem':
- return stockItem;
- case 'stock':
- return stock;
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 'asnOrderLog':
+ return asnOrderLog;
+ case 'asnOrderItemLog':
+ return asnOrderItemLog;
+ case 'purchaseItem':
+ return purchaseItem;
+ 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 'waitPakinItem':
+ return waitPakinItem;
+ case 'waitPakinLog':
+ return waitPakinLog;
+ case 'waitPakinItemLog':
+ return waitPakinItemLog;
+ case 'task':
+ return task;
+ case 'taskItem':
+ return taskItem;
+
+
default:
return {
list: ListGuesser,
--
Gitblit v1.9.1