update:修改生产工单的问题

src/api/mes/pro/arrange.js

@@ -34,6 +34,24 @@ export function batchAddArrange(data) {
   })
 }
 
+// 拆分编排单
+export function splitArrange(data) {
+  return request({
+    url: "/pro/arrange/split",
+    method: "post",
+    data: data,
+  });
+}
+
+// 追加编排单
+export function appendArrange(data) {
+  return request({
+    url: "/pro/arrange/appendArrange",
+    method: "post",
+    data: data,
+  });
+}
+
 // 新增生产编排单
 export function addArrange(data) {
   return request({

src/views/mes/pro/arrange/chooseWorkorderForArrange.vue

@@ -25,7 +25,7 @@
       @selection-change="handleSelectionChange"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column fixed="left" type="selection" width="55" align="center"/>
       <el-table-column label="工单编码" width="180" prop="workorderCode"/>
       <el-table-column
         label="编排单号"
@@ -156,7 +156,7 @@ import {genCode} from "@/api/system/autocode/rule";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {getToken} from "@/utils/auth";
 import {batchAddCombination} from "@/api/mes/pro/combination";
-import {batchAddArrange} from "@/api/mes/pro/arrange";
+import {appendArrange} from "@/api/mes/pro/arrange";
 
 export default {
   name: "chooseWorkorderForArrange",
@@ -238,7 +238,7 @@ export default {
         requestDate: null,
         parentId: null,
         ancestors: null,
-        statusArr: ["PREPARE", "PUBLISHED"],
+        statusArr: 'COMBINED',
       },
       // 表单参数
       form: {},
@@ -279,23 +279,25 @@ export default {
   },
   methods: {
     async handleCombination() {
-      let params = []
-
+      // let params = []
+      let params = new FormData()
+      params.append('arrangeCode', this.arrangeCode)
       let shouldExit = false;
       this.selectedRows.forEach((item, index) => {
-        if (item.arrangeCode != '' && item.arrangeCode != null) {
+        if (item.arrangeCode) {
           this.$modal.msgWarning(`${item.workorderCode}生产单已绑定编排单，不能再绑定！`);
           shouldExit = true;
         }
-        params.push({
-          arrangeSort: index,
-          workorderId: item.workorderId,
-          workorderCode: item.workorderCode,
-          arrangeCode: this.arrangeCode
-        })
+        params.append('workorderIds', item.workorderId)
+        // params.push({
+        //   arrangeSort: index,
+        //   workorderId: item.workorderId,
+        //   workorderCode: item.workorderCode,
+        //   arrangeCode: this.arrangeCode
+        // })
       });
       if (!shouldExit) {
-        batchAddArrange(params).then(response => {
+        appendArrange(params).then(response => {
           this.$modal.msgSuccess("追加编排单成功");
           this.getList();
         });

src/views/mes/pro/arrange/info.vue

@@ -52,7 +52,7 @@
         >拆分为新编排单
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+      <el-col v-if="addBtn" :span="1.5">
         <el-button
           type="primary"
           plain
@@ -104,13 +104,13 @@
     <el-table v-loading="loading" :data="arrangeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="编排单号" align="center" prop="arrangeCode"/>
-      <el-table-column label="序号" width="150" align="center" prop="arrangeSort">
-        <template slot-scope="scope">
+      <el-table-column label="序号" width="150" align="center" prop="arrangeSort" />
+        <!-- <template slot-scope="scope">
           <el-input-number v-model="scope.row.arrangeSort" @change="handleChangeSort(scope.row)" :min="0"
                            style="width: 140px"
                            label="序号"></el-input-number>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="生产工单编号" align="center" prop="workorderCode"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -145,18 +145,21 @@
     <!-- 添加或修改生产编排单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="生产工单编号" prop="workorderCode">
+          {{ form.workorderCode }}
+          <!-- <el-input v-model="form.workorderCode" placeholder="请输入生产工单编号"/> -->
+        </el-form-item>
         <el-form-item label="编排单号" prop="arrangeCode">
           <el-input v-model="form.arrangeCode" placeholder="请输入编排单号"/>
         </el-form-item>
         <el-form-item label="序号" prop="arrangeSort">
-          <el-input v-model="form.arrangeSort" placeholder="请输入序号"/>
+          <!-- <el-input v-model="form.arrangeSort" placeholder="请输入序号"/> -->
+          <el-input-number v-model="form.arrangeSort" :min="0"
+            label="序号"></el-input-number>
         </el-form-item>
         <el-form-item label="生产工单号" prop="workorderId">
           <el-input v-model="form.workorderId" placeholder="请输入生产工单号"/>
         </el-form-item>
-        <el-form-item label="生产工单编号" prop="workorderCode">
-          <el-input v-model="form.workorderCode" placeholder="请输入生产工单编号"/>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -166,7 +169,7 @@
 
 
     <el-dialog title="追加编排单" :visible.sync="arrangeOpen" width="800px" append-to-body @close="getList">
-      <choose-workorder-for-arrange :arrangeCode="arrangeCode"></choose-workorder-for-arrange>
+      <choose-workorder-for-arrange v-if="arrangeOpen" :arrangeCode="arrangeCode"></choose-workorder-for-arrange>
     </el-dialog>
   </div>
 </template>
@@ -175,7 +178,7 @@
 import {listArrange, getArrange, delArrange, addArrange, updateArrange} from "@/api/mes/pro/arrange";
 import {updateCombination} from "@/api/mes/pro/combination";
 import ChooseWorkorderForArrange from "@/views/mes/pro/arrange/chooseWorkorderForArrange.vue";
-
+import {splitArrange} from "@/api/mes/pro/arrange";
 export default {
   name: "ArrangeInfo",
   components: {ChooseWorkorderForArrange},
@@ -187,6 +190,10 @@ export default {
     arrangeCode: {
       type: String,
       default: null
+    },
+    addBtn: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -260,6 +267,19 @@ export default {
 
   },
   methods: {
+    handleCombination() {
+      // row.arrangeId
+      console.log(this.ids, 'this.ids')
+      const params = new FormData()
+      this.ids.forEach(item => {
+        params.append('arrangeIds', item)
+      })
+      splitArrange(params).then(response => {
+        if (response.code === 200) {
+           this.getList()
+        }
+      });
+    },
     handleChangeSort(item) {
       updateCombination({...item}).then(response => {
       });
@@ -339,7 +359,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const arrangeIds = row.arrangeId || this.ids;
-      this.$modal.confirm('是否确认删除生产编排单编号为"' + arrangeIds + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除生产工单编号为"' + row.workorderCode + '"的数据项？').then(function () {
         return delArrange(arrangeIds);
       }).then(() => {
         this.getList();

src/views/mes/pro/workorder/indexApply.vue

@@ -798,12 +798,12 @@
 
     <el-dialog title="编排单明细" v-if="arrangeOpen" :visible.sync="arrangeOpen" width="1000px" append-to-body
                @close="getList">
-      <ArrangeInfo :arrange-code="arrangeCode"></ArrangeInfo>
+      <ArrangeInfo :arrange-code="arrangeCode" ></ArrangeInfo>
     </el-dialog>
 
     <el-dialog title="编排单明细" v-if="arrangeOpen2" :visible.sync="arrangeOpen2" width="1000px" append-to-body
                @close="getList">
-      <ArrangeInfo :group-code="groupCode"></ArrangeInfo>
+      <ArrangeInfo :group-code="groupCode" :addBtn="false"></ArrangeInfo>
     </el-dialog>
   </div>
 </template>
@@ -967,12 +967,24 @@ export default {
       this.arrangeCode = arrangeCode;
     },
     async handleArrange() {
+      // status: "COMBINED"
       let params = []
-      for(const item in this.selectedRows){
-        if (item.arrangeCode != '' && item.arrangeCode != null) {
-          this.$modal.msgWarning(`${item.workorderCode}生产单已绑定编排单，不能再绑定！`);
-          return false;
+      // for(const item in this.selectedRows){
+      //   if (item.arrangeCode != '' && item.arrangeCode != null) {
+      //     this.$modal.msgWarning(`${item.workorderCode}生产单已绑定编排单，不能再绑定！`);
+      //     return false;
+      //   }
+      // }
+      let workorderCode = []
+      this.selectedRows.forEach(item => {
+        if (item.status !== 'COMBINED') {
+          workorderCode.push(item.workorderCode)
+          return
         }
+      })
+      if (workorderCode.length > 0) {
+        this.$modal.msgWarning(`${workorderCode[0]}只允许操作单据状态为已组合数据！`);
+        return
       }
       this.selectedRows.forEach((item, index) => {
         params.push({