合并卷和FQC排产

src/api/schedule/order_schedule_fqc.js

@@ -1,13 +1,13 @@
 import { createAPI } from '@/utils/httpRequest.js'
 
-// 获取机台休息班次的信息
-export const getResourceRestList = data => createAPI('schedule/getResourceRestList', 'POST', data)
+// 获取FQC待排产的工单
+export const getShopOrderListWithFqc = data => createAPI('scheduling/getShopOrderListWithFqc', 'POST', data)
 
-// 获取信息
-export const getShopOrderList = data => createAPI('schedule/getShopOrderList', 'POST', data)
+// 获取FQC的操作员信息
+export const getOperatorListWithFqc = data => createAPI('scheduling/getOperatorListWithFqc', 'POST', data)
 
-// 获取信息
-export const getOrderScheduleList = data => createAPI('schedule/getOrderScheduleList', 'POST', data)
+// 获取FQC的排产记录
+export const getOrderScheduleListWithFqc = data => createAPI('scheduling/getOrderScheduleListWithFqc', 'POST', data)
 
 //获取当前加工中心对应的机台数据
 export const getCurrentWorkCenterNoByResourceId = data => createAPI('scheduling/getCurrentWorkCenterNoByResourceId', 'POST', data)
@@ -24,5 +24,11 @@ export const addWaitSchedule = data => createAPI('scheduling/addWaitSchedule', '
 //重新排产生产工单的操作
 export const reScheduleWorkOrders = data => createAPI('scheduling/reScheduleWorkOrders', 'POST', data)
 
+//上移派工单
+export const moveUpSchedule = data => createAPI('scheduling/moveUpSchedule', 'POST', data)
+
+//上移派工单
+export const moveDownSchedule = data => createAPI('scheduling/moveDownSchedule', 'POST', data)
+
 
 

src/views/modules/yieldReport/com_merge_roll.vue

@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item class="customer-item" label="当前卷数量:">
-              <el-input v-model="pageData.rollQty" readonly style="width: 80px;"></el-input>
+              <el-input v-model="pageData.rollQty" style="width: 80px;"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -158,13 +158,14 @@ export default {
       //首先判断数值是否通过判断
       let newRollQty = this.pageData.newRollQty;
       if (newRollQty == null || newRollQty == '') {
-        this.$message.error('请输入新卷数量!');
+        //this.$message.error('请输入新卷数量!');
         this.pageData.newRollQty = 0;//重新赋值
         return false;
       }
-
+      //转换成整数
+      newRollQty = parseInt(newRollQty);
       if (newRollQty <= 0 || !Number.isInteger(newRollQty)) {
-        this.$message.error('新卷数量必须是大于零的整数!');
+        //this.$message.error('新卷数量必须是大于零的整数!');
         this.pageData.newRollQty = 0;//重新赋值
         return false;
       }