From 85d08f8a327abda7f94e309e81143df0c44f7f71 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Fri, 6 Jun 2025 11:28:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/lang/en.js | 523 +++++++++++++++++++++++++++++++++++++++- ruoyi-ui/src/lang/zh.js | 523 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 1043 insertions(+), 3 deletions(-) diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index de5fbb0..01a1dc7 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -795,6 +795,527 @@ export default { }, + // ***************出库作业流水查询************* + searchViewOutJobFlow: { + title: '出库作业流水查询', + jobId: '作业ID', + inputJobId: '请输入作业ID', + jobDetailId: '子作业ID', + inputJobDetailId: '请输入子作业ID', + status: '状态', + selectStatus: '请选择状态', + taskNo: '任务号', + inputTaskNo: '请输入任务号', + trayCode: '托盘码', + inputTrayCode: '请输入托盘码', + stockStatus: '库存状态', + selectStockStatus: '请选择库存状态', + roadwayId: '巷道ID', + inputRoadwayId: '请输入巷道ID', + cargoSpaceId: '货位ID', + inputCargoSpaceId: '请输入货位ID', + cargoSpaceName: '货位名称', + inputCargoSpaceName: '请输入货位名称', + thePlatoon: '排', + inputThePlatoon: '请输入排', + theColumn: '列', + inputTheColumn: '请输入列', + theFloor: '层', + inputTheFloor: '请输入层', + priority: '优先级', + inputPriority: '请输入优先级', + executionPhase: '执行阶段', + selectExecutionPhase: '请选择执行阶段', + inOrOut: '作业类型', + inputInOrOut: '请输入作业类型', + exitId: '出口ID', + inputExitId: '请输入出口ID', + productId: '物料ID', + inputProductId: '请输入物料ID', + productName: '物料名称', + inputProductName: '请输入物料名称', + lotNo: '批号', + inputLotNo: '请输入批号', + stackingId: '剁型ID', + inputStackingId: '请输入剁型ID', + outQuantity: '出库数量', + giveNum: '回流数量', + inOrOutId: '单据ID', + inputInOrOutId: '请输入单据ID', + inOrOutDId: '子单据ID', + inputInOrOutDId: '请输入子单据ID', + createTime: '创建时间', + selectCreateTime: '请选择创建时间', + startTime: '开始时间', + selectStartTime: '请选择开始时间', + finishTime: '结束时间', + selectFinishTime: '请选择结束时间', + warehouseId: '仓库ID', + inputWarehouseId: '请输入仓库ID', + spec: '规格', + inputSpec: '请输入规格', + cargoNo: '品牌', + inputCargoNo: '请输入品牌', + unit: '单位', + inputUnit: '请输入单位', + customerName: '客户名称', + inputCustomerName: '请输入客户名称', + search: '搜索', + reset: '重置', + export: '导出', + confirm: '确 定', + cancel: '取 消', + add: '新增', + edit: '修改', + delete: '删除', + addTitle: '添加出库做业务流水', + editTitle: '修改出库做业务流水', + deleteConfirm: '是否确认删除出库做业务流水编号为"', + deleteSuccess: '删除成功', + addSuccess: '新增成功', + editSuccess: '修改成功', + jobIdRequired: '作业ID不能为空' + }, + // ***************入库作业流水查询************* + searchViewInJobFlow: { + status: '状态', + selectStatus: '请选择状态', + taskNo: '任务号', + inputTaskNo: '请输入任务号', + thePlatoon: '排', + inputThePlatoon: '请输入排', + theColumn: '列', + inputTheColumn: '请输入列', + theFloor: '层', + inputTheFloor: '请输入层', + trayCode: '托盘号', + inputTrayCode: '请输入托盘号', + productId: '物料ID', + inputProductId: '请输入物料ID', + lotNo: '批号', + inputLotNo: '请输入批号', + stockStatus: '库存状态', + selectStockStatus: '请选择库存状态', + productName: '物料名称', + inputProductName: '请输入物料名称', + warehouseId: '仓库ID', + inputWarehouseId: '请输入仓库ID', + startTime: '开始时间', + selectStartTime: '请选择开始时间', + finishTime: '结束时间', + selectFinishTime: '请选择结束时间', + search: '搜索', + reset: '重置', + jobId: '作业ID', + inputJobId: '请输入作业ID', + jobDetailId: '子作业ID', + inputJobDetailId: '请输入子作业ID', + roadwayId: '巷道ID', + inputRoadwayId: '请输入巷道ID', + cargoSpaceId: '货位ID', + inputCargoSpaceId: '请输入货位ID', + cargoSpaceName: '货位名称', + inputCargoSpaceName: '请输入货位名称', + priority: '优先级', + inputPriority: '请输入优先级', + executionPhase: '执行阶段', + selectExecutionPhase: '请选择执行阶段', + inOrOut: '作业类型', + inputInOrOut: '请输入作业类型', + entranceId: '入口ID', + inputEntranceId: '请输入入口ID', + stackingId: '垛型ID', + inputStackingId: '请输入垛型ID', + inQuantity: '入库数量', + inputInQuantity: '请输入入库数量', + inOrOutId: '单据ID', + inputInOrOutId: '请输入单据ID', + inOrOutDId: '子单据ID', + inputInOrOutDId: '请输入子单据ID', + createTime: '创建时间', + selectCreateTime: '请选择创建时间', + spec: '规格', + inputSpec: '请输入规格', + cargoNo: '品牌', + inputCargoNo: '请输入品牌', + inputUnit: '请输入单位', + confirm: '确 定', + cancel: '取 消', + add: '新增', + edit: '修改', + delete: '删除', + addTitle: '添加入库作业流水', + editTitle: '修改入库作业流水', + deleteConfirm: '是否确认删除入库作业流水编号为"', + deleteSuccess: '删除成功', + addSuccess: '新增成功', + editSuccess: '修改成功', + export: '导出', + unit: '单位', + quantity: '库存数量' + }, + // ***************库存明细查询************* + searchViewStockDetail: { + stockId: '库存ID', + inputStockId: '请输入库存ID', + cargoSpaceId: '货位ID', + inputCargoSpaceId: '请输入货位ID', + trayCode: '托盘号', + inputTrayCode: '请输入托盘号', + onlyIdentity: 'ID', + inputOnlyIdentity: '请输入ID', + stockinId: '入库单ID', + quantity: '数量', + inputQuantity: '请输入数量', + jobId: '作业ID', + inputJobId: '请输入作业ID', + lotNo: '批号', + inputLotNo: '请输入批号', + stockinDetailId: '入库子单ID', + inputStockinDetailId: '请输入入库子单ID', + inDate: '入库时间', + inputInDate: '请输入入库时间', + warehouseId: '仓库', + inputWarehouseId: '请输入仓库', + stackingId: '剁型ID', + inputStackingId: '请输入剁型ID', + cargoSpaceName: '货位名称', + inputCargoSpaceName: '请输入货位名称', + roadwayId: '巷道ID', + inputRoadwayId: '请输入巷道ID', + cargoSpaceStatus: '货位状态', + inputCargoSpaceStatus: '请输入货位状态', + locked: '是否锁定', + inputLocked: '请输入是否锁定', + productId: '物料ID', + inputProductId: '请输入物料ID', + productName: '物料名称', + inputProductName: '请输入物料名称', + spec: '规格', + inputSpec: '请输入规格', + unit: '单位', + inputUnit: '请输入单位', + price: '价格', + inputPrice: '请输入价格', + search: '搜索', + reset: '重置', + export: '导出', + confirm: '确 定', + cancel: '取 消', + add: '新增', + edit: '修改', + delete: '删除', + addTitle: '添加库存明细查询', + editTitle: '修改库存明细查询', + deleteConfirm: '是否确认删除库存明细查询编号为"{id}"的数据项？', + deleteSuccess: '删除成功', + addSuccess: '新增成功', + editSuccess: '修改成功' + }, + // ***************平库出库流水************* + searchViewFlatWarehouseOutFlow: { + warehouse: '仓库', + selectWarehouse: '请选择仓库', + productId: '物料ID', + inputProductId: '请输入物料ID', + createMan: '创建人', + inputCreateMan: '请输入创建人', + isCurrent: '是否可用', + inputIsCurrent: '请输入是否可用', + productName: '物料名称', + inputProductName: '请输入物料名称', + spec: '规格', + inputSpec: '请输入规格', + search: '搜索', + reset: '重置', + export: '导出', + creator: '创建人', + materialId: '物料ID', + materialName: '物料名称', + quantity: '数量', + brand: '品牌', + unit: '单位', + price: '价格', + description: '描述', + warehouseId: '仓库ID', + warehouseName: '仓库名称', + address: '仓库地址', + warehouseDesc: '仓库描述', + warehouseLevel: '仓库级别', + warehouseType: '仓库类型', + available: '是否可用', + inputQuantity: '请输入入出库数量', + inputWarehouseId: '请输入仓库ID', + inputWarehouseName: '请输入仓库名称', + inputAddress: '请输入仓库地址', + inputBrand: '请输入品牌', + inputUnit: '请输入单位', + inputPrice: '请输入价格', + inputDescription: '请输入描述', + inputWarehouseDesc: '请输入仓库描述', + inputWarehouseLevel: '请输入仓库级别', + confirm: '确 定', + cancel: '取 消' + }, + // ***************平库入库流水************* + searchViewFlatWarehouseInFlow: { + warehouse: '仓库', + selectWarehouse: '请选择仓库', + productId: '物料ID', + inputProductId: '请输入物料ID', + createMan: '创建人', + inputCreateMan: '请输入创建人', + isCurrent: '是否可用', + inputIsCurrent: '请输入是否可用', + productName: '物料名称', + inputProductName: '请输入物料名称', + spec: '规格', + inputSpec: '请输入规格', + search: '搜索', + reset: '重置', + export: '导出', + creator: '创建人', + materialId: '物料ID', + materialName: '物料名称', + quantity: '数量', + brand: '品牌', + unit: '单位', + price: '价格', + description: '描述', + warehouseId: '仓库id', + warehouseName: '仓库名称', + address: '仓库地址', + warehouseDesc: '仓库描述', + warehouseLevel: '仓库级别', + warehouseType: '仓库类型', + available: '是否可用' + }, + // ***************出库单据历史查询************* + searchViewStockoutHistory: { + stockoutId: '出库单号', + inputStockoutId: '请输入出库单号', + outType: '出库类型', + selectOutType: '请选择出库类型', + createDate: '创建日期', + selectCreateDate: '请选择创建日期', + createManId: '创建人ID', + inputCreateManId: '请输入创建人ID', + status: '出库状态', + selectStatus: '请选择出库状态', + stockoutSource: '出库来源', + inputStockoutSource: '请输入出库来源', + exitId: '出口类型', + inputExitId: '请输入出口类型', + stockoutDetailId: '出库明细ID', + inputStockoutDetailId: '请输入出库明细ID', + productId: '产品ID', + inputProductId: '请输入产品ID', + productName: '产品名称', + inputProductName: '请输入产品名称', + lotNo: '批次号', + inputLotNo: '请输入批次号', + quantity: '出库数量', + inputQuantity: '请输入出库数量', + allotQuantity: '分配数量', + inputAllotQuantity: '请输入分配数量', + assignNum: '分配编号', + inputAssignNum: '请输入分配编号', + erpStockoutId: 'ERP出库单ID', + inputErpStockoutId: '请输入ERP出库单ID', + entryid: '客户编号', + inputEntryid: '请输入客户编号', + customerName: '客户名称', + inputCustomerName: '请输入客户名称', + spec: '规格', + inputSpec: '请输入规格', + brand: '品牌', + inputBrand: '请输入品牌', + unit: '单位', + inputUnit: '请输入单位', + search: '搜索', + reset: '重置', + export: '导出', + confirm: '确定', + cancel: '取消' + }, + // ***************入库单据历史查询************* + searchViewStockinHistory: { + stockinGuid: '入库单guid', + inputStockinGuid: '请输入入库单guid', + stockinId: '入库单号', + inputStockinId: '请输入入库单号', + inType: '入库类型', + selectInType: '请选择入库类型', + createDate: '创建时间', + selectCreateDate: '请选择创建时间', + finishDate: '完成时间', + selectFinishDate: '请选择完成时间', + createManId: '创建人', + inputCreateManId: '请输入创建人', + status: '单据状态', + selectStatus: '请选择单据状态', + warehouseId: '仓库ID', + inputWarehouseId: '请输入仓库ID', + erpBill: 'ERP单号', + inputErpBill: '请输入ERP单号', + stockSource: '单据来源', + inputStockSource: '请输入单据来源', + departmentNo: '部门编码', + inputDepartmentNo: '请输入部门编码', + classNo: '班组编码', + inputClassNo: '请输入班组编码', + supplierNo: '供应商编号', + inputSupplierNo: '请输入供应商编号', + supplierName: '供应商名称', + inputSupplierName: '请输入供应商名称', + simpleName: '供应商简称', + inputSimpleName: '请输入供应商简称', + contactName: '联系人', + inputContactName: '请输入联系人', + contactNumber: '联系电话', + inputContactNumber: '请输入联系电话', + address: '供应商地址', + inputAddress: '请输入供应商地址', + stockinDetailId: '入库明细ID', + inputStockinDetailId: '请输入入库明细ID', + lotNo: '批次号', + inputLotNo: '请输入批次号', + printDate: '入库日期', + selectPrintDate: '请选择入库日期', + stockStatus: '库存状态', + selectStockStatus: '请选择库存状态', + price: '单价', + inputPrice: '请输入单价', + remark: '备注', + inputRemark: '请输入备注', + productId: '物料编码', + inputProductId: '请输入物料编码', + productName: '物料名称', + inputProductName: '请输入物料名称', + cargoNo: '品牌', + inputCargoNo: '请输入品牌', + unit: '单位', + inputUnit: '请输入单位', + spec: '规格', + inputSpec: '请输入规格', + quantity: '计划数量', + quantityX: '计划箱数', + quantityJ: '计划件数', + assignNum: '实际数量', + assignNumX: '实际箱数', + assignNumJ: '实际件数', + scanNum: '扫码数量', + scanNumX: '扫码箱数', + scanNumJ: '扫码件数', + search: '搜索', + reset: '重置', + export: '导出', + addTitle: '添加入库单据历史', + editTitle: '修改入库单据历史', + deleteConfirm: '是否确认删除入库单据历史编号为"{id}"的数据项？', + deleteSuccess: '删除成功', + addSuccess: '新增成功', + editSuccess: '修改成功', + confirm: '确 定', + cancel: '取 消' + }, + // ***************收货单据管理************* + searchStockSummary: { + export: '导出', + productId: '物料编码', + inputProductId: '请输入物料编码', + productName: '物料名称', + inputProductName: '请输入物料名称', + spec: '规格', + inputSpec: '请输入规格', + lotNo: '批号', + inputLotNo: '请输入批号', + warehouseId: '仓库', + inputWarehouseId: '请输入仓库', + roadwayId: '巷道', + inputRoadwayId: '请输入巷道', + search: '搜索', + reset: '重置', + unit: '单位', + quantity: '数量', + }, +// ***************预警库存查询************* + searchViewStockWarning: { + stockId: '库存ID', + inputStockId: '请输入库存ID', + cargoSpaceId: '货位ID', + inputCargoSpaceId: '请输入货位ID', + stockStatus: '库存状态', + selectStockStatus: '请选择库存状态', + productStatus: '物料状态', + selectProductStatus: '请选择物料状态', + lotNo: '批次号', + inputLotNo: '请输入批次号', + inDate: '入库时间', + inputInDate: '请输入入库时间', + backDate: '回流时间', + inputBackDate: '请输入回流时间', + quantity: '库存数量', + inputQuantity: '请输入库存数量', + jobId: '作业ID', + inputJobId: '请输入作业ID', + trayCode: '托盘条码', + inputTrayCode: '请输入托盘条码', + outQuantity: '出库数量', + inputOutQuantity: '请输入出库数量', + stockinId: '入库主单', + inputStockinId: '请输入入库主单', + inType: '入库类型', + selectInType: '请选择入库类型', + warehouseId: '仓库ID', + inputWarehouseId: '请输入仓库ID', + stackingId: '垛型ID', + inputStackingId: '请输入垛型ID', + productId: '物料ID', + inputProductId: '请输入物料ID', + warehouseName: '仓库名称', + inputWarehouseName: '请输入仓库名称', + warehouseType: '仓库类型', + inputWarehouseType: '请输入仓库类型', + isCurrent: '是否可用', + inputIsCurrent: '请输入是否可用', + productName: '物料名称', + inputProductName: '请输入物料名称', + spec: '规格', + inputSpec: '请输入规格', + cargoNo: '品牌', + inputCargoNo: '请输入品牌', + unit: '单位', + inputUnit: '请输入单位', + price: '价格', + inputPrice: '请输入价格', + cargoSpaceName: '货位名称', + inputCargoSpaceName: '请输入货位名称', + cargoAreaId: '货区ID', + inputCargoAreaId: '请输入货区ID', + theType: '货位类型', + inputTheType: '请输入货位类型', + cargoStatus: '货位状态', + inputCargoStatus: '请输入货位状态', + locked: '是否锁定', + inputLocked: '请输入是否锁定', + cargoHight: '货位高度', + inputCargoHight: '请输入货位高度', + issDouble: '是否双伸', + inputIssDouble: '请输入是否双伸', + thePlatoon: '排', + inputThePlatoon: '请输入排', + theColumn: '列', + inputTheColumn: '请输入列', + theFloor: '层', + inputTheFloor: '请输入层', + search: '搜索', + reset: '重置', + export: '导出', + confirm: '确 定', + cancel: '取 消' + }, + //=====================系统管理:部门管理===================== systemManagement_DeptManagement: { @@ -812,7 +1333,7 @@ export default { //--------------二级窗口标题-------------- addDeptItem: 'Add Department', editDeptItem: 'Edit Department', - + parentDept: 'Parent Department', setOrderNum: 'OrderNumber', leader : 'Leader', diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 1560b43..d1de962 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -875,12 +875,531 @@ export default { }, - + //=====================系统管理:岗位管理===================== systemManagement_PostManagement: { }, - + // ***************出库作业流水查询************* + searchViewOutJobFlow: { + title: '出库作业流水查询', + jobId: '作业ID', + inputJobId: '请输入作业ID', + jobDetailId: '子作业ID', + inputJobDetailId: '请输入子作业ID', + status: '状态', + selectStatus: '请选择状态', + taskNo: '任务号', + inputTaskNo: '请输入任务号', + trayCode: '托盘码', + inputTrayCode: '请输入托盘码', + stockStatus: '库存状态', + selectStockStatus: '请选择库存状态', + roadwayId: '巷道ID', + inputRoadwayId: '请输入巷道ID', + cargoSpaceId: '货位ID', + inputCargoSpaceId: '请输入货位ID', + cargoSpaceName: '货位名称', + inputCargoSpaceName: '请输入货位名称', + thePlatoon: '排', + inputThePlatoon: '请输入排', + theColumn: '列', + inputTheColumn: '请输入列', + theFloor: '层', + inputTheFloor: '请输入层', + priority: '优先级', + inputPriority: '请输入优先级', + executionPhase: '执行阶段', + selectExecutionPhase: '请选择执行阶段', + inOrOut: '作业类型', + inputInOrOut: '请输入作业类型', + exitId: '出口ID', + inputExitId: '请输入出口ID', + productId: '物料ID', + inputProductId: '请输入物料ID', + productName: '物料名称', + inputProductName: '请输入物料名称', + lotNo: '批号', + inputLotNo: '请输入批号', + stackingId: '剁型ID', + inputStackingId: '请输入剁型ID', + outQuantity: '出库数量', + giveNum: '回流数量', + inOrOutId: '单据ID', + inputInOrOutId: '请输入单据ID', + inOrOutDId: '子单据ID', + inputInOrOutDId: '请输入子单据ID', + createTime: '创建时间', + selectCreateTime: '请选择创建时间', + startTime: '开始时间', + selectStartTime: '请选择开始时间', + finishTime: '结束时间', + selectFinishTime: '请选择结束时间', + warehouseId: '仓库ID', + inputWarehouseId: '请输入仓库ID', + spec: '规格', + inputSpec: '请输入规格', + cargoNo: '品牌', + inputCargoNo: '请输入品牌', + unit: '单位', + inputUnit: '请输入单位', + customerName: '客户名称', + inputCustomerName: '请输入客户名称', + search: '搜索', + reset: '重置', + export: '导出', + confirm: '确 定', + cancel: '取 消', + add: '新增', + edit: '修改', + delete: '删除', + addTitle: '添加出库做业务流水', + editTitle: '修改出库做业务流水', + deleteConfirm: '是否确认删除出库做业务流水编号为"', + deleteSuccess: '删除成功', + addSuccess: '新增成功', + editSuccess: '修改成功', + jobIdRequired: '作业ID不能为空' + }, + // ***************入库作业流水查询************* + searchViewInJobFlow: { + status: '状态', + selectStatus: '请选择状态', + taskNo: '任务号', + inputTaskNo: '请输入任务号', + thePlatoon: '排', + inputThePlatoon: '请输入排', + theColumn: '列', + inputTheColumn: '请输入列', + theFloor: '层', + inputTheFloor: '请输入层', + trayCode: '托盘号', + inputTrayCode: '请输入托盘号', + productId: '物料ID', + inputProductId: '请输入物料ID', + lotNo: '批号', + inputLotNo: '请输入批号', + stockStatus: '库存状态', + selectStockStatus: '请选择库存状态', + productName: '物料名称', + inputProductName: '请输入物料名称', + warehouseId: '仓库ID', + inputWarehouseId: '请输入仓库ID', + startTime: '开始时间', + selectStartTime: '请选择开始时间', + finishTime: '结束时间', + selectFinishTime: '请选择结束时间', + search: '搜索', + reset: '重置', + jobId: '作业ID', + inputJobId: '请输入作业ID', + jobDetailId: '子作业ID', + inputJobDetailId: '请输入子作业ID', + roadwayId: '巷道ID', + inputRoadwayId: '请输入巷道ID', + cargoSpaceId: '货位ID', + inputCargoSpaceId: '请输入货位ID', + cargoSpaceName: '货位名称', + inputCargoSpaceName: '请输入货位名称', + priority: '优先级', + inputPriority: '请输入优先级', + executionPhase: '执行阶段', + selectExecutionPhase: '请选择执行阶段', + inOrOut: '作业类型', + inputInOrOut: '请输入作业类型', + entranceId: '入口ID', + inputEntranceId: '请输入入口ID', + stackingId: '垛型ID', + inputStackingId: '请输入垛型ID', + inQuantity: '入库数量', + inputInQuantity: '请输入入库数量', + inOrOutId: '单据ID', + inputInOrOutId: '请输入单据ID', + inOrOutDId: '子单据ID', + inputInOrOutDId: '请输入子单据ID', + createTime: '创建时间', + selectCreateTime: '请选择创建时间', + spec: '规格', + inputSpec: '请输入规格', + cargoNo: '品牌', + inputCargoNo: '请输入品牌', + inputUnit: '请输入单位', + confirm: '确 定', + cancel: '取 消', + add: '新增', + edit: '修改', + delete: '删除', + addTitle: '添加入库作业流水', + editTitle: '修改入库作业流水', + deleteConfirm: '是否确认删除入库作业流水编号为"', + deleteSuccess: '删除成功', + addSuccess: '新增成功', + editSuccess: '修改成功', + export: '导出', + unit: '单位', + quantity: '库存数量' + }, + // ***************库存明细查询************* + searchViewStockDetail: { + stockId: '库存ID', + inputStockId: '请输入库存ID', + cargoSpaceId: '货位ID', + inputCargoSpaceId: '请输入货位ID', + trayCode: '托盘号', + inputTrayCode: '请输入托盘号', + onlyIdentity: 'ID', + inputOnlyIdentity: '请输入ID', + stockinId: '入库单ID', + quantity: '数量', + inputQuantity: '请输入数量', + jobId: '作业ID', + inputJobId: '请输入作业ID', + lotNo: '批号', + inputLotNo: '请输入批号', + stockinDetailId: '入库子单ID', + inputStockinDetailId: '请输入入库子单ID', + inDate: '入库时间', + inputInDate: '请输入入库时间', + warehouseId: '仓库', + inputWarehouseId: '请输入仓库', + stackingId: '剁型ID', + inputStackingId: '请输入剁型ID', + cargoSpaceName: '货位名称', + inputCargoSpaceName: '请输入货位名称', + roadwayId: '巷道ID', + inputRoadwayId: '请输入巷道ID', + cargoSpaceStatus: '货位状态', + inputCargoSpaceStatus: '请输入货位状态', + locked: '是否锁定', + inputLocked: '请输入是否锁定', + productId: '物料ID', + inputProductId: '请输入物料ID', + productName: '物料名称', + inputProductName: '请输入物料名称', + spec: '规格', + inputSpec: '请输入规格', + unit: '单位', + inputUnit: '请输入单位', + price: '价格', + inputPrice: '请输入价格', + search: '搜索', + reset: '重置', + export: '导出', + confirm: '确 定', + cancel: '取 消', + add: '新增', + edit: '修改', + delete: '删除', + addTitle: '添加库存明细查询', + editTitle: '修改库存明细查询', + deleteConfirm: '是否确认删除库存明细查询编号为"{id}"的数据项？', + deleteSuccess: '删除成功', + addSuccess: '新增成功', + editSuccess: '修改成功' + }, + // ***************平库出库流水************* + searchViewFlatWarehouseOutFlow: { + warehouse: '仓库', + selectWarehouse: '请选择仓库', + productId: '物料ID', + inputProductId: '请输入物料ID', + createMan: '创建人', + inputCreateMan: '请输入创建人', + isCurrent: '是否可用', + inputIsCurrent: '请输入是否可用', + productName: '物料名称', + inputProductName: '请输入物料名称', + spec: '规格', + inputSpec: '请输入规格', + search: '搜索', + reset: '重置', + export: '导出', + creator: '创建人', + materialId: '物料ID', + materialName: '物料名称', + quantity: '数量', + brand: '品牌', + unit: '单位', + price: '价格', + description: '描述', + warehouseId: '仓库ID', + warehouseName: '仓库名称', + address: '仓库地址', + warehouseDesc: '仓库描述', + warehouseLevel: '仓库级别', + warehouseType: '仓库类型', + available: '是否可用', + inputQuantity: '请输入入出库数量', + inputWarehouseId: '请输入仓库ID', + inputWarehouseName: '请输入仓库名称', + inputAddress: '请输入仓库地址', + inputBrand: '请输入品牌', + inputUnit: '请输入单位', + inputPrice: '请输入价格', + inputDescription: '请输入描述', + inputWarehouseDesc: '请输入仓库描述', + inputWarehouseLevel: '请输入仓库级别', + confirm: '确 定', + cancel: '取 消' + }, + // ***************平库入库流水************* + searchViewFlatWarehouseInFlow: { + warehouse: '仓库', + selectWarehouse: '请选择仓库', + productId: '物料ID', + inputProductId: '请输入物料ID', + createMan: '创建人', + inputCreateMan: '请输入创建人', + isCurrent: '是否可用', + inputIsCurrent: '请输入是否可用', + productName: '物料名称', + inputProductName: '请输入物料名称', + spec: '规格', + inputSpec: '请输入规格', + search: '搜索', + reset: '重置', + export: '导出', + creator: '创建人', + materialId: '物料ID', + materialName: '物料名称', + quantity: '数量', + brand: '品牌', + unit: '单位', + price: '价格', + description: '描述', + warehouseId: '仓库id', + warehouseName: '仓库名称', + address: '仓库地址', + warehouseDesc: '仓库描述', + warehouseLevel: '仓库级别', + warehouseType: '仓库类型', + available: '是否可用' + }, + // ***************出库单据历史查询************* + searchViewStockoutHistory: { + stockoutId: '出库单号', + inputStockoutId: '请输入出库单号', + outType: '出库类型', + selectOutType: '请选择出库类型', + createDate: '创建日期', + selectCreateDate: '请选择创建日期', + createManId: '创建人ID', + inputCreateManId: '请输入创建人ID', + status: '出库状态', + selectStatus: '请选择出库状态', + stockoutSource: '出库来源', + inputStockoutSource: '请输入出库来源', + exitId: '出口类型', + inputExitId: '请输入出口类型', + stockoutDetailId: '出库明细ID', + inputStockoutDetailId: '请输入出库明细ID', + productId: '产品ID', + inputProductId: '请输入产品ID', + productName: '产品名称', + inputProductName: '请输入产品名称', + lotNo: '批次号', + inputLotNo: '请输入批次号', + quantity: '出库数量', + inputQuantity: '请输入出库数量', + allotQuantity: '分配数量', + inputAllotQuantity: '请输入分配数量', + assignNum: '分配编号', + inputAssignNum: '请输入分配编号', + erpStockoutId: 'ERP出库单ID', + inputErpStockoutId: '请输入ERP出库单ID', + entryid: '客户编号', + inputEntryid: '请输入客户编号', + customerName: '客户名称', + inputCustomerName: '请输入客户名称', + spec: '规格', + inputSpec: '请输入规格', + brand: '品牌', + inputBrand: '请输入品牌', + unit: '单位', + inputUnit: '请输入单位', + search: '搜索', + reset: '重置', + export: '导出', + confirm: '确定', + cancel: '取消' + }, + // ***************入库单据历史查询************* + searchViewStockinHistory: { + stockinGuid: '入库单guid', + inputStockinGuid: '请输入入库单guid', + stockinId: '入库单号', + inputStockinId: '请输入入库单号', + inType: '入库类型', + selectInType: '请选择入库类型', + createDate: '创建时间', + selectCreateDate: '请选择创建时间', + finishDate: '完成时间', + selectFinishDate: '请选择完成时间', + createManId: '创建人', + inputCreateManId: '请输入创建人', + status: '单据状态', + selectStatus: '请选择单据状态', + warehouseId: '仓库ID', + inputWarehouseId: '请输入仓库ID', + erpBill: 'ERP单号', + inputErpBill: '请输入ERP单号', + stockSource: '单据来源', + inputStockSource: '请输入单据来源', + departmentNo: '部门编码', + inputDepartmentNo: '请输入部门编码', + classNo: '班组编码', + inputClassNo: '请输入班组编码', + supplierNo: '供应商编号', + inputSupplierNo: '请输入供应商编号', + supplierName: '供应商名称', + inputSupplierName: '请输入供应商名称', + simpleName: '供应商简称', + inputSimpleName: '请输入供应商简称', + contactName: '联系人', + inputContactName: '请输入联系人', + contactNumber: '联系电话', + inputContactNumber: '请输入联系电话', + address: '供应商地址', + inputAddress: '请输入供应商地址', + stockinDetailId: '入库明细ID', + inputStockinDetailId: '请输入入库明细ID', + lotNo: '批次号', + inputLotNo: '请输入批次号', + printDate: '入库日期', + selectPrintDate: '请选择入库日期', + stockStatus: '库存状态', + selectStockStatus: '请选择库存状态', + price: '单价', + inputPrice: '请输入单价', + remark: '备注', + inputRemark: '请输入备注', + productId: '物料编码', + inputProductId: '请输入物料编码', + productName: '物料名称', + inputProductName: '请输入物料名称', + cargoNo: '品牌', + inputCargoNo: '请输入品牌', + unit: '单位', + inputUnit: '请输入单位', + spec: '规格', + inputSpec: '请输入规格', + quantity: '计划数量', + quantityX: '计划箱数', + quantityJ: '计划件数', + assignNum: '实际数量', + assignNumX: '实际箱数', + assignNumJ: '实际件数', + scanNum: '扫码数量', + scanNumX: '扫码箱数', + scanNumJ: '扫码件数', + search: '搜索', + reset: '重置', + export: '导出', + addTitle: '添加入库单据历史', + editTitle: '修改入库单据历史', + deleteConfirm: '是否确认删除入库单据历史编号为"{id}"的数据项？', + deleteSuccess: '删除成功', + addSuccess: '新增成功', + editSuccess: '修改成功', + confirm: '确 定', + cancel: '取 消' + }, + // ***************收货单据管理************* + searchStockSummary: { + export: '导出', + productId: '物料编码', + inputProductId: '请输入物料编码', + productName: '物料名称', + inputProductName: '请输入物料名称', + spec: '规格', + inputSpec: '请输入规格', + lotNo: '批号', + inputLotNo: '请输入批号', + warehouseId: '仓库', + inputWarehouseId: '请输入仓库', + roadwayId: '巷道', + inputRoadwayId: '请输入巷道', + search: '搜索', + reset: '重置', + unit: '单位', + quantity: '数量', + }, +// ***************预警库存查询************* + searchViewStockWarning: { + stockId: '库存ID', + inputStockId: '请输入库存ID', + cargoSpaceId: '货位ID', + inputCargoSpaceId: '请输入货位ID', + stockStatus: '库存状态', + selectStockStatus: '请选择库存状态', + productStatus: '物料状态', + selectProductStatus: '请选择物料状态', + lotNo: '批次号', + inputLotNo: '请输入批次号', + inDate: '入库时间', + inputInDate: '请输入入库时间', + backDate: '回流时间', + inputBackDate: '请输入回流时间', + quantity: '库存数量', + inputQuantity: '请输入库存数量', + jobId: '作业ID', + inputJobId: '请输入作业ID', + trayCode: '托盘条码', + inputTrayCode: '请输入托盘条码', + outQuantity: '出库数量', + inputOutQuantity: '请输入出库数量', + stockinId: '入库主单', + inputStockinId: '请输入入库主单', + inType: '入库类型', + selectInType: '请选择入库类型', + warehouseId: '仓库ID', + inputWarehouseId: '请输入仓库ID', + stackingId: '垛型ID', + inputStackingId: '请输入垛型ID', + productId: '物料ID', + inputProductId: '请输入物料ID', + warehouseName: '仓库名称', + inputWarehouseName: '请输入仓库名称', + warehouseType: '仓库类型', + inputWarehouseType: '请输入仓库类型', + isCurrent: '是否可用', + inputIsCurrent: '请输入是否可用', + productName: '物料名称', + inputProductName: '请输入物料名称', + spec: '规格', + inputSpec: '请输入规格', + cargoNo: '品牌', + inputCargoNo: '请输入品牌', + unit: '单位', + inputUnit: '请输入单位', + price: '价格', + inputPrice: '请输入价格', + cargoSpaceName: '货位名称', + inputCargoSpaceName: '请输入货位名称', + cargoAreaId: '货区ID', + inputCargoAreaId: '请输入货区ID', + theType: '货位类型', + inputTheType: '请输入货位类型', + cargoStatus: '货位状态', + inputCargoStatus: '请输入货位状态', + locked: '是否锁定', + inputLocked: '请输入是否锁定', + cargoHight: '货位高度', + inputCargoHight: '请输入货位高度', + issDouble: '是否双伸', + inputIssDouble: '请输入是否双伸', + thePlatoon: '排', + inputThePlatoon: '请输入排', + theColumn: '列', + inputTheColumn: '请输入列', + theFloor: '层', + inputTheFloor: '请输入层', + search: '搜索', + reset: '重置', + export: '导出', + confirm: '确 定', + cancel: '取 消' + }, } From 8eecfa8aacfd92639a2397592f42a56eb6769f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com> Date: Fri, 6 Jun 2025 11:29:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasWarehouseController.java | 11 +++ .../warehouse/mapper/BasWarehouseMapper.java | 6 ++ .../service/IBasWarehouseService.java | 5 ++ .../service/impl/BasWarehouseServiceImpl.java | 9 +++ .../out/outStockout/domain/OutStockout.java | 39 +++++++++++ .../domain/OutStockoutFinish.java | 21 ++++++ .../ruoyi/pda/controller/PdaController.java | 59 ++++++++++++++++ .../com/ruoyi/pda/domain/TrayCodeMsg.java | 44 ++++++++++++ .../java/com/ruoyi/pda/mapper/PdaMapper.java | 10 +++ .../com/ruoyi/pda/service/PdaService.java | 11 +++ .../com/ruoyi/pda/service/PdaServiceImp.java | 67 +++++++++++++++++++ .../controller/system/SysUserController.java | 2 + .../bas/warehouse/BasWarehouseMapper.xml | 5 ++ .../out/OutStockoutDetailFinishMapper.xml | 6 +- .../mapper/out/OutStockoutDetailMapper.xml | 8 ++- .../mapper/out/OutStockoutFinishMapper.xml | 45 ++++++++----- .../mapper/out/OutStockoutMapper.xml | 43 +++++++----- .../main/resources/mapper/pda/PdaMapper.xml | 27 ++++++++ ruoyi-ui/src/views/out/outStockoutManage.vue | 64 ++++++++++++++---- 19 files changed, 433 insertions(+), 49 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java create mode 100644 ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java index b9244b7..cb7b2bb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java @@ -96,4 +96,15 @@ public class BasWarehouseController extends BaseController { return toAjax(basWarehouseService.deleteBasWarehouseByWarehouseIds(warehouseIds)); } + /** + * 获取除了CTU以外的库 + */ + @RequestMapping("/getWarehouseByType") + @ResponseBody + public AjaxResult getWarehouseByType() + { + + List list = basWarehouseService.selectBasWarehouseListByType(); + return AjaxResult.success(list); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/mapper/BasWarehouseMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/mapper/BasWarehouseMapper.java index 143e13a..e3df09c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/mapper/BasWarehouseMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/mapper/BasWarehouseMapper.java @@ -59,4 +59,10 @@ public interface BasWarehouseMapper * @return 结果 */ public int deleteBasWarehouseByWarehouseIds(String[] warehouseIds); + + /** + * + */ + public List selectBasWarehouseListByType(); } + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/IBasWarehouseService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/IBasWarehouseService.java index 676675d..3060c57 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/IBasWarehouseService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/IBasWarehouseService.java @@ -59,4 +59,9 @@ public interface IBasWarehouseService * @return 结果 */ public int deleteBasWarehouseByWarehouseId(String warehouseId); + + /** + * + */ + public List selectBasWarehouseListByType(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java index 7ab592d..dac203b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java @@ -6,6 +6,7 @@ import com.ruoyi.bas.warehouse.service.IBasWarehouseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; /** @@ -91,4 +92,12 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService { return basWarehouseMapper.deleteBasWarehouseByWarehouseId(warehouseId); } + + /** + * + */ + @Override + public List selectBasWarehouseListByType() { + return basWarehouseMapper.selectBasWarehouseListByType(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java index 3736c8e..3d56aa7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java @@ -81,6 +81,45 @@ public class OutStockout extends BaseEntity @Excel(name = "确认时间") private String finishDate; + private String customerName; + + private String warehouseName; + + private String productId; + + private String productName; + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } public String getStartDate() { return startDate; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/domain/OutStockoutFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/domain/OutStockoutFinish.java index 5a80f04..286bc2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/domain/OutStockoutFinish.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/domain/OutStockoutFinish.java @@ -83,6 +83,27 @@ public class OutStockoutFinish extends BaseEntity @Excel(name = "完成时间") private String finishDate; + private String customerName; + + private String warehouseName; + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public void setStockoutGuid(String stockoutGuid) { this.stockoutGuid = stockoutGuid; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java new file mode 100644 index 0000000..9e137bf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java @@ -0,0 +1,59 @@ +package com.ruoyi.pda.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.in.stockin.domain.InStockin; +import com.ruoyi.in.stockin.service.IInStockinService; +import com.ruoyi.pda.domain.TrayCodeMsg; +import com.ruoyi.pda.service.PdaService; +import io.swagger.v3.oas.annotations.parameters.RequestBody; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +import static com.ruoyi.common.utils.PageUtils.startPage; + +@Controller +@RequestMapping("/pda") +public class PdaController extends BaseController { + + @Autowired + private PdaService pdaService; + @Autowired + private IInStockinService inStockinService; + + /** + * 空托盘入库 + * @param trayCodeMsg + * @return + */ + @RequestMapping("/emptyTrayIn") + @ResponseBody + public AjaxResult emptyTrayIn(@RequestBody TrayCodeMsg trayCodeMsg) { + AjaxResult ajaxResult = pdaService.emptyTrayIn(trayCodeMsg); + return ajaxResult; + } + + /** + * 空料箱入库 + */ + @RequestMapping("/emptyBoxIn") + @ResponseBody + public AjaxResult emptyBoxIn(@RequestBody TrayCodeMsg trayCodeMsg) { + AjaxResult ajaxResult = pdaService.emptyBoxIn(trayCodeMsg); + return ajaxResult; + } + + @RequestMapping("/inorder/list") + @ResponseBody + public TableDataInfo inoderList(InStockin stockin) { + startPage(); + List stockins = inStockinService.selectInStockinList(stockin); + return getDataTable(stockins); + } +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java new file mode 100644 index 0000000..ca1e13a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java @@ -0,0 +1,44 @@ +package com.ruoyi.pda.domain; + +public class TrayCodeMsg { + +private String trayCode; + +private String warehouseId; + +private String quantity; + +private String entranceId; + + public String getEntranceId() { + return entranceId; + } + + public void setEntranceId(String entranceId) { + this.entranceId = entranceId; + } + + public String getTrayCode() { + return trayCode; + } + + public void setTrayCode(String trayCode) { + this.trayCode = trayCode; + } + + public String getWarehouseId() { + return warehouseId; + } + + public void setWarehouseId(String warehouseId) { + this.warehouseId = warehouseId; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java new file mode 100644 index 0000000..803b630 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java @@ -0,0 +1,10 @@ +package com.ruoyi.pda.mapper; + +import java.util.HashMap; + +public interface PdaMapper { + + void emptyTrayIn(HashMap map); + + void emptyBoxIn(HashMap map); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java new file mode 100644 index 0000000..0ec8c97 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java @@ -0,0 +1,11 @@ +package com.ruoyi.pda.service; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.pda.domain.TrayCodeMsg; + +public interface PdaService { + + public AjaxResult emptyTrayIn(TrayCodeMsg trayCodeMsg); + + public AjaxResult emptyBoxIn(TrayCodeMsg trayCodeMsg); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java new file mode 100644 index 0000000..e7eec99 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -0,0 +1,67 @@ +package com.ruoyi.pda.service; + +import cn.hutool.core.util.StrUtil; +import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; +import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.pda.domain.TrayCodeMsg; +import com.ruoyi.pda.mapper.PdaMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.HashMap; + +@Service +public class PdaServiceImp implements PdaService{ + @Autowired + PdaMapper pdaMapper; + @Autowired + IBasCargoSpaceService basCargoSpaceService; + + /** + * 空托盘入库 + * @param trayCodeMsg + * @return + */ + @Override + public AjaxResult emptyTrayIn(TrayCodeMsg trayCodeMsg) { + HashMap map = new HashMap<>(); + map.put("v_tray_code", trayCodeMsg.getTrayCode()); + map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); + map.put("v_quantity", "1"); + pdaMapper.emptyTrayIn(map); + String result = (String) map.get("v_result"); + String cargoSpaceId = map.get("v_cargo_space_id").toString(); + if(StrUtil.isNotEmpty(cargoSpaceId)){ + BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(cargoSpaceId); + map.put("v_cargo_space_id", basCargoSpace.getCargoSpaceName()); + } + if("10".equals(result)){ + return AjaxResult.success(map); + }else{ + return AjaxResult.error(map.get("v_resultmsg").toString()); + } + + } + + /** + * 空料箱入库 + * @param trayCodeMsg + * @return + */ + @Override + public AjaxResult emptyBoxIn(TrayCodeMsg trayCodeMsg) { + HashMap map = new HashMap<>(); + map.put("v_tray_code", trayCodeMsg.getTrayCode()); + map.put("v_entrance_id", trayCodeMsg.getEntranceId()); + pdaMapper.emptyBoxIn(map); + String result = (String) map.get("v_result"); + if("10".equals(result)){ + return AjaxResult.success(map.get("v_resultmsg").toString()); + }else{ + return AjaxResult.error(map.get("v_resultmsg").toString()); + } + + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 130c438..8a85b6a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -253,4 +253,6 @@ public class SysUserController extends BaseController { return success(deptService.selectDeptTreeList(dept)); } + + } diff --git a/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml index 6a74890..a4daef5 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml @@ -91,4 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{warehouseId} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml index 8cbbc7f..685755c 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml @@ -206,7 +206,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml index 4f3f751..6b3cc46 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml @@ -206,7 +206,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml index f7852da..98e346a 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml @@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -133,25 +135,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml index eb71083..7e93c88 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml @@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -29,23 +31,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml new file mode 100644 index 0000000..c689cbb --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue index 7be674c..3a70bc6 100644 --- a/ruoyi-ui/src/views/out/outStockoutManage.vue +++ b/ruoyi-ui/src/views/out/outStockoutManage.vue @@ -30,14 +30,46 @@ /> - + + + + + + + + + + + + + + + + + + + + {{$t('outStockoutManage.search')}} {{$t('outStockoutManage.reset')}} @@ -110,12 +142,14 @@ - - - - - - + + + + + + + + + + - - - + + + @@ -179,6 +215,10 @@ export default { stockoutId: null, outType: null, customerNo: null, + customerName: null, + productName: null, + startDate: null, + finishDate: null, status: '1' }, // 子表分页参数