增加编排单

src/api/mes/pro/arrange.js

+import request from '@/utils/request'
+
+// 查询生产编排单列表
+export function listArrange(query) {
+  return request({
+    url: '/pro/arrange/list',
+    method: 'get',
+    params: query
+  })
+}
+export function listGroupArrange(query) {
+  return request({
+    url: '/pro/arrange/groupList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询生产编排单详细
+export function getArrange(arrangeId) {
+  return request({
+    url: '/pro/arrange/' + arrangeId,
+    method: 'get'
+  })
+}
+
+// 新增生产编排单
+export function batchAddArrange(data) {
+  return request({
+    url: '/pro/arrange/batchAdd',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增生产编排单
+export function addArrange(data) {
+  return request({
+    url: '/pro/arrange',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生产编排单
+export function updateArrange(data) {
+  return request({
+    url: '/pro/arrange',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生产编排单
+export function delArrange(arrangeId) {
+  return request({
+    url: '/pro/arrange/' + arrangeId,
+    method: 'delete'
+  })
+}

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

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="组合单号" prop="arrangeCode">
+        <el-input
+          v-model="queryParams.arrangeCode"
+          placeholder="请输入组合单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="序号" prop="arrangeSort">
+        <el-input
+          v-model="queryParams.arrangeSort"
+          placeholder="请输入序号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生产工单号" prop="workorderId">
+        <el-input
+          v-model="queryParams.workorderId"
+          placeholder="请输入生产工单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生产工单编号" prop="workorderCode">
+        <el-input
+          v-model="queryParams.workorderCode"
+          placeholder="请输入生产工单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['pro:arrange:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['pro:arrange:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['pro:arrange:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['pro:arrange:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <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="arrangeId"/>
+      <el-table-column label="编排单号" align="center" prop="arrangeCode">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleView(scope.row)"
+          >{{ scope.row.arrangeCode }}
+          </el-button
+          >
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="序号" align="center" prop="arrangeSort"/>-->
+      <!--      <el-table-column label="生产工单号" align="center" prop="workorderId"/>-->
+      <!--      <el-table-column label="生产工单编号" align="center" prop="workorderCode"/>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['pro:arrange:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['pro:arrange:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改生产编排单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <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-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>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="组合单明细" :visible.sync="arrangeOpen" width="800px" append-to-body @close="getList">
+      <ArrangeInfo :arrangeCode="arrangeCode"></ArrangeInfo>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listArrange, getArrange, delArrange, addArrange, updateArrange, listGroupArrange} from "@/api/mes/pro/arrange";
+import ArrangeInfo from "@/views/mes/pro/arrange/info.vue";
+
+export default {
+  name: "Arrange",
+  components: {ArrangeInfo},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      arrangeOpen: false,
+      arrangeCode: '',
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 生产编排单表格数据
+      arrangeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        arrangeCode: null,
+        arrangeSort: null,
+        workorderId: null,
+        workorderCode: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        arrangeCode: [
+          {required: true, message: "组合单号不能为空", trigger: "blur"}
+        ], arrangeSort: [
+          {required: true, message: "序号不能为空", trigger: "blur"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+
+    handleView(row) {
+      this.arrangeOpen = true;
+      this.arrangeCode = row.arrangeCode;
+    },
+
+    /** 查询生产编排单列表 */
+    getList() {
+      this.loading = true;
+      listGroupArrange(this.queryParams).then(response => {
+        this.arrangeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        arrangeId: null, arrangeCode: null, arrangeSort: null, workorderId: null, workorderCode: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.arrangeId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加生产编排单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const arrangeId = row.arrangeId || this.ids
+      getArrange(arrangeId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改生产编排单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.arrangeId != null) {
+            updateArrange(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addArrange(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const arrangeIds = row.arrangeId || this.ids;
+      this.$modal.confirm('是否确认删除生产编排单编号为"' + arrangeIds + '"的数据项？').then(function () {
+        return delArrange(arrangeIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('pro/arrange/export', {
+        ...this.queryParams
+      }, `arrange_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/mes/pro/combination/chooseWorkorderForComb.vue

@@ -155,7 +155,7 @@ import VendorSelect from "@/components/vendorSelect/single.vue";
 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 {batchAddCombination} from "@/api/mes/pro/combination";
 
 export default {
   name: "chooseWorkorderForComb",
@@ -279,14 +279,12 @@ export default {
   methods: {
     async handleCombination() {
       let params = []
+      let shouldExit = false;
       this.selectedRows.forEach((item, index) => {
-        if (item.combinationCode != '') {
+        if (item.combinationCode != '' && item.combinationCode != null) {
           this.$modal.msgWarning(`${item.workorderCode}生产单已绑定组合单，不能再绑定！`);
-          return
+          shouldExit = true
         }
-      });
-
-      this.selectedRows.forEach((item, index) => {
         params.push({
           combinationSort: index,
           workorderId: item.workorderId,
@@ -295,18 +293,13 @@ export default {
           combinationCode: this.combinationCode
         })
       });
+      if (!shouldExit) {
+        batchAddCombination(params).then(response => {
+          this.$modal.msgSuccess("追加组合单成功");
+          this.getList();
+        });
+      }
 
-      this.selectedRows.forEach((item, index) => {
-        if (item.combinationCode != '') {
-          this.$modal.msgWarning(`${item.workorderCode}生产单已绑定组合单，不能再绑定！`);
-          return
-        }
-      });
-      return
-      batchAddCombination(params).then(response => {
-        this.$modal.msgSuccess("追加组合单成功");
-        this.getList();
-      });
     },
     /** 查询生产工单列表 */
     getList() {

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

@@ -90,7 +90,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="combinationList" @selection-change="handleSelectionChange">
-      <!--      <el-table-column type="selection" width="55" align="center"/>-->
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="combinationId" width="55" align="center"/>
       <!--      <el-table-column label="销售订单号" align="center" prop="combinationId"/>-->
       <!--      <el-table-column label="组合单号" align="center" prop="combinationCode"/>-->
       <el-table-column label="组合编码" width prop="combinationCode">
@@ -105,7 +106,7 @@
         </template>
       </el-table-column>
       <!--      <el-table-column label="序号" align="center" prop="combinationSort"/>-->
-<!--      <el-table-column label="生产工单号" align="center" prop="workorderCode"/>-->
+      <!--      <el-table-column label="生产工单号" align="center" prop="workorderCode"/>-->
       <!--      <el-table-column label="销售订单号" align="center" prop="salesOrderNumber"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -160,7 +161,7 @@
     </el-dialog>
 
 
-    <el-dialog title="组合单明细" :visible.sync="combOpen" width="800px" append-to-body @close="getList" >
+    <el-dialog title="组合单明细" :visible.sync="combOpen" width="800px" append-to-body @close="getList">
       <CombinationInfo :combinationCode="combinationCode"></CombinationInfo>
     </el-dialog>
   </div>

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

@@ -97,7 +97,12 @@
 
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="组合单号" align="center" prop="combinationCode"/>
-      <el-table-column label="序号" align="center" prop="combinationSort"/>
+      <el-table-column label="序号" align="center" width prop="combinationSort">
+        <template slot-scope="scope">
+          <el-input-number v-model="scope.row.combinationSort" @change="handleChangeSort(scope.row)" :min="0" style="width: 140px"
+                           label="序号"></el-input-number>
+        </template>
+      </el-table-column>
       <el-table-column label="生产工单号" align="center" prop="workorderCode"/>
       <!--      <el-table-column label="销售订单号" align="center" prop="salesOrderId"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -236,6 +241,10 @@ export default {
     this.getList();
   },
   methods: {
+    handleChangeSort(item) {
+      updateCombination({...item}).then(response => {
+      });
+    },
     async handleCombination() {
       let params = []
 

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

@@ -192,6 +192,20 @@
         </el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="multiple"
+          @click="handleArrange"
+          v-hasPermi="['mes:pro:workorder:dofinish']"
+        >生成编排单
+        </el-button
+        >
+      </el-col>
+
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -771,6 +785,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {getToken} from "@/utils/auth";
 import {addCombination, batchAddCombination} from "@/api/mes/pro/combination";
 import CombinationInfo from "@/views/mes/pro/combination/info.vue";
+import {batchAddArrange} from "@/api/mes/pro/arrange";
 
 export default {
   name: "Workorder",
@@ -896,6 +911,29 @@ export default {
       this.combOpen = true;
       this.combinationCode = combinationCode;
     },
+
+    async handleArrange() {
+      let params = []
+      this.selectedRows.forEach((item, index) => {
+        if (item.arrangeCode != '' && item.arrangeCode != null) {
+          this.$modal.msgWarning(`${item.workorderCode}生产单已绑定编排单，不能再绑定！`);
+          return
+        }
+      });
+      this.selectedRows.forEach((item, index) => {
+        params.push({
+          arrangeSort: index + 1,
+          workorderId: item.workorderId,
+          workorderCode: item.workorderCode,
+          arrangeCode: null
+        })
+      });
+
+      batchAddArrange(params).then(response => {
+        this.$modal.msgSuccess("新增编排单成功");
+        this.getList();
+      });
+    },
     async handleCombination() {
       let params = []
       this.selectedRows.forEach((item, index) => {
@@ -906,7 +944,7 @@ export default {
       });
       this.selectedRows.forEach((item, index) => {
         params.push({
-          combinationSort: index,
+          combinationSort: index + 1,
           workorderId: item.workorderId,
           workorderCode: item.workorderCode,
           salesOrderId: 0,