diff --git a/klp-ui/src/views/wms/move/components/tranferItemTable.vue b/klp-ui/src/views/wms/move/components/tranferItemTable.vue index 684e9483..8dc60090 100644 --- a/klp-ui/src/views/wms/move/components/tranferItemTable.vue +++ b/klp-ui/src/views/wms/move/components/tranferItemTable.vue @@ -131,6 +131,14 @@ export default { type: Boolean, default: false }, + refreshLabel: { + type: Boolean, + default: false + }, + transferRemark: { + type: String, + default: '' + }, }, components: { // WarehouseSelect, @@ -235,7 +243,19 @@ export default { // 确认调拨 handleConfirm(item) { this.buttonLoading = true - confirmTransferOrderItem(item).then(res => { + let transferRemark = this.transferRemark + if (this.refreshLabel && !transferRemark) { + transferRemark = '调拨' + } + if (!this.refreshLabel) { + transferRemark = '' + } + // console.log(transferRemark, this.refreshLabel, this.transferRemark) + // return; + confirmTransferOrderItem({ + ...item, + transferRemark + }).then(res => { if (res.code === 200) { this.$message({ message: '确认调拨成功', @@ -260,8 +280,20 @@ export default { return; } + let transferRemark = this.transferRemark + if (this.refreshLabel && !transferRemark) { + transferRemark = '调拨' + } + if (!this.refreshLabel) { + transferRemark = '' + } + // console.log(transferRemark) + // return; this.buttonLoading = true; - batchConfirmTransferOrderItem(unconfirmedItems).then(res => { + batchConfirmTransferOrderItem(unconfirmedItems.map(item => ({ + ...item, + transferRemark + }))).then(res => { if (res.code === 200) { this.$message({ message: '确认调拨成功', diff --git a/klp-ui/src/views/wms/move/do.vue b/klp-ui/src/views/wms/move/do.vue index 68cae7a2..55418979 100644 --- a/klp-ui/src/views/wms/move/do.vue +++ b/klp-ui/src/views/wms/move/do.vue @@ -18,10 +18,10 @@ - + remote-method="remoteSearchTransferOrder" :remote-loading="transferOrderLoading" placeholder="请输入调拨单号搜索" + @change="handleRegularSearch" style="width:220px"> + @@ -36,9 +36,15 @@ +
+ 执行后重贴标签 + + 请填写重贴原因,不填则默认为:’调拨‘ +
+ - ({{ coil.enterCoilNo }}) - {{ coil.dataType === 1 ? '当前卷' : '历史卷' }} | + {{ coil.dataType === 1 ? '当前卷' : '历史卷' }} | {{ coil.status === 1 ? '已发货' : '未发货' }} @@ -65,7 +71,7 @@ {{ coil.material || '-' }} {{ coil.manufacturer || '-' }} - + @@ -89,6 +95,8 @@ export default { currentCoilNo: '', enterCoilNo: '', }, + refreshLabel: false, + transferRemark: '', queryParams: { warehouseIdBefore: '', warehouseIdAfter: '', @@ -143,7 +151,7 @@ export default { }) ); this.tracedCoils = tracedCoilsData.filter(coil => coil.transferRecords.length > 0); - + } else { this.$message.info('未找到符合条件的钢卷'); } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java index 82e54384..40a70030 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsTransferOrderItemBo.java @@ -82,4 +82,6 @@ public class WmsTransferOrderItemBo extends BaseEntity { // 修改之后的itemType private String itemTypeAfter; + // 重贴标签的备注 + private String transferRemark; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java index abbd2561..a97153a3 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java @@ -589,11 +589,14 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer coil.setWarehouseId(finalWarehouseId); // 设置调拨类型 - if (item.getTransferId() != null) { - WmsTransferOrder wmsTransferOrder = wmsTransferOrderMapper.selectById(item.getTransferId()); - if (wmsTransferOrder != null) { - coil.setTransferType(wmsTransferOrder.getTransferType()); - } +// if (item.getTransferId() != null) { +// WmsTransferOrder wmsTransferOrder = wmsTransferOrderMapper.selectById(item.getTransferId()); +// if (wmsTransferOrder != null) { +// coil.setTransferType(wmsTransferOrder.getTransferType()); +// } +// } + if (bo.getTransferRemark() != null) { + coil.setTransferType(bo.getTransferRemark()); } coilMapper.updateById(coil);