diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue index 0bd00e4..ea7f8dc 100644 --- a/src/views/modules/schedule/order_schedule.vue +++ b/src/views/modules/schedule/order_schedule.vue @@ -95,7 +95,7 @@ - + @@ -1947,7 +1947,9 @@ export default { /*分批排产*/ initAddSplitSchedule(scheduledQty){ - //发送请求 + //设置工单和工序 + this.pageData.orderNo = this.currentRoutingRow.orderNo; + this.pageData.itemNo = this.currentRoutingRow.itemNo; //判断排产的加工中心和机台是否为空 if(this.pageData.workCenterNo == null || '' == this.pageData.workCenterNo){ this.$message.error('加工中心不能为空!') diff --git a/src/views/modules/yieldReport/com_replace_tool.vue b/src/views/modules/yieldReport/com_replace_tool.vue index c6f06ee..8baa2e3 100644 --- a/src/views/modules/yieldReport/com_replace_tool.vue +++ b/src/views/modules/yieldReport/com_replace_tool.vue @@ -229,7 +229,7 @@ export default { /*数量失去焦点的事件*/ changeToolQty(){ let consumeQty = parseFloat(this.pageData.consumeQty); - if(consumeQty <= 0){ + if(consumeQty < 0){ this.$message.error('本卷生产数量不能小于0!'); return false; } @@ -292,7 +292,7 @@ export default { } /*耗用的参数*/ let consumeQty = parseFloat(this.pageData.consumeQty); - if(consumeQty <= 0){ + if(consumeQty < 0){ this.$message.error('本卷生产数量不能小于0!'); return false; } diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 82288d9..b367f28 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -64,10 +64,10 @@ - + - + 显示已结束派工单