diff --git a/klp-ui/src/views/wms/coil/actflow.vue b/klp-ui/src/views/wms/coil/actflow.vue index 8fd07548..d0296df1 100644 --- a/klp-ui/src/views/wms/coil/actflow.vue +++ b/klp-ui/src/views/wms/coil/actflow.vue @@ -194,12 +194,7 @@ - - 选择钢卷 - - - {{ form.currentCoilNo }} - +
@@ -262,12 +257,6 @@ 取 消
- - - @@ -284,6 +273,7 @@ import { } from '@/api/wms/pendingAction'; import CoilSelector from '@/components/CoilSelector'; + export default { name: 'CoilActflow', dicts: ['action_type'], diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue index e30807ba..23d20e88 100644 --- a/klp-ui/src/views/wms/coil/split.vue +++ b/klp-ui/src/views/wms/coil/split.vue @@ -662,6 +662,17 @@ export default { } // 不复制 itemType 和 itemId,让它们由 materialType 自动决定 + if (item.itemType) { + item.itemType = this.motherCoil.itemType; + } + + if (item.itemId) { + item.itemId = this.motherCoil.itemId; + } + + if (item.materialType) { + item.materialType = this.motherCoil.materialType; + } }); // 不再预加载物品列表,改为实时搜索 diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue index d6d8a743..967b0818 100644 --- a/klp-ui/src/views/wms/coil/typing.vue +++ b/klp-ui/src/views/wms/coil/typing.vue @@ -587,12 +587,13 @@ export default { // 复制当前信息到更新表单 copyFromCurrent() { + const itemType = this.currentInfo.materialType === '原料' ? 'raw_material' : 'product'; this.updateForm = { currentCoilNo: this.currentInfo.currentCoilNo, team: this.currentInfo.team, materialType: this.currentInfo.materialType, // 不复制 itemType 和 itemId,让它们由 materialType 自动决定 - itemType: null, + itemType, itemId: null, grossWeight: parseFloat(this.currentInfo.grossWeight) || null, netWeight: parseFloat(this.currentInfo.netWeight) || null,