|
@ -293,13 +293,14 @@ const fromManagementPrecision = ref('') |
|
|
const toManagementPrecision = ref('') |
|
|
const toManagementPrecision = ref('') |
|
|
// 查询页面返回 |
|
|
// 查询页面返回 |
|
|
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { |
|
|
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { |
|
|
nextTick(() => { |
|
|
nextTick(async () => { |
|
|
|
|
|
console.log(formField) |
|
|
if (type == 'tableForm') { |
|
|
if (type == 'tableForm') { |
|
|
if(formField == 'fromPackingNumber'){ |
|
|
if (formField == 'fromPackingNumber') { |
|
|
val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) |
|
|
val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode'] && item1['fromBatch'] == item['batch'] && item1['fromPackingNumber'] == item['packingNumber'] && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus'])) |
|
|
if(val.length==0) return |
|
|
if (val.length == 0) return |
|
|
val.forEach(item=>{ |
|
|
val.forEach(item => { |
|
|
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) |
|
|
const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item })) |
|
|
newRow['fromPackingNumber'] = item['packingNumber'] |
|
|
newRow['fromPackingNumber'] = item['packingNumber'] |
|
|
newRow['fromContainerNumber'] = item['containerNumber'] |
|
|
newRow['fromContainerNumber'] = item['containerNumber'] |
|
|
newRow['itemCode'] = item['itemCode'] |
|
|
newRow['itemCode'] = item['itemCode'] |
|
@ -312,12 +313,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => |
|
|
newRow['toInventoryStatus'] = "OK" //HoldtoWipRequestMain 隔离转线边 |
|
|
newRow['toInventoryStatus'] = "OK" //HoldtoWipRequestMain 隔离转线边 |
|
|
tableData.value.push(newRow) |
|
|
tableData.value.push(newRow) |
|
|
}) |
|
|
}) |
|
|
}else if(formField == 'toLocationCode'){//到库位代码 |
|
|
} else if (formField == 'toLocationCode') {//到库位代码 |
|
|
debugger |
|
|
//从批次 |
|
|
//从批次 |
|
|
await ruleApi.getManagementPrecision({ |
|
|
await ruleApi.getManagementPrecision({ |
|
|
itemCodes: [row['itemCode']], |
|
|
itemCodes: [row['itemCode']], |
|
|
locationCode: row['fromLocationCode'] |
|
|
locationCode:row['fromLocationCode'] |
|
|
|
|
|
}).then((res) => { |
|
|
}).then((res) => { |
|
|
fromManagementPrecision.value = res[0].ManagementPrecision |
|
|
fromManagementPrecision.value = res[0].ManagementPrecision |
|
|
}) |
|
|
}) |
|
@ -325,23 +325,24 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => |
|
|
if (fromManagementPrecision.value == 'BY_QUANTITY') {//如果从批次+物料管理精度是按数量 |
|
|
if (fromManagementPrecision.value == 'BY_QUANTITY') {//如果从批次+物料管理精度是按数量 |
|
|
//到批次 |
|
|
//到批次 |
|
|
await ruleApi.getManagementPrecision({ |
|
|
await ruleApi.getManagementPrecision({ |
|
|
itemCodes: [row['itemCode']], |
|
|
itemCodes: [row['itemCode']], |
|
|
locationCode:row['locationCode'] |
|
|
locationCode: row['locationCode'] |
|
|
}).then((res) => { |
|
|
}).then((res) => { |
|
|
toManagementPrecision.value = res[0].ManagementPrecision |
|
|
toManagementPrecision.value = res[0].ManagementPrecision |
|
|
}) |
|
|
}) |
|
|
if (toManagementPrecision.value != 'BY_QUANTITY') {//到批次+物料管理精度非数量需要添加批次 |
|
|
if (toManagementPrecision.value != 'BY_QUANTITY') {//到批次+物料管理精度非数量需要添加批次 |
|
|
if(newRow['fromBatch']==''){ |
|
|
if (row['fromBatch'] == '') { |
|
|
newRow['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期 |
|
|
row['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期 |
|
|
|
|
|
} |
|
|
|
|
|
row['fromBatchFormItemType'] = 'FormDate' |
|
|
|
|
|
row['disabled_fromBatch'] = false |
|
|
|
|
|
} else { |
|
|
|
|
|
row['fromBatchFormItemType'] = '' |
|
|
|
|
|
row['disabled_fromBatch'] = true |
|
|
} |
|
|
} |
|
|
newRow['fromBatchFormItemType'] = 'FormDate' |
|
|
} else { |
|
|
newRow['disabled_fromBatch'] = false |
|
|
row[formField] = val[0][searchField] |
|
|
}else { |
|
|
|
|
|
newRow['fromBatchFormItemType'] = '' |
|
|
|
|
|
newRow['disabled_fromBatch'] = true |
|
|
|
|
|
} |
|
|
} |
|
|
} else { |
|
|
|
|
|
row[formField] = val[0][searchField] |
|
|
|
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
const setV = {} |
|
|
const setV = {} |
|
|