系统设置

src/components/AutoTable/mtable copy.jsx

@@ -275,7 +275,7 @@ class Mtable extends PureComponent {
                 delete newparams.pageSize;
               }
 
-              let res = await request("/wms" + path, {
+              let res = await request("/srwms" + path, {
                 body: JSON.stringify(newparams ? newparams : {}),
                 headers,
                 method: "POST",

src/components/InitForm/index.jsx

@@ -1050,7 +1050,7 @@ let InitForm = ({
 
                 const props = {
                   name: "file",
-                  action: "/wms/ngic-base-business/sysAttachment/uploadFile",
+                  action: "/srwms/ngic-base-business/sysAttachment/uploadFile",
                   listType: item.listType == "img" ? "picture-card" : "text",
                   accept: item.listType == "img" ? ".jpg,.png,.jpeg," : "*",
                   multiple: item.multiple ? item.multiple : false,

src/pages/system/Area/fields.js

 import { factorySelect } from "@/services/system";
 import { doFetch } from "@/utils/doFetch";
 export default {
-  "storeCode": {
-    "value": null,
-    "type": "input",
-    "title": "仓库编号",
-    "name": [
-      "storeCode"
-    ],
-    "required": false
+  storeAreaName: {
+    value: null,
+    type: "input",
+    title: "库区名称",
+    name: ["storeAreaName"],
+    required: true,
   },
-  "storeName": {
-    "value": null,
-    "type": "input",
-    "title": "仓库名称",
-    "name": [
-      "storeName"
-    ],
-    "required": true
-  },
-  "storeType": {
-    "value": null,
-    "type": "select",
-    "title": "仓库类型",
-    "name": [
-      "storeType"
-    ],
-    "required": true,
-    "options": {
-      database:()=>doFetch({url:"/ngic-base-business/sysDic/queryStoreTypeSelect",params:{}}),
-      params:{}
-    }
+  factoryId: {
+    value: null,
+    type: "select",
+    title: "工厂",
+    name: ["factoryId"],
+    required: true,
+    options: {
+      database: factorySelect,
+      params: {},
+    },
+    linked: true,
+    required: true,
   },
-  "factoryId": {
-    "value": null,
-    "type": "select",
-    "title": "所属工厂",
-    "name": ["factoryId"],
-    "required": true,
-    "options": {
-      "database": factorySelect,
-      "params": {},
+
+  storeId: {
+    value: null,
+    type: "select",
+    title: "负责仓库",
+    name: ["storeId"],
+    required: false,
+    belinked: {
+      options: {
+        database: (params) =>
+          doFetch({
+            url: "/ngic-auth/sysStore/selectionBox",
+            params: { ...params },
+          }),
+        params: {
+          factoryId: "linked",
+        },
+      },
     },
-  }
+    required: true, 
+  },
+  remark: {
+    value: null,
+    type: "textarea",
+    title: "描述",
+    name: ["remark"],
+    required: false,
+  },
 };

src/pages/system/Area/index.jsx

@@ -93,19 +93,19 @@ const Store = (props) => {
     { vs, fields, iftype, curitem, detail, visible } = state,
     columns = [
       {
-        "title": "仓库编号",
-        "dataIndex": "storeCode",
-        "key": "storeCode"
+        "title": "库区名称",
+        "dataIndex": "storeAreaName",
+        "key": "storeAreaName"
       },
       {
-        "title": "仓库名称",
-        "dataIndex": "storeName",
-        "key": "storeName"
+        "title": "所属工厂",
+        "dataIndex": "factoryName",
+        "key": "factoryName"
       },
       {
-        "title": "仓库类型",
-        "dataIndex": "storeTypeName",
-        "key": "storeType",
+        "title": "所属仓库",
+        "dataIndex": "storeName",
+        "key": "storeName",
         "valueType": "select",
         "options": {
           database: () => doFetch({ url: "/ngic-base-business/sysDic/queryStoreTypeSelect", params: {} }),
@@ -113,9 +113,11 @@ const Store = (props) => {
         }
       },
       {
-        "title": "工厂名",
-        "dataIndex": "factoryName",
-        "key": "factoryName"
+        "title": "描述",
+        "dataIndex": "remark",
+        "key": "remark",
+        "valueType": "textarea",
+        
       },
       {
         title: "操作",
@@ -129,9 +131,6 @@ const Store = (props) => {
 
   function extraAction(text, record, _, action) {
     return [
-      getPrem("sysDepartment_save", action, "库位管理", () => {
-        dispatch({ type: "see", curitem: record });
-      }),
       getPrem("sysDepartment_save", action, "修改", () => {
         for (let i in defaultFields) {
           defaultFields[i].value = record[i];
@@ -139,10 +138,10 @@ const Store = (props) => {
         dispatch({ type: "edit", fields: defaultFields, curitem: record });
       }),
       getPrem("sysDepartment_deleteById", action, "删除", null, {
-        title: "确认删除该仓库？",
+        title: "确认删除该库区？",
         onConfirm: () => {
           run({
-            url: "/ngic-auth/sysStore/deleteById",
+            url: "/ngic-auth/sysStoreArea/deleteById",
             params: { id: record.id },
           });
         },
@@ -155,7 +154,7 @@ const Store = (props) => {
     //新增&修改
     let difrid = iftype.val == "edit" ? { id: curitem.id } : {};
     run({
-      url: "/ngic-auth/sysStore/save",
+      url: "/ngic-auth/sysStoreArea/save",
       params: { ...newfields, ...difrid },
     });
   };
@@ -182,7 +181,7 @@ const Store = (props) => {
         pagetitle={props.route.name} //页面标题
         pageextra={extrarender} //页面操作 新增or批量删除
         columns={columns}
-        path="/ngic-auth/sysStore/queryList"
+        path="/ngic-auth/sysStoreArea/page"
         actionRef={actionRef}
         onRef={(node) => (ChildRef = node)}
       ></AutoTable>

src/pages/system/Store/index.jsx

@@ -113,7 +113,7 @@ const Store = (props) => {
         }
       },
       {
-        "title": "工厂名",
+        "title": "所属工厂",
         "dataIndex": "factoryName",
         "key": "factoryName"
       },
@@ -129,9 +129,9 @@ const Store = (props) => {
 
   function extraAction(text, record, _, action) {
     return [
-      getPrem("sysDepartment_save", action, "库位管理", () => {
-        dispatch({ type: "see", curitem: record });
-      }),
+      // getPrem("sysDepartment_save", action, "库位管理", () => {
+      //   dispatch({ type: "see", curitem: record });
+      // }),
       getPrem("sysDepartment_save", action, "修改", () => {
         for (let i in defaultFields) {
           defaultFields[i].value = record[i];

src/services/craft.js

@@ -2,7 +2,7 @@ import request from "@/utils/request";
 
 //单位下拉框
 export async function unitSelect(params) {
-  return request(`/wms/ngic-base-business/sysDic/querySelectListByParentKey`, {
+  return request(`/srwms/ngic-base-business/sysDic/querySelectListByParentKey`, {
     method: "POST",
     data: params,
   });
@@ -10,7 +10,7 @@ export async function unitSelect(params) {
 //序列号规则
 export async function serialNumberRuleSelect(params) {
   return request(
-    `/wms/ngic-base-business/bmMainNumberRule/querySunSelectByNoTypeCode`,
+    `/srwms/ngic-base-business/bmMainNumberRule/querySunSelectByNoTypeCode`,
     {
       method: "POST",
       data: params,
@@ -19,7 +19,7 @@ export async function serialNumberRuleSelect(params) {
 }
 //工艺路线
 export async function processLineSelect(params) {
-  return request(`/wms/ngic-workmanship/pmProcessLine/selectionBox`, {
+  return request(`/srwms/ngic-workmanship/pmProcessLine/selectionBox`, {
     method: "POST",
     data: params,
   });
@@ -27,7 +27,7 @@ export async function processLineSelect(params) {
 //工艺路线下的工序 下拉
 export async function processByProcessLine(params) {
   return request(
-    `/wms/ngic-workmanship/workingProcedure/query/selectbox/processLine`,
+    `/srwms/ngic-workmanship/workingProcedure/query/selectbox/processLine`,
     {
       method: "POST",
       data: params,
@@ -37,7 +37,7 @@ export async function processByProcessLine(params) {
 //车间下的工序 下拉
 export async function workingProcedureByShop(params) {
   return request(
-    `/wms/ngic-workmanship/workingProcedure/query/selectbox/shop`,
+    `/srwms/ngic-workmanship/workingProcedure/query/selectbox/shop`,
     {
       method: "POST",
       data: params,
@@ -46,7 +46,7 @@ export async function workingProcedureByShop(params) {
 }
 //物料工艺路线所属车间的工序 下拉
 export async function processByShop(params) {
-  return request(`/wms/ngic-workmanship/workingProcedure/query/selectbox`, {
+  return request(`/srwms/ngic-workmanship/workingProcedure/query/selectbox`, {
     method: "POST",
     data: params,
   });
@@ -54,14 +54,14 @@ export async function processByShop(params) {
 
 //产出物料编号-名称-单位 下拉
 export async function selectboxMaterie(params) {
-  return request(`/wms/ngic-workmanship/pmMaterie/query/selectboxMaterie`, {
+  return request(`/srwms/ngic-workmanship/pmMaterie/query/selectboxMaterie`, {
     method: "POST",
     data: params,
   });
 }
 //标签模板下拉
 export async function bmTableSelect(params) {
-  return request(`/wms/ngic-base-business/bmTable/querySelectByType`, {
+  return request(`/srwms/ngic-base-business/bmTable/querySelectByType`, {
     method: "POST",
     data: params,
   });

src/services/device.js

@@ -2,7 +2,7 @@ import request from '@/utils/request';
 
 //设备型号下拉框
 export async function equipmentModelList(params) {
-    return request('/wms/ngic-equipment-asset/equipmentModel/query/selection', {
+    return request('/srwms/ngic-equipment-asset/equipmentModel/query/selection', {
         method: 'POST',
         data: params,
     });
@@ -10,91 +10,91 @@ export async function equipmentModelList(params) {
 
 //设备型号--(保养标准页面)下拉框
 export async function equipmentMaintainModelList(params) {
-    return request('/wms/ngic-equipment-asset/equipmentModel/query/selection/maintainStandard', {
+    return request('/srwms/ngic-equipment-asset/equipmentModel/query/selection/maintainStandard', {
         method: 'POST',
         data: params,
     });
 }
 //设备型号--(点检标准页面)下拉框
 export async function equipmentCheckModelList(params) {
-    return request('/wms/ngic-equipment-asset/equipmentModel/query/selection/checkStandard', {
+    return request('/srwms/ngic-equipment-asset/equipmentModel/query/selection/checkStandard', {
         method: 'POST',
         data: params,
     });
 }
 //根据设备型号id查询是寿命件的备件
 export async function lifespareSelect(params) {
-    return request(`/wms/ngic-equipment-asset/equipmentModelSpare/liveparts/selectionbox/byEquipmentModelId`, {
+    return request(`/srwms/ngic-equipment-asset/equipmentModelSpare/liveparts/selectionbox/byEquipmentModelId`, {
         method: 'POST',
         data: params
     });
 }
 //备件下拉框
 export async function mdmSpareList(params) {
-    return request(`/wms/ngic-spare-parts/mdmSpareParts/mdmSpareList`, {
+    return request(`/srwms/ngic-spare-parts/mdmSpareParts/mdmSpareList`, {
         method: 'POST',
         data: params
     });
 }
 //设备供应商详情
 export async function deviceprovideDetail(params) {
-    return request('/wms/ngic-auth/sysSupplier/query/detail', {
+    return request('/srwms/ngic-auth/sysSupplier/query/detail', {
         method: 'POST',
         data: params,
     });
 }
 //供应商下拉框
 export async function equipmentSupplierList(params) {
-    return request('/wms/ngic-equipment-asset/equipmentSupplier/query/selection', {
+    return request('/srwms/ngic-equipment-asset/equipmentSupplier/query/selection', {
         method: 'POST',
         data: params,
     });
 }
 //设备供应商删除前校验
 export async function deleteProvideCheck(params) {
-    return request('/wms/ngic-equipment-asset/equipmentSupplier/deleteById', {
+    return request('/srwms/ngic-equipment-asset/equipmentSupplier/deleteById', {
         method: 'POST',
         data: params,
     });
 }
 //设备信息
 export async function equipmentDetail(params) {
-    return request('/wms/ngic-equipment-asset/equipment/queryDetail', {
+    return request('/srwms/ngic-equipment-asset/equipment/queryDetail', {
         method: 'POST',
         data: params,
     });
 }
 //查询父设备id和子设备id，添加子设备时使用
 export async function equipmentChildren(params) {
-    return request('/wms/ngic-equipment-asset/equipment/queryChildren', {
+    return request('/srwms/ngic-equipment-asset/equipment/queryChildren', {
         method: 'POST',
         data: params,
     });
 }
 //履历详情
 export async function equipmentLogDetail(params) {
-    return request('/wms/ngic-equipment-asset/equipmentLog/query/detail', {
+    return request('/srwms/ngic-equipment-asset/equipmentLog/query/detail', {
         method: 'POST',
         data: params,
     });
 }
 //设备类型树查询
 export async function deviceTypequeryTreeList(params) {
-    return request(`/wms/ngic-equipment-asset/equipmentType/queryTreeList`, {
+    return request(`/srwms/ngic-equipment-asset/equipmentType/queryTreeList`, {
         method: 'POST',
         data: params,
     });
 }
 //设备详情
 export async function equipmentAllDetail(params) {
-    return request('/wms/ngic-equipment-asset/equipment/query/all/detail', {
+    return request('/srwms/ngic-equipment-asset/equipment/query/all/detail', {
         method: 'POST',
         data: params,
     });
 }
 //设备型号详情
 export async function equipmentModelDetails(params) {
-    return request('/wms/ngic-equipment-asset/equipmentModelSpare/queryById', {
+    return request('/srwms/ngic-equipment-asset/equipmentModelSpare/queryById', {
         method: 'POST',
         data: params,
     });
@@ -102,14 +102,14 @@ export async function equipmentModelDetails(params) {
 
 //设备下拉框
 export async function equipmentList(params) {
-    return request('/wms/ngic-equipment-asset/equipment/query/selection', {
+    return request('/srwms/ngic-equipment-asset/equipment/query/selection', {
         method: 'POST',
         data: params,
     });
 }
 //IOT设备下拉框
 export async function equipmentIotRelationList(params) {
-    return request('/wms/ngic-equipment-asset/equipmentIotRelation/query/device/selection', {
+    return request('/srwms/ngic-equipment-asset/equipmentIotRelation/query/device/selection', {
         method: 'POST',
         data: params,
     });
@@ -117,7 +117,7 @@ export async function equipmentIotRelationList(params) {
 
 //设备下拉框（过滤已报修）
 export async function canApplyRepair(params) {
-    return request('/wms/ngic-equipment-repair/omEquipmentApplyRepair/canApplyRepair/equipmens/selection', {
+    return request('/srwms/ngic-equipment-repair/omEquipmentApplyRepair/canApplyRepair/equipmens/selection', {
         method: 'POST',
         data: params,
     });
@@ -125,7 +125,7 @@ export async function canApplyRepair(params) {
 
 //关联备件
 export async function equipmentModelSpareImport(params) {
-    return request('/wms/ngic-equipment-asset/equipmentModelSpare/importExcel', {
+    return request('/srwms/ngic-equipment-asset/equipmentModelSpare/importExcel', {
         method: 'POST',
         data: params,
         type: "form"

src/services/platform.js

@@ -2,20 +2,20 @@ import request from "@/utils/request";
 
 //查询编号类型下拉框(去除已存在的没有子类的类型)
 export async function bmNoType(params) {
-  return request(`/wms/ngic-base-business/bmNoType/querySelect`, {
+  return request(`/srwms/ngic-base-business/bmNoType/querySelect`, {
     method: "POST",
     data: params,
   });
 }
 //查询编号类型下拉框全部
 export async function bmNoTypeAll(params) {
-  return request(`/wms/ngic-base-business/bmNoType/querySelectAll`, {
+  return request(`/srwms/ngic-base-business/bmNoType/querySelectAll`, {
     method: "POST",
     data: params,
   });
 }
 export async function bmNoRule(params) {
-  return request(`/wms/ngic-base-business/bmNoRule/querySelect`, {
+  return request(`/srwms/ngic-base-business/bmNoRule/querySelect`, {
     method: "POST",
     data: params,
   });
@@ -23,7 +23,7 @@ export async function bmNoRule(params) {
 //根据表单id查询条件下拉框
 export async function paFormConditionSelect(params) {
   return request(
-    `/wms/ngic-base-business/paFormCondition/querySelectByFormId`,
+    `/srwms/ngic-base-business/paFormCondition/querySelectByFormId`,
     {
       method: "POST",
       data: params,
@@ -33,7 +33,7 @@ export async function paFormConditionSelect(params) {
 //根据条件id查询条件值的下拉框
 export async function queryConValueSelect(params) {
   return request(
-    `/wms/ngic-base-business/paFormCondition/queryConValueSelectByconId`,
+    `/srwms/ngic-base-business/paFormCondition/queryConValueSelectByconId`,
     {
       method: "POST",
       data: params,
@@ -42,7 +42,7 @@ export async function queryConValueSelect(params) {
 }
 //标签模板
 export async function bmTableFileSelect(params) {
-  return request(`/wms/ngic-base-business/bmTableFile/querySelect`, {
+  return request(`/srwms/ngic-base-business/bmTableFile/querySelect`, {
     method: "POST",
     data: params,
   });
@@ -50,14 +50,14 @@ export async function bmTableFileSelect(params) {
 
 //推送类型下拉
 export async function paBusinessMsgScene(params) {
-  return request(`/wms/ngic-base-business/paBusinessMsgScene/queryAllForSelect`, {
+  return request(`/srwms/ngic-base-business/paBusinessMsgScene/queryAllForSelect`, {
       method: 'POST',
       data: params,
   });
 }
 //推送配置
 export async function paBusinessMsgOption(params) {
-  return request(`/wms/ngic-base-business/paBusinessMsgOption/queryById`, {
+  return request(`/srwms/ngic-base-business/paBusinessMsgOption/queryById`, {
       method: 'POST',
       data: params,
   });