盘点审核流程修改

This commit is contained in:
liuhanqing
2025-07-24 09:08:01 +08:00
parent fd5ae47572
commit c15412f2af
6 changed files with 551 additions and 539 deletions

View File

@@ -176,6 +176,8 @@ public class CheckDifferenceRecordController extends BaseController {
newStock.setProductGuid(record.getProductGuid()); newStock.setProductGuid(record.getProductGuid());
newStock.setProductId(record.getProductId()); newStock.setProductId(record.getProductId());
newStock.setStockStatus("1"); // 设置库存状态为正常 newStock.setStockStatus("1"); // 设置库存状态为正常
newStock.setWarehouseId(record.getWarehouseId());
newStock.setInType("");
// 初始化extraField对象 // 初始化extraField对象
ExtraField extraField = new ExtraField(); ExtraField extraField = new ExtraField();
extraField.setProductId(record.getProductId()); extraField.setProductId(record.getProductId());

View File

@@ -105,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if> <if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if> <if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if> <if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
</where> </where>
</select> </select>

View File

@@ -76,6 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare3 != null and spare3 != ''"> and cs.spare3 = #{spare3}</if> <if test="spare3 != null and spare3 != ''"> and cs.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and cs.spare4 = #{spare4}</if> <if test="spare4 != null and spare4 != ''"> and cs.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and cs.spare5 = #{spare5}</if> <if test="spare5 != null and spare5 != ''"> and cs.spare5 = #{spare5}</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
</where> </where>
</select> </select>

View File

@@ -26,12 +26,12 @@ export default {
reviewing: 'Reviewing', reviewing: 'Reviewing',
executing: 'Executing', executing: 'Executing',
emptyLocation:"emptyLocation", emptyLocation: "emptyLocation",
fullLocation:"fullLocation", fullLocation: "fullLocation",
inboundAllocated:"inboundAllocated", inboundAllocated: "inboundAllocated",
outboundAllocated:"outboundAllocated", outboundAllocated: "outboundAllocated",
inboundNeedCheck:"inboundNeedCheck", inboundNeedCheck: "inboundNeedCheck",
outboundNeedCheck:"outboundNeedCheck", outboundNeedCheck: "outboundNeedCheck",
}, },
@@ -42,7 +42,7 @@ export default {
password: 'Password', password: 'Password',
code: 'Code', code: 'Code',
rememberMe: 'Remember Me', rememberMe: 'Remember Me',
bottom:'Copyright © 2025 ForTucky All Rights Reserved.400-1882-319', bottom: 'Copyright © 2025 ForTucky All Rights Reserved.400-1882-319',
accountLogin: 'Account Login' accountLogin: 'Account Login'
}, },
tagsView: { tagsView: {
@@ -114,7 +114,7 @@ export default {
spare8: 'Volume (m³)', spare8: 'Volume (m³)',
netWeight: 'Net Weight (KG)', netWeight: 'Net Weight (KG)',
grossWeight: 'Gross Weight (KG)', grossWeight: 'Gross Weight (KG)',
addProductError:'product exist,please update product num' addProductError: 'product exist,please update product num'
}, },
// ***************收货单据管理************* // ***************收货单据管理*************
inReceiveStockin: { inReceiveStockin: {
@@ -129,8 +129,8 @@ export default {
status: 'Document Status', status: 'Document Status',
selectStatus: 'Please select document status', selectStatus: 'Please select document status',
search: 'Search', search: 'Search',
inputMaterialDesc:'inputMaterialDesc', inputMaterialDesc: 'inputMaterialDesc',
inputLotNo:'inputLotNo', inputLotNo: 'inputLotNo',
reset: 'Reset', reset: 'Reset',
generateStockin: 'Generate Stockin Document', generateStockin: 'Generate Stockin Document',
delet: 'Delete', delet: 'Delete',
@@ -226,7 +226,7 @@ export default {
englishDesc: '英文描述', englishDesc: '英文描述',
cartonNo: '箱号', cartonNo: '箱号',
packingMethod: '包装方式', packingMethod: '包装方式',
createTime:"创建时间" createTime: "创建时间"
}, },
// ***************出库单据管理************** // ***************出库单据管理**************
outStockoutManage: { outStockoutManage: {
@@ -235,13 +235,13 @@ export default {
status: 'Document Status', status: 'Document Status',
customerNo: 'Customer Code', customerNo: 'Customer Code',
customerName: 'Customer Name', customerName: 'Customer Name',
productName:'Product Name', productName: 'Product Name',
createManId: 'Creator', createManId: 'Creator',
createDate: 'Create Time', createDate: 'Create Time',
startDate: 'Start Time', startDate: 'Start Time',
finishDate: 'Confirm Time', finishDate: 'Confirm Time',
warehouseId: 'Warehouse ID', warehouseId: 'Warehouse ID',
warehouseName:'Warehouse Name', warehouseName: 'Warehouse Name',
stockoutDetailId: 'Outbound Detail ID', stockoutDetailId: 'Outbound Detail ID',
productId: 'Material Code', productId: 'Material Code',
lotNo: 'Batch No.', lotNo: 'Batch No.',
@@ -265,15 +265,15 @@ export default {
selectOutType: 'Please select outbound type', selectOutType: 'Please select outbound type',
selectStatus: 'Please select document status', selectStatus: 'Please select document status',
inputCustomerNo: 'Please input customer code', inputCustomerNo: 'Please input customer code',
inputCustomerName:'Please input customer name', inputCustomerName: 'Please input customer name',
inputProductName:'Please input product name', inputProductName: 'Please input product name',
selectStartDate: 'Please input start date', selectStartDate: 'Please input start date',
selectFinishDate: 'Please input finish date', selectFinishDate: 'Please input finish date',
auditTitle:'auditTitle', auditTitle: 'auditTitle',
selectExit:'selectExit', selectExit: 'selectExit',
pleaseSelectExit:'pleaseSelectExit', pleaseSelectExit: 'pleaseSelectExit',
confirmExit:'confirm', confirmExit: 'confirm',
cancelExit:'cancel', cancelExit: 'cancel',
}, },
// ***************新建出库单据************** // ***************新建出库单据**************
@@ -342,7 +342,7 @@ export default {
selectStartTime: 'Please select start time', selectStartTime: 'Please select start time',
finishTime: 'End Time', finishTime: 'End Time',
selectFinishTime: 'Please select end time', selectFinishTime: 'Please select end time',
createTime:'Create Time', createTime: 'Create Time',
// Location Information // Location Information
warehouse: 'Warehouse', warehouse: 'Warehouse',
@@ -401,7 +401,7 @@ export default {
materialExistWarning: 'Selected material already exists, please reselect', materialExistWarning: 'Selected material already exists, please reselect',
quantityExceedError: 'Quantity cannot exceed stock quantity', quantityExceedError: 'Quantity cannot exceed stock quantity',
saveSuccess: 'Document {msg} saved successfully', saveSuccess: 'Document {msg} saved successfully',
lotNo:'lotNo', lotNo: 'lotNo',
cargoSpaceName: 'cargoSpaceName', cargoSpaceName: 'cargoSpaceName',
}, },
//***************盘点单据管理*************** //***************盘点单据管理***************
@@ -449,10 +449,13 @@ export default {
onlyUnreviewedCanReview: 'Only unreviewed documents can be reviewed', onlyUnreviewedCanReview: 'Only unreviewed documents can be reviewed',
confirmSuccess: 'Confirm successful', confirmSuccess: 'Confirm successful',
onlyReviewedCanConfirm: 'Only reviewed documents can be confirmed', onlyReviewedCanConfirm: 'Only reviewed documents can be confirmed',
autoAllocation:'autoAllocation', autoAllocation: 'autoAllocation',
autoAllocationSuccess:"autoAllocationSuccess", autoAllocationSuccess: "autoAllocationSuccess",
checkPort:'checkPort', checkPort: 'checkPort',
departmentName: 'departmentName', departmentName: 'departmentName',
auditTitle: 'auditTitle',
selectExit: 'selectExit',
pleaseSelectExit: 'pleaseSelectExit',
}, },
// ***************盘点入库作业************* // ***************盘点入库作业*************
checkJobIn: { checkJobIn: {
@@ -517,14 +520,14 @@ export default {
statusRequired: 'Task Status cannot be empty', statusRequired: 'Task Status cannot be empty',
taskNoRequired: 'Task No. cannot be empty', taskNoRequired: 'Task No. cannot be empty',
selectData: 'Please select data to operate', selectData: 'Please select data to operate',
materialDesc:"materialDesc", materialDesc: "materialDesc",
englishDesc:"englishDesc", englishDesc: "englishDesc",
cartonNo:"cartonNo", cartonNo: "cartonNo",
packingMethod:"packingMethod", packingMethod: "packingMethod",
netWeight:"netWeight", netWeight: "netWeight",
totalNetWeight:"totalNetWeight", totalNetWeight: "totalNetWeight",
grossWeight:"grossWeight", grossWeight: "grossWeight",
onlyOneCanAutoAllocation:"onlyOneCanAutoAllocation" onlyOneCanAutoAllocation: "onlyOneCanAutoAllocation"
}, },
// **************盘点出库作业**************** // **************盘点出库作业****************
checkJobOut: { checkJobOut: {
@@ -584,14 +587,14 @@ export default {
finishSuccess: 'Manual finish successful', finishSuccess: 'Manual finish successful',
confirmInvalid: 'Are you sure to manually invalid the data with ID "{jobIds}"?', confirmInvalid: 'Are you sure to manually invalid the data with ID "{jobIds}"?',
invalidSuccess: 'Manual invalid successful', invalidSuccess: 'Manual invalid successful',
materialDesc:"materialDesc", materialDesc: "materialDesc",
englishDesc:"englishDesc", englishDesc: "englishDesc",
cartonNo:"cartonNo", cartonNo: "cartonNo",
packingMethod:"packingMethod", packingMethod: "packingMethod",
netWeight:"netWeight", netWeight: "netWeight",
totalNetWeight:"totalNetWeight", totalNetWeight: "totalNetWeight",
grossWeight:"grossWeight", grossWeight: "grossWeight",
onlyOneCanAutoAllocation:"onlyOneCanAutoAllocation", onlyOneCanAutoAllocation: "onlyOneCanAutoAllocation",
outQuantity: 'outQuantity', outQuantity: 'outQuantity',
pickQuantity: 'pickQuantity', pickQuantity: 'pickQuantity',
department: 'department', department: 'department',
@@ -600,12 +603,12 @@ export default {
}, },
// ****************盘点差异管理***************** // ****************盘点差异管理*****************
checkDifference: { checkDifference: {
unaudited:'unaudited', unaudited: 'unaudited',
warehouseId:'warehouse', warehouseId: 'warehouse',
audited:'audited', audited: 'audited',
inputStatus:'Please Select Status', inputStatus: 'Please Select Status',
status:'status', status: 'status',
audit:'audit', audit: 'audit',
createTime: 'createTime', createTime: 'createTime',
checkGuid: 'Check ID', checkGuid: 'Check ID',
checkStockDetailId: 'Check Document ID', checkStockDetailId: 'Check Document ID',
@@ -638,7 +641,7 @@ export default {
inputOldQuantity: 'Please enter original value', inputOldQuantity: 'Please enter original value',
inputNewQuantity: 'Please enter new value', inputNewQuantity: 'Please enter new value',
inputProductGuid: 'Please enter product GUID', inputProductGuid: 'Please enter product GUID',
inputRecordType:'Please select RecordType' inputRecordType: 'Please select RecordType'
}, },
// ********************库存信息************* // ********************库存信息*************
stockManagement: { stockManagement: {
@@ -694,23 +697,22 @@ export default {
editSuccess: 'Modified successfully', editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted 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:'productId', productId: 'productId',
materialDesc:'materialDesc', materialDesc: 'materialDesc',
englishDesc:'englishDesc', englishDesc: 'englishDesc',
netWeight:'netWeight', netWeight: 'netWeight',
length:'length', length: 'length',
width:'width', width: 'width',
height:'height', height: 'height',
volume:'volume', volume: 'volume',
cargoSpaceStatus: 'cargoSpaceStatus', cargoSpaceStatus: 'cargoSpaceStatus',
cargoSpaceStockStatus: 'cargoSpaceStockStatus', cargoSpaceStockStatus: 'cargoSpaceStockStatus',
inputMaterialDesc: 'inputMaterialDesc', inputMaterialDesc: 'inputMaterialDesc',
deleteConfirm:"deleteStock" deleteConfirm: "deleteStock"
}, },
searchViewStockSecure: { searchViewStockSecure: {
stockId: 'Stock ID', stockId: 'Stock ID',
cargoSpaceId: 'Cargo Space ID', cargoSpaceId: 'Cargo Space ID',
@@ -750,9 +752,9 @@ export default {
editSuccess: 'Modified successfully', editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully', deleteSuccess: 'Deleted successfully',
deleteConfirm: 'Are you sure you want to delete the stock secure query with ID "{stockIds}"?', deleteConfirm: 'Are you sure you want to delete the stock secure query with ID "{stockIds}"?',
search:'search', search: 'search',
reset:'reset', reset: 'reset',
export:'export' export: 'export'
}, },
// *************Supplier Management*************** // *************Supplier Management***************
@@ -1131,7 +1133,6 @@ export default {
LogManagement_LoginLog: 'LoginLog', LogManagement_LoginLog: 'LoginLog',
// ****************盘点管理****************** // ****************盘点管理******************
inventoryManagement: 'inventoryManagement', inventoryManagement: 'inventoryManagement',
createNewInventoryDocument: 'createNewInventoryDocument', createNewInventoryDocument: 'createNewInventoryDocument',
@@ -1145,23 +1146,23 @@ export default {
stockOperationRecords: 'stockOperationRecords', stockOperationRecords: 'stockOperationRecords',
stockFreezeRecord: 'stockFreezeRecord', stockFreezeRecord: 'stockFreezeRecord',
// ***************基础信息**************** // ***************基础信息****************
basicInformation:'basicInformation', basicInformation: 'basicInformation',
customerManagement:'customerManagement', customerManagement: 'customerManagement',
supplierManagement:'supplierManagement', supplierManagement: 'supplierManagement',
materialManagement:'materialManagement', materialManagement: 'materialManagement',
basicPointLocation:'basicPointLocation', basicPointLocation: 'basicPointLocation',
//*************** 查询统计************* //*************** 查询统计*************
queryStatistics:'queryStatistics', queryStatistics: 'queryStatistics',
inventoryDetailQuery:'inventoryDetailQuery', inventoryDetailQuery: 'inventoryDetailQuery',
inventorySummaryQuery:'inventorySummaryQuery', inventorySummaryQuery: 'inventorySummaryQuery',
inboundDocumentHistory:'inboundDocumentHistory', inboundDocumentHistory: 'inboundDocumentHistory',
outboundDocumentHistory:'outboundDocumentHistory', outboundDocumentHistory: 'outboundDocumentHistory',
inboundTaskFlow:'inboundTaskFlow', inboundTaskFlow: 'inboundTaskFlow',
outboundTaskFlow:'outboundTaskFlow', outboundTaskFlow: 'outboundTaskFlow',
flatInventoryFlow:'flatInventoryFlow', flatInventoryFlow: 'flatInventoryFlow',
flatOutboundFlow:'flatOutboundFlow', flatOutboundFlow: 'flatOutboundFlow',
safetyStockInquiry:'safetyStockInquiry', safetyStockInquiry: 'safetyStockInquiry',
warningInventoryInquiry:'warningInventoryInquiry' warningInventoryInquiry: 'warningInventoryInquiry'
}, },
//=====================仓库(库区)管理===================== //=====================仓库(库区)管理=====================
warehouse: { warehouse: {
@@ -1363,7 +1364,7 @@ export default {
btnRemark: 'Remark', btnRemark: 'Remark',
btnAddOrBinding: 'Add/Binding', btnAddOrBinding: 'Add/Binding',
btnDeleteOrUnbinding: 'Delete/Unbinding', btnDeleteOrUnbinding: 'Delete/Unbinding',
btnDetails:'Details', btnDetails: 'Details',
//--------------交互文本-------------- //--------------交互文本--------------
//--------------提示信息-------------- //--------------提示信息--------------
@@ -1457,8 +1458,8 @@ export default {
//---函数:handleStatusChange--- //---函数:handleStatusChange---
textEnable: 'enable', textEnable: 'enable',
textDisable: 'disable', textDisable: 'disable',
textUserConfirm1:"Are you sure you want to \"", textUserConfirm1: "Are you sure you want to \"",
textUserConfirm2:"\" user?", textUserConfirm2: "\" user?",
textSuccess: 'success', textSuccess: 'success',
//---函数:handleResetPwd--- //---函数:handleResetPwd---
@@ -1508,41 +1509,41 @@ export default {
//------------------------------------------------------------------------ //------------------------------------------------------------------------
//分配角色 //分配角色
basInfo:'Basic Infomation', basInfo: 'Basic Infomation',
roleInfo:'Role Info', roleInfo: 'Role Info',
roleId:'Role Id', roleId: 'Role Id',
roleName:'Role Name', roleName: 'Role Name',
roleKey:'Role Key', roleKey: 'Role Key',
//个人信息 //个人信息
userInfo:'User Info', userInfo: 'User Info',
roleGroup:'Role Group', roleGroup: 'Role Group',
basDetail:'Basic Detail', basDetail: 'Basic Detail',
resetPwd:'Reset Password', resetPwd: 'Reset Password',
//基本资料---用户信息 //基本资料---用户信息
male:'Male', male: 'Male',
female:'Female', female: 'Female',
//基本资料---修改密码 //基本资料---修改密码
oldPassword:'Old Password', oldPassword: 'Old Password',
newPassword:'New Password', newPassword: 'New Password',
confirmPassword:'Confirm Password', confirmPassword: 'Confirm Password',
placecholderOldPassword:'Enter Old Password', placecholderOldPassword: 'Enter Old Password',
placecholderNewPassword:'Enter New Password', placecholderNewPassword: 'Enter New Password',
placecholderConfirmPassword:'Confirm Password', placecholderConfirmPassword: 'Confirm Password',
checkPasswordIsSame:'Fail:Different passwords entered twice', checkPasswordIsSame: 'Fail:Different passwords entered twice',
oldPasswordIsNull:'Old Password cannot be null', oldPasswordIsNull: 'Old Password cannot be null',
newPasswordIsNull:'New Password cannot be null', newPasswordIsNull: 'New Password cannot be null',
passwordFormat1:"Password must be 6-20 characters long", passwordFormat1: "Password must be 6-20 characters long",
passwordFormat2:"Can't contain special characters:< > \" ' \\\ |", passwordFormat2: "Can't contain special characters:< > \" ' \\\ |",
confirmPasswordIsNull:'Confirm Password cannot be null', confirmPasswordIsNull: 'Confirm Password cannot be null',
//上传头像 //上传头像
avatarTitle:'Click to upload', avatarTitle: 'Click to upload',
updateAvatar:'Update Avatar', updateAvatar: 'Update Avatar',
errorMessage:'The file format is wrong, please upload the image type, such as: JPG, PNG suffix file.' errorMessage: 'The file format is wrong, please upload the image type, such as: JPG, PNG suffix file.'
}, },
@@ -1605,7 +1606,7 @@ export default {
//---复选框--- //---复选框---
cbxExpandOrCollapse: 'Expand/Collapse', cbxExpandOrCollapse: 'Expand/Collapse',
cbxAllOrNone: 'All/None', cbxAllOrNone: 'All/None',
cbxInherite:'Inherite', cbxInherite: 'Inherite',
txtLoading: 'Loading...', txtLoading: 'Loading...',
//输入框 //输入框
@@ -1621,8 +1622,8 @@ export default {
//---函数:handleStatusChange--- //---函数:handleStatusChange---
textEnable: 'enable', textEnable: 'enable',
textDisable: 'disable', textDisable: 'disable',
textUserConfirm1:"Are you sure you want to \"", textUserConfirm1: "Are you sure you want to \"",
textUserConfirm2:"\" role?", textUserConfirm2: "\" role?",
textSuccess: 'success', textSuccess: 'success',
//---函数:handleDelete--- //---函数:handleDelete---
@@ -1652,7 +1653,7 @@ export default {
nickName: 'NickName', nickName: 'NickName',
email: 'Email', email: 'Email',
phoneNumber: 'PhoneNumber', phoneNumber: 'PhoneNumber',
textSelectRole:'Select Assigned Role', textSelectRole: 'Select Assigned Role',
placeholderUserName: 'Enter UserName', placeholderUserName: 'Enter UserName',
placeholderPhoneNumber: 'Enter PhoneNumber', placeholderPhoneNumber: 'Enter PhoneNumber',
@@ -1729,8 +1730,8 @@ export default {
menuIcon: 'Menu Icon', menuIcon: 'Menu Icon',
routerName: 'RouterName', routerName: 'RouterName',
isFrame: 'IsFrame', isFrame: 'IsFrame',
isFrameOptions1:' Yes', isFrameOptions1: ' Yes',
isFrameOptions2:' No', isFrameOptions2: ' No',
routerPath: 'RouterPath', routerPath: 'RouterPath',
routerParams: 'RouterParams', routerParams: 'RouterParams',
isCache: 'IsCache', isCache: 'IsCache',
@@ -1741,7 +1742,7 @@ export default {
//--------------提示文本-------------- //--------------提示文本--------------
//---二级窗口提示文本--- //---二级窗口提示文本---
textRouterName: 'The default is the same as the routing address: if the address is: `user`, then the name is `User` (note: to avoid name conflicts, in special cases please customize to ensure uniqueness)', textRouterName: 'The default is the same as the routing address: if the address is: `user`, then the name is `User` (note: to avoid name conflicts, in special cases please customize to ensure uniqueness)',
textIsFrame:"For outbound links, the routing address should start with `http(s)://`.", textIsFrame: "For outbound links, the routing address should start with `http(s)://`.",
textRouterPath: 'The routing address is the path of the menu, such as `user`, `user/add`, etc. (note: to avoid conflicts, please ensure that the routing address is unique)', textRouterPath: 'The routing address is the path of the menu, such as `user`, `user/add`, etc. (note: to avoid conflicts, please ensure that the routing address is unique)',
textComponentPath: "Path to the accessed component, e.g. `system/user/index`, defaults to the `views` directory.", textComponentPath: "Path to the accessed component, e.g. `system/user/index`, defaults to the `views` directory.",
textPerms: "Permission characters defined in the controller, e.g. @PreAuthorize(`@ss.hasPermi('system:user:list')`).", textPerms: "Permission characters defined in the controller, e.g. @PreAuthorize(`@ss.hasPermi('system:user:list')`).",
@@ -1789,13 +1790,13 @@ export default {
parentDept: 'Parent Department', parentDept: 'Parent Department',
setOrderNum: 'OrderNumber', setOrderNum: 'OrderNumber',
leader : 'Leader', leader: 'Leader',
phoneNumber: 'PhoneNumber', phoneNumber: 'PhoneNumber',
email: 'Email', email: 'Email',
//--------------二级窗口操作提示-------------- //--------------二级窗口操作提示--------------
placeholderParentDept: 'Select Parent Department', placeholderParentDept: 'Select Parent Department',
placeholderLeader : 'Enter Leader', placeholderLeader: 'Enter Leader',
placeholderPhoneNumber: 'Enter PhoneNumber', placeholderPhoneNumber: 'Enter PhoneNumber',
placeholderEmail: 'Enter Email', placeholderEmail: 'Enter Email',
@@ -1858,7 +1859,7 @@ export default {
//--------------二级窗口操作提示-------------- //--------------二级窗口操作提示--------------
placeholderPostSort: 'Enter PostSort', placeholderPostSort: 'Enter PostSort',
placeholderStatus : 'Select Status', placeholderStatus: 'Select Status',
//--------------交互按钮-------------- //--------------交互按钮--------------
btnSearch: 'Search', btnSearch: 'Search',
@@ -1951,24 +1952,24 @@ export default {
//-------------------------------------------------------------- //--------------------------------------------------------------
// 子页面data // 子页面data
dictCode:'DictCode', dictCode: 'DictCode',
dictLabel:'DictLabel', dictLabel: 'DictLabel',
dictValue:'DictValue', dictValue: 'DictValue',
dictSort:'DictSort', dictSort: 'DictSort',
placeholderDictLabel:'Enter DictLabel', placeholderDictLabel: 'Enter DictLabel',
placeholderDictValue:'Enter DictValue', placeholderDictValue: 'Enter DictValue',
placeholderCssClass:'Enter Css Class', placeholderCssClass: 'Enter Css Class',
cssClass:'CssClass', cssClass: 'CssClass',
listClass:'ListClass', listClass: 'ListClass',
optionDefault:'Default', optionDefault: 'Default',
optionPrimary:'Primary', optionPrimary: 'Primary',
optionSuccess:'Success', optionSuccess: 'Success',
optionInfo:'Info', optionInfo: 'Info',
optionWarning:'Warning', optionWarning: 'Warning',
optionDanger:'Danger', optionDanger: 'Danger',
heckDictLabelIsNull: 'DictLabel cannot be Null', heckDictLabelIsNull: 'DictLabel cannot be Null',
heckDictValueIsNull: 'DictValue cannot be Null', heckDictValueIsNull: 'DictValue cannot be Null',
@@ -1984,7 +1985,7 @@ export default {
}, },
// ***************系统管理:参数设置************* // ***************系统管理:参数设置*************
systemManagement_ConfigManagement:{ systemManagement_ConfigManagement: {
//--------------数据表标题-------------- //--------------数据表标题--------------
configId: 'ConfigId', configId: 'ConfigId',
configName: 'ConfigName', configName: 'ConfigName',
@@ -2049,7 +2050,7 @@ export default {
}, },
// ***************系统管理:通知公告************* // ***************系统管理:通知公告*************
systemManagement_Notice:{ systemManagement_Notice: {
//--------------数据表标题-------------- //--------------数据表标题--------------
noticeId: 'NoticeId', noticeId: 'NoticeId',
noticeType: 'NoticeType', noticeType: 'NoticeType',
@@ -2065,7 +2066,7 @@ export default {
editNoticeItem: 'Edit Notice Item', editNoticeItem: 'Edit Notice Item',
//--------------交互框标签-------------- //--------------交互框标签--------------
noticeContent:"NoteContent", noticeContent: "NoteContent",
//--------------当前页面交互框操作提示-------------- //--------------当前页面交互框操作提示--------------
placeholderNoticeTitle: 'Enter NoteTitle', placeholderNoticeTitle: 'Enter NoteTitle',
@@ -2116,7 +2117,7 @@ export default {
// ***************系统管理:日志管理-操作日志************* // ***************系统管理:日志管理-操作日志*************
// ***************views/monitor/operlog************* // ***************views/monitor/operlog*************
systemManagement_LogManagement_Operation:{ systemManagement_LogManagement_Operation: {
//--------------数据表标题-------------- //--------------数据表标题--------------
operId: 'OperId', operId: 'OperId',
title: 'Title', title: 'Title',
@@ -2146,17 +2147,17 @@ export default {
logDetails: 'logDetails', logDetails: 'logDetails',
//--------------交互框标签-------------- //--------------交互框标签--------------
noticeContent:"Content", noticeContent: "Content",
loginInfo: 'Login Info', loginInfo: 'Login Info',
requestInfo: 'Request Info', requestInfo: 'Request Info',
requestUrl: 'Request Url', requestUrl: 'Request Url',
requestMethod: 'Request Method', requestMethod: 'Request Method',
method:'Method', method: 'Method',
requestParam: 'Request Params', requestParam: 'Request Params',
responseParam: 'Response Param', responseParam: 'Response Param',
statusNormal: 'Success', statusNormal: 'Success',
statusFail: 'Fail', statusFail: 'Fail',
errorMsg:'Error Message', errorMsg: 'Error Message',
//--------------交互按钮-------------- //--------------交互按钮--------------
btnSearch: 'Search', btnSearch: 'Search',
@@ -2190,7 +2191,7 @@ export default {
// ***************系统管理:日志管理-登录日志************* // ***************系统管理:日志管理-登录日志*************
// ***************views/monitor/logininfor************* // ***************views/monitor/logininfor*************
systemManagement_LogManagement_Login:{ systemManagement_LogManagement_Login: {
//--------------数据表标题-------------- //--------------数据表标题--------------
infoId: 'InfoId', infoId: 'InfoId',
userName: 'UserName', userName: 'UserName',
@@ -2252,7 +2253,7 @@ export default {
}, },
// ***************系统监控:在线用户************* // ***************系统监控:在线用户*************
monitor_Online:{ monitor_Online: {
//--------------数据表标题-------------- //--------------数据表标题--------------
num: 'Id', num: 'Id',
tokenId: 'TokenId', tokenId: 'TokenId',
@@ -2286,7 +2287,7 @@ export default {
}, },
// ***************系统监控:定时任务************* // ***************系统监控:定时任务*************
Monitor_ScheduledTask:{ Monitor_ScheduledTask: {
//--------------数据表标题-------------- //--------------数据表标题--------------
jobId: 'JobId', jobId: 'JobId',
jobName: 'JobName', jobName: 'JobName',
@@ -2332,10 +2333,10 @@ export default {
titleEditJob: 'Edit Job', titleEditJob: 'Edit Job',
//---标签--- //---标签---
nextValidTime:'Next Valid Time', nextValidTime: 'Next Valid Time',
execStrategy:'Execution Strategy', execStrategy: 'Execution Strategy',
allowParallel:'Allow Parallel', allowParallel: 'Allow Parallel',
createTime:'CreateTime', createTime: 'CreateTime',
//---二级窗口--- //---二级窗口---
textInvokeMethod: 'Invoke Method', textInvokeMethod: 'Invoke Method',
@@ -2411,7 +2412,7 @@ export default {
}, },
// ***************系统监控:服务监控*************** // ***************系统监控:服务监控***************
Monitor_Service:{ Monitor_Service: {
property: 'Property', property: 'Property',
value: 'Value', value: 'Value',
memory: 'Memory', memory: 'Memory',
@@ -2457,7 +2458,7 @@ export default {
}, },
// ***************系统监控:缓存监控*************** // ***************系统监控:缓存监控***************
Monitor_Cache:{ Monitor_Cache: {
basInfomation: 'Basic Information', basInfomation: 'Basic Information',
redisVersion: 'Redis Version', redisVersion: 'Redis Version',
redisMode: 'Redis Mode', redisMode: 'Redis Mode',
@@ -2489,7 +2490,7 @@ export default {
}, },
// ***************系统监控:缓存列表*************** // ***************系统监控:缓存列表***************
Monitor_CacheList:{ Monitor_CacheList: {
cacheList: 'Cache List', cacheList: 'Cache List',
Id: 'Id', Id: 'Id',
cacheName: 'Cache Name', cacheName: 'Cache Name',
@@ -2506,9 +2507,9 @@ export default {
refreshKeySuccessInfo: "Refresh Key Success", refreshKeySuccessInfo: "Refresh Key Success",
clearAllCacheSuccessInfo: "Clear All Cache Success", clearAllCacheSuccessInfo: "Clear All Cache Success",
textSuccess:'] Success', textSuccess: '] Success',
textClearCacheName:'Clear Cache Name[', textClearCacheName: 'Clear Cache Name[',
textClearCacheKey:'Clear Cache Key[', textClearCacheKey: 'Clear Cache Key[',
btnRefresh: 'Refresh', btnRefresh: 'Refresh',
btnClearAll: 'Clear', btnClearAll: 'Clear',
@@ -2516,7 +2517,7 @@ export default {
}, },
// ***************KPI分析:入库分析*************** // ***************KPI分析:入库分析***************
KPIAnalysis_StockIn:{ KPIAnalysis_StockIn: {
warehouse: 'Warehouse', warehouse: 'Warehouse',
yearMonth: 'Year Month', yearMonth: 'Year Month',
@@ -2529,12 +2530,12 @@ export default {
textChartStockIn: 'Stock In Analysis', textChartStockIn: 'Stock In Analysis',
textYAxisName: 'Value', textYAxisName: 'Value',
lblWidthSearch:'90px' lblWidthSearch: '90px'
}, },
// ***************KPI分析:出库分析*************** // ***************KPI分析:出库分析***************
KPIAnalysis_StockOut:{ KPIAnalysis_StockOut: {
warehouse: 'Warehouse', warehouse: 'Warehouse',
yearMonth: 'YearMonth', yearMonth: 'YearMonth',
@@ -2547,12 +2548,12 @@ export default {
textChartStockOut: 'Stock Out Analysis', textChartStockOut: 'Stock Out Analysis',
textYAxisName: 'Value', textYAxisName: 'Value',
lblWidthSearch:'90px' lblWidthSearch: '90px'
}, },
// ***************KPI分析:巷道分析*************** // ***************KPI分析:巷道分析***************
KPIAnalysis_Roadway:{ KPIAnalysis_Roadway: {
warehouse: 'Warehouse', warehouse: 'Warehouse',
dateStart: 'DateStart', dateStart: 'DateStart',
dateEnd: 'DateEnd', dateEnd: 'DateEnd',
@@ -2569,12 +2570,12 @@ export default {
quantityOfStockIn: 'Stock In', quantityOfStockIn: 'Stock In',
quantityOfStockOut: 'Stock Out', quantityOfStockOut: 'Stock Out',
lblWidthSearch:'90px' lblWidthSearch: '90px'
}, },
// ***************KPI分析:货位分析*************** // ***************KPI分析:货位分析***************
KPIAnalysis_CargoSpace:{ KPIAnalysis_CargoSpace: {
warehouse: 'Warehouse', warehouse: 'Warehouse',
placeholderWarehouse: 'Select Warehouse', placeholderWarehouse: 'Select Warehouse',
@@ -2592,17 +2593,17 @@ export default {
roadway2: 'Roadway-2', roadway2: 'Roadway-2',
roadway3: 'Roadway-3', roadway3: 'Roadway-3',
roadway4: 'Roadway-4', roadway4: 'Roadway-4',
config:'Serise Configuration', config: 'Serise Configuration',
textChartCargoSpace: 'CargoSpace Analysis', textChartCargoSpace: 'CargoSpace Analysis',
textValue: 'Value', textValue: 'Value',
lblWidthSearch:'90px' lblWidthSearch: '90px'
}, },
// ***************KPI分析:库存平面图*************** // ***************KPI分析:库存平面图***************
KPIAnalysis_CargoPlan:{ KPIAnalysis_CargoPlan: {
warehouse: 'Warehouse', warehouse: 'Warehouse',
raodway: 'Roadway', raodway: 'Roadway',
row: 'Row', row: 'Row',
@@ -2617,13 +2618,13 @@ export default {
legendOccupied: 'Occupied', legendOccupied: 'Occupied',
legendStockInAssigned: 'Stock In Assigned', legendStockInAssigned: 'Stock In Assigned',
legendStockOutAssigned: 'Stock Out Assigned', legendStockOutAssigned: 'Stock Out Assigned',
legendStockInException:'Stock In Exception', legendStockInException: 'Stock In Exception',
legendStockOutException:'Stock Out Exception', legendStockOutException: 'Stock Out Exception',
//---formatTooltip--- //---formatTooltip---
failGetCargoSpace: 'Fail to get CargoSpace.', failGetCargoSpace: 'Fail to get CargoSpace.',
lblWidthSearch:'90px' lblWidthSearch: '90px'
}, },
@@ -3152,15 +3153,15 @@ export default {
cancel: '取 消' cancel: '取 消'
}, },
// ***************Product Basic Fields************** // ***************Product Basic Fields**************
basproduct1:{ basproduct1: {
englishName:"English Name", englishName: "English Name",
netWeightPerUnit:"Net Weight Per Unit", netWeightPerUnit: "Net Weight Per Unit",
long:"Length MM", long: "Length MM",
wide:"Width MM", wide: "Width MM",
tall:"Height MM", tall: "Height MM",
volume:"Volume m³", volume: "Volume m³",
price:"Price", price: "Price",
notes:"Description" notes: "Description"
}, },
// ***************客户管理************** // ***************客户管理**************
basCustomer: { basCustomer: {

View File

@@ -432,6 +432,9 @@ export default {
autoAllocationSuccess:"自动分配成功", autoAllocationSuccess:"自动分配成功",
checkPort:'盘点出口', checkPort:'盘点出口',
departmentName: '部门名称', departmentName: '部门名称',
auditTitle:'审核单据',
selectExit:'选择出口',
pleaseSelectExit:'请选择出口',
}, },
// ***************盘点入库作业************* // ***************盘点入库作业*************
checkJobIn: { checkJobIn: {

View File

@@ -251,10 +251,10 @@
/> />
<!-- 审核弹窗 --> <!-- 审核弹窗 -->
<el-dialog title="$t('outStockoutManage.auditTitle')" :visible.sync="auditDialogVisible" width="500px" append-to-body> <el-dialog :title="$t('checkStockCheck.auditTitle')" :visible.sync="auditDialogVisible" width="500px" append-to-body>
<el-form ref="auditForm" :model="auditForm" :rules="auditRules" label-width="100px"> <el-form ref="auditForm" :model="auditForm" :rules="auditRules" label-width="100px">
<el-form-item label="$t('outStockoutManage.selectExit')" prop="exitId"> <el-form-item :label="$t('checkStockCheck.selectExit')" prop="exitId">
<el-select v-model="auditForm.exitId" placeholder="$t('outStockoutManage.pleaseSelectExit')" clearable style="width: 100%"> <el-select v-model="auditForm.exitId" :placeholder="$t('checkStockCheck.pleaseSelectExit')" clearable style="width: 100%">
<el-option <el-option
v-for="item in exitOptions" v-for="item in exitOptions"
:key="item.exitId" :key="item.exitId"