diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue index 8a4615a59..d42a36bc4 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue @@ -496,7 +496,6 @@ export default { // 根据此仓位的 ‘相同块、相同排、相同层’ 判断上一个任务是否生成 const tab = this.tabledis for (let i = 0; i < tab.length; i++) { - debugger const item = tab[i] if (this.currentDis.block_num === item.block_num && this.currentDis.row_num === item.row_num && this.currentDis.layer_num === item.layer_num) { const out_order_seq = parseInt(this.currentDis.out_order_seq) - 1 @@ -529,7 +528,6 @@ export default { }) }, cellStyle({ row, column, rowIndex, columnIndex }) { - debugger const assign_qty = parseFloat(row.assign_qty) const plan_qty = parseFloat(row.plan_qty) diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue index 133f93205..5f12371a7 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue @@ -231,11 +231,20 @@ export default { this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) - parseFloat(row.canuse_qty) this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) + parseFloat(row.canuse_qty) } else { - this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + parseFloat(row.canuse_qty) - if (this.queryrow.unassign_qty > this.goal_unassign_qty){ + this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) - parseFloat(row.canuse_qty) + // 如果待分配重量等于0则 明细重量 - 已分配重量 + if (parseInt(this.queryrow.unassign_qty) === 0) { + this.queryrow.unassign_qty = parseFloat(this.goal_unassign_qty) - parseFloat(this.queryrow.assign_qty) + } else { + this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + parseFloat(row.canuse_qty) + } + if (this.queryrow.unassign_qty > this.goal_unassign_qty) { this.queryrow.unassign_qty = JSON.parse(JSON.stringify(this.goal_unassign_qty)) } - this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) - parseFloat(row.canuse_qty) + // 如果已分配汇总量 > 明细重量 则待分配重量为0 + if (this.queryrow.assign_qty > this.goal_unassign_qty) { + this.queryrow.unassign_qty = parseFloat('0') + } } this.tableDtl.splice(index, 1, row) // 通过splice 替换数据 触发视图更新 },