生产排产对接口

src/api/mes/pro/scheduleList.js

@@ -45,12 +45,12 @@ export function arrangeList(query) {
   });
 }
 
-// 关联工单表查询编排表（合并重复项）
-export function distinctList(query) {
+// 查询待排产生产工单列表
+export function scheduleList(query) {
   return request({
-    url: "/pro/arrange/distinctList",
-    method: "post",
-    data: query,
+    url: "/mes/pro/workorder/scheduleList",
+    method: "get",
+    params: query,
   });
 }
 

src/views/mes/pro/scheduleList/index.vue

@@ -787,8 +787,8 @@ export default {
       if (this.$refs.orderListRef.selectedRows&&this.$refs.orderListRef.selectedRows.length > 0) {
         let formData = this.$refs.orderListRef.selectedRows.map(item => {
           return {
-            // workorderId: item.workorderId,
-            arrangeCode: item.arrangeCode
+            workorderId: item.workorderId,
+            scheduleQuantity: item.scheduleQuantity
           }
         });
         this.scheduleBtnDis = true

src/views/mes/pro/scheduleList/orderList.vue

 <template>
     <div>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="编排单号" prop="arrangeCode">
+      <el-form-item label="生产工单" prop="workorderCode">
         <el-input
-          v-model="queryParams.arrangeCode"
-          placeholder="请输入编排单号"
+          v-model="queryParams.workorderCode"
+          placeholder="请输入生产工单"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="生产工单" prop="workorderCode">
+      <el-form-item label="产品编码" prop="productCode">
         <el-input
-          v-model="queryParams.workorderCode"
-          placeholder="请输入生产工单"
+          v-model="queryParams.productCode"
+          placeholder="请输入产品编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="编排人员" prop="createBy">
+      <el-form-item label="产品名称" prop="productName">
         <el-input
-          v-model="queryParams.createBy"
-          placeholder="请输入编排人员"
+          v-model="queryParams.productName"
+          placeholder="请输入产品名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -37,19 +37,28 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="编排单号" align="center" prop="arrangeCode">
-        <template slot-scope="scope">
+      <el-table-column label="生产工单" align="center" prop="workorderCode">
+        <!-- <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            @click="$emit('clickTask', scope.row.arrangeCode)"
-            >{{ scope.row.arrangeCode }}</el-button
+            @click="$emit('clickTask', scope.row.workorderCode)"
+            >{{ scope.row.workorderCode }}</el-button
           >
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品编码" align="center" prop="productCode"/>
+      <el-table-column label="产品名称" align="center" prop="productName"/>
+      <el-table-column label="未排数量" align="center" prop="disQuantity"/>
+      <el-table-column label="本次数量" align="center" prop="scheduleQuantity">
+        <template slot-scope="scope">
+          <el-input-number style="width: 140px;"
+            v-model="scope.row.scheduleQuantity"
+            placeholder=""
+            clearable
+          />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="生产工单" align="center" prop="workorderCode"/> -->
-      <el-table-column label="编排时间" align="center" prop="createTime"/>
-      <el-table-column label="编排人员" align="center" prop="createBy"/>
 
     </el-table>
 
@@ -66,7 +75,7 @@
 
 <script>
 import {
-  distinctList
+  scheduleList
 } from "@/api/mes/pro/scheduleList";
 
 export default {
@@ -93,9 +102,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        arrangeCode: '',
         workorderCode: '',
-        createBy: ''
+        productCode: '',
+        productName: ''
       },
     };
   },
@@ -109,14 +118,15 @@ export default {
     /** 查询物料编码列表 */
     getList() {
       this.loading = true;
-      const formdata = new FormData()
-      formdata.append('pageNum', this.queryParams.pageNum)
-      formdata.append('pageSize', this.queryParams.pageSize)
-      formdata.append('arrangeCode', this.queryParams.arrangeCode)
-      formdata.append('workorderCode', this.queryParams.workorderCode)
-      formdata.append('createBy', this.queryParams.createBy)
-      formdata.append('workorderStatus', ['ORCHESTRATED'])
-      distinctList(formdata).then((response) => {
+
+      scheduleList(this.queryParams).then((response) => {
+        response.rows = response.rows.map(v=>{
+          return {
+            ...v,
+            disQuantity : v.quantity - v.quantityScheduled,
+            scheduleQuantity: v.quantity - v.quantityScheduled
+          }
+        })
         this.itemList = response.rows;
         this.total = response.total;
         this.loading = false;