修改库存管理 联查 查询条件 字典相关问题

ruoyi-ui/src/lang/en.js

@@ -563,6 +563,7 @@ export default {
   stockManagement: {
     stockId: 'Stock ID',
     cargoSpaceId: 'Cargo Space ID',
+    cargoSpaceName: 'Cargo Space Name',
     stockStatus: 'Stock Status',
     productStatus: 'Product Status',
     lotNo: 'Lot No',
@@ -611,12 +612,23 @@ export default {
     addSuccess: 'Added successfully',
     editSuccess: 'Modified successfully',
     deleteSuccess: 'Deleted successfully',
-    confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?'
+    confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?',
+    productId:'物料编码',
+    materialDesc:'物料描述',
+    englishDesc:'英文描述',
+    netWeight:'净重',
+    length:'长',
+    width:'宽',
+    height:'高',
+    volume:'体积',
+    cargoSpaceStatus:'货位状态'
+
   },
   // *************库存操作记录***************
   stockRecord: {
     stockId: 'Stock ID',
     cargoSpaceId: 'Cargo Space ID',
+    cargoSpaceName: '货位名称',
     trayCode: 'Tray Code',
     productId: 'Product ID',
     productName: 'Product Name',
@@ -674,7 +686,8 @@ export default {
     editSuccess: 'Modified successfully',
     deleteSuccess: 'Deleted successfully',
     confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?',
-    fileName: 'record_{time}'
+    fileName: 'record_{time}',
+    createTime:  '创建时间',
   },
   // **************库存冻结记录**************
   stockFreeze: {
@@ -734,7 +747,8 @@ export default {
     addSuccess: 'Added successfully',
     editSuccess: 'Modified successfully',
     deleteSuccess: 'Deleted successfully',
-    deleteConfirm: 'Are you sure to delete the selected stock freeze records?'
+    deleteConfirm: 'Are you sure to delete the selected stock freeze records?',
+    createTime:  '创建时间',
   },
   menu: {
     //收货单据新增
@@ -782,7 +796,7 @@ export default {
       LogManagement_OperationLog: 'OperationLog',
       //登录日志
       LogManagement_LoginLog: 'LoginLog',
-    
+
     //********************系统监控********************
     SystemMonitor: 'SystemMonitor',
       // 在线用户
@@ -1812,7 +1826,7 @@ export default {
       //--------------当前页面交互框操作提示--------------
       placeholderJobName: 'Enter JobName',
       placeholderJobGroup: 'Select JobGroup',
-      
+
       //---------------二级窗口操作提示------------------
       placeholderInvokeTarget: 'Enter InvokeTarget',
       placeholderCronExpression: 'Enter CronExpression',

ruoyi-ui/src/lang/zh.js

@@ -567,6 +567,7 @@ export default {
   stockManagement: {
     stockId: '库存id',
     cargoSpaceId: '货位id',
+    cargoSpaceName: '货位名称',
     stockStatus: '库存状态',
     productStatus: '物料状态',
     lotNo: '批次号',
@@ -577,11 +578,12 @@ export default {
     jobId: '作业ID',
     trayCode: '托盘条码',
     outQuantity: '出库数量',
-    stockinDetailId: '入库子单id',
+    stockinDetailId: '入库子单',
     stockinId: '入库主单',
     inType: '入库类型',
     inClassId: '入库班组ID',
     warehouseId: '仓库',
+    warehouseName: 'WarehouseName',
     stackingId: '垛型ID',
     operation: '操作',
     add: '新增',
@@ -604,7 +606,7 @@ export default {
     inputJobId: '请输入作业ID',
     inputTrayCode: '请输入托盘条码',
     inputOutQuantity: '请输入出库数量',
-    inputStockinDetailId: '请输入入库子单id',
+    inputStockinDetailId: '请输入入库子单',
     inputStockinId: '请输入入库主单',
     inputInClassId: '请输入入库班组ID',
     inputWarehouseId: '请输入仓库',
@@ -615,12 +617,25 @@ export default {
     addSuccess: '新增成功',
     editSuccess: '修改成功',
     deleteSuccess: '删除成功',
-    confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？'
+    confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？',
+    materialDesc:'物料描述',
+    materialInDesc:'物料描述',
+    englishDesc:'英文描述',
+    netWeight:'净重',
+    length:'长',
+    width:'宽',
+    height:'高',
+    volume:'体积',
+    productId:'物料编码',
+    cargoSpaceStatus: '货位状态'
+
+
   },
   // *************库存操作记录***************
   stockRecord: {
     stockId: '库存编码',
     cargoSpaceId: '货位编码',
+    cargoSpaceName: '货位名称',
     trayCode: '托盘条码',
     productId: '物品编码',
     productName: '物品名称',
@@ -678,7 +693,8 @@ export default {
     editSuccess: '修改成功',
     deleteSuccess: '删除成功',
     confirmDelete: '您确定要删除ID为' + '{whGuids}' + '的操作记录吗？',
-    fileName: '记录{time}'
+    fileName: '记录{time}',
+    createTime:  '创建时间',
   },
   // **************库存冻结记录**************
   stockFreeze: {
@@ -738,7 +754,11 @@ export default {
     addSuccess: '新增成功',
     editSuccess: '修改成功',
     deleteSuccess: '删除成功',
-    deleteConfirm: '是否确认删除所选库存冻结记录？'
+    deleteConfirm: '是否确认删除所选库存冻结记录？',
+    createTime:  '创建时间',
+    oldStatus:  '原状态',
+    currStatus:  '新状态',
+    cargoSpaceName:  '货位名称',
   },
 
   menu: {
@@ -1773,7 +1793,7 @@ export default {
       //--------------当前页面交互框操作提示--------------
       placeholderJobName: '请输入任务名称',
       placeholderJobGroup: '请选择任务组名',
-      
+
       //---------------二级窗口操作提示------------------
       placeholderInvokeTarget: '请输入调用目标字符串',
       placeholderCronExpression: '请输入Cron执行表达式',