diff --git a/klp-ui/src/api/wms/transferOrderItem.js b/klp-ui/src/api/wms/transferOrderItem.js index b1c812e7..0ff3a191 100644 --- a/klp-ui/src/api/wms/transferOrderItem.js +++ b/klp-ui/src/api/wms/transferOrderItem.js @@ -126,6 +126,21 @@ export function confirmTransferOrderItem(item) { }) } +/** + * 批量确认调拨 + */ +export function batchConfirmTransferOrderItem(list) { + if (!list || list.length === 0) { + return Promise.reject('参数错误') + } + + return request({ + url: '/wms/transferOrderItem/batchConfirm', + method: 'post', + data: list + }) +} + /** * 取消调拨 */ diff --git a/klp-ui/src/views/wms/move/batch.vue b/klp-ui/src/views/wms/move/batch.vue index 20a87476..3150d790 100644 --- a/klp-ui/src/views/wms/move/batch.vue +++ b/klp-ui/src/views/wms/move/batch.vue @@ -2,26 +2,14 @@
- + - + - @@ -45,42 +33,18 @@ - 新增 + 新增 - 修改 + 修改 - 删除 + 删除 - 导出 + 导出 @@ -96,7 +60,7 @@ - + - + @@ -317,20 +231,34 @@ export default { }); }, handleResolve(row) { - approveTransferOrder(row.orderId, '2').then(response => { + updateTransferOrder({ + ...row, + approveStatus: '2', + }).then(_ => { this.$modal.msgSuccess('审批成功'); this.getList(); - }).finally(() => { - this.loading = false; - }); + }) + // approveTransferOrder(row.orderId, '2').then(response => { + // this.$modal.msgSuccess('审批成功'); + // this.getList(); + // }).finally(() => { + // this.loading = false; + // }); }, handleReject(row) { - approveTransferOrder(row.orderId, '3').then(response => { - this.$modal.msgSuccess('审批成功'); + updateTransferOrder({ + ...row, + approveStatus: '3', + }).then(_ => { + this.$modal.msgSuccess('已驳回调拨单'); this.getList(); - }).finally(() => { - this.loading = false; - }); + }) + // approveTransferOrder(row.orderId, '3').then(response => { + // this.$modal.msgSuccess('已驳回调拨单'); + // this.getList(); + // }).finally(() => { + // this.loading = false; + // }); }, /** 获取审批状态文本 */ getapproveStatusText(status) { @@ -468,7 +396,7 @@ export default { 'coil_supplierCoilNo': '厂家卷号', // 'coil_warehouseName': '逻辑库区', 'coil_netWeight': '净重', - + // 'coil_itemName': '物品名称', // 'coil_materialType': '物料类型', 'coil_qualityStatus': '质量状态', @@ -484,7 +412,7 @@ export default { // 准备导出数据 const exportData = this.transferOrderItems.map(item => { const flatItem = {}; - + // 处理Before和After字段 exportFields.forEach(field => { if (field.startsWith('coil_')) { @@ -494,7 +422,7 @@ export default { flatItem[field] = item[field] !== null && item[field] !== undefined ? item[field] : ''; } }); - + return flatItem; }); @@ -525,7 +453,7 @@ export default { document.body.appendChild(link); link.click(); document.body.removeChild(link); - }, + }, /** 钢卷选择器改变 */ handleCoilChange(coils) { console.log(coils); @@ -550,25 +478,25 @@ export default { this.reset(); }, // 表单重置 - reset() { - this.form = { - orderId: undefined, - transferNo: undefined, - transferName: undefined, - transferStatus: undefined, - transferTime: undefined, - remark: undefined, - delFlag: undefined, - createBy: undefined, - updateBy: undefined, - createTime: undefined, - updateTime: undefined, - approveStatus: '0', - approver: undefined, - approveTime: undefined - }; - this.resetForm("form"); - }, + reset() { + this.form = { + orderId: undefined, + transferNo: undefined, + transferName: undefined, + transferStatus: undefined, + transferTime: undefined, + remark: undefined, + delFlag: undefined, + createBy: undefined, + updateBy: undefined, + createTime: undefined, + updateTime: undefined, + approveStatus: '0', + approver: undefined, + approveTime: undefined + }; + this.resetForm("form"); + }, getDetailList() { this.handleView({ orderId: this.currentOrderId, approveStatus: this.currentOrderStatus }); }, @@ -601,7 +529,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.orderId) - this.single = selection.length!==1 + this.single = selection.length !== 1 this.multiple = !selection.length }, /** 新增按钮操作 */ @@ -610,18 +538,18 @@ export default { // 生成当前时间 const currentDate = new Date(); // 生成调拨单号：TR + 年月日时分秒 - const transferNo = 'TR' + currentDate.getFullYear() + - String(currentDate.getMonth() + 1).padStart(2, '0') + - String(currentDate.getDate()).padStart(2, '0') + - String(currentDate.getHours()).padStart(2, '0') + - String(currentDate.getMinutes()).padStart(2, '0') + + const transferNo = 'TR' + currentDate.getFullYear() + + String(currentDate.getMonth() + 1).padStart(2, '0') + + String(currentDate.getDate()).padStart(2, '0') + + String(currentDate.getHours()).padStart(2, '0') + + String(currentDate.getMinutes()).padStart(2, '0') + String(currentDate.getSeconds()).padStart(2, '0'); // 生成调拨时间：YYYY-MM-DD HH:mm:ss - const transferTime = currentDate.getFullYear() + '-' + - String(currentDate.getMonth() + 1).padStart(2, '0') + '-' + - String(currentDate.getDate()).padStart(2, '0') + ' ' + - String(currentDate.getHours()).padStart(2, '0') + ':' + - String(currentDate.getMinutes()).padStart(2, '0') + ':' + + const transferTime = currentDate.getFullYear() + '-' + + String(currentDate.getMonth() + 1).padStart(2, '0') + '-' + + String(currentDate.getDate()).padStart(2, '0') + ' ' + + String(currentDate.getHours()).padStart(2, '0') + ':' + + String(currentDate.getMinutes()).padStart(2, '0') + ':' + String(currentDate.getSeconds()).padStart(2, '0'); // 填充表单 this.form.transferNo = transferNo; diff --git a/klp-ui/src/views/wms/move/components/tranferItemTable.vue b/klp-ui/src/views/wms/move/components/tranferItemTable.vue index e18158d8..684e9483 100644 --- a/klp-ui/src/views/wms/move/components/tranferItemTable.vue +++ b/klp-ui/src/views/wms/move/components/tranferItemTable.vue @@ -1,5 +1,6 @@ + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/move/record.vue b/klp-ui/src/views/wms/move/record.vue index bdff37d7..068b2c1d 100644 --- a/klp-ui/src/views/wms/move/record.vue +++ b/klp-ui/src/views/wms/move/record.vue @@ -23,8 +23,16 @@ + + + + + - + @@ -71,6 +79,7 @@ import TransferItemTable from "@/views/wms/move/components/tranferItemTable.vue"; import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; import { listTransferOrderItem } from "@/api/wms/transferOrderItem"; +import { listTransferOrder } from "@/api/wms/transferOrder"; import { listMaterialCoil } from "@/api/wms/coil"; export default { @@ -87,6 +96,7 @@ export default { queryParams: { warehouseIdBefore: '', warehouseIdAfter: '', + transferNo: '', isTransferred: '', pageSize: 20, pageNum: 1, @@ -94,12 +104,27 @@ export default { transferList: [], tracedCoils: [], warehouseList: [], + transferOrderOptions: [], + transferOrderLoading: false, loading: false, total: 0, dialogVisible: false, }; }, methods: { + async remoteSearchTransferOrder(query) { + this.transferOrderLoading = true + try { + const params = { pageSize: 50, pageNum: 1 } + if (query) params.transferNo = query + const res = await listTransferOrder(params) + this.transferOrderOptions = res.rows || [] + } catch (_) { + this.transferOrderOptions = [] + } finally { + this.transferOrderLoading = false + } + }, async handleTraceSearch() { if (!this.traceParams.currentCoilNo && !this.traceParams.enterCoilNo) { this.$message.warning('请输入当前卷号或入库卷号'); @@ -148,7 +173,7 @@ export default { }, }, mounted() { - + this.remoteSearchTransferOrder('') this.handleRegularSearch(); }, }; diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java index c0b78438..0e3be7ee 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderServiceImpl.java @@ -77,7 +77,7 @@ public class WmsTransferOrderServiceImpl implements IWmsTransferOrderService { private LambdaQueryWrapper buildQueryWrapper(WmsTransferOrderBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getTransferNo()), WmsTransferOrder::getTransferNo, bo.getTransferNo()); + lqw.like(StringUtils.isNotBlank(bo.getTransferNo()), WmsTransferOrder::getTransferNo, bo.getTransferNo()); lqw.like(StringUtils.isNotBlank(bo.getTransferName()), WmsTransferOrder::getTransferName, bo.getTransferName()); lqw.eq(bo.getTransferStatus() != null, WmsTransferOrder::getTransferStatus, bo.getTransferStatus()); lqw.eq(bo.getTransferTime() != null, WmsTransferOrder::getTransferTime, bo.getTransferTime());