Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/api/wms/batch.js

@@ -42,3 +42,22 @@ export function delBatch(batchId) {
     method: 'delete'
   })
 }
+
+// 检测批次生成方案是否会出现死锁
+export function checkBatchLock(data) {
+  return request({
+    url: '/klp/batch/check',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 给出一个可行的批次生成方案
+export function generateBatch(data) {
+  return request({
+    url: '/klp/batch/generate',
+    method: 'post',
+    data: data
+  })
+}

klp-ui/src/components/KLPService/Renderer/CraftInfo.vue

@@ -0,0 +1,26 @@
+<template>
+  <el-tag>{{ getCraftInfo() }}</el-tag>
+</template>
+
+<script>
+  import { mapGetters } from 'vuex';
+
+  export default {
+    name: 'CraftInfo',
+    props: {
+      craftId: {
+        type: [String, Number, undefined],
+        required: true
+      }
+    },
+    computed: {
+      ...mapGetters(['processList'])
+    },
+    methods: {
+      getCraftInfo() {
+        const craft = this.processList.find(item => item.processId === this.craftId);
+        return craft.processName;
+      }
+    }
+  }
+</script>

klp-ui/src/views/wms/work/schedulePlan/detail.vue

@@ -17,7 +17,7 @@
       </el-tab-pane>
 
       <el-tab-pane label="批次管理">
-        <BatchPanel />
+        <BatchPanel :planId="planId" />
       </el-tab-pane>
 
       <!-- <el-tab-pane label="工艺任务">

klp-ui/src/views/wms/work/schedulePlan/panes/batch.vue

@@ -1,54 +1,54 @@
 <template>
   <div class="app-container">
+    <el-row style="margin-bottom: 10px;">
+      <div v-for="(item, index) in taskList" style="display: flex; flex-wrap: wrap; gap: 10px; align-items: center;"
+        :key="index">
+        <ProductInfo :productId="item[0].productId" />
+        <div v-for="process in item" :key="process.processId">
+          <CraftInfo :craftId="process.processId" />
+        </div>
+      </div>
+    </el-row>
+
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleInitBatch">生成批次</el-button>
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
-          type="danger"
+          @click="handleUpdate">修改</el-button>
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-          type="warning"
+          @click="handleDelete">删除</el-button>
-          plain
+      </el-col>
-          icon="el-icon-download"
+      <el-col :span="1.5">
-          size="mini"
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
-          @click="handleExport"
-        >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="batchList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="批次ID" align="center" prop="batchId" v-if="true"/>
+      <el-table-column label="批次ID" align="center" prop="batchId" v-if="true" />
       <el-table-column label="批次编号" align="center" prop="batchNo" />
-      <el-table-column label="关联工艺ID" align="center" prop="processId" />
+      <el-table-column label="关联工艺ID" align="center" prop="processId">
+        <template slot-scope="scope">
+          <CraftInfo :craftId="scope.row.processId" />
+        </template>
+      </el-table-column>
       <el-table-column label="批次总数量" align="center" prop="totalQuantity" />
-      <el-table-column label="合并来源" align="center" prop="mergeSource" />
+      <el-table-column label="合并来源" align="center" prop="mergeSource">
+        <template slot-scope="scope">
+          <div v-for="item in scope.row.mergeSource.split(',')" style="display: flex; align-items: center; justify-content: center; gap: 10px;" :key="item">
+            <ProductInfo :productId="getTaskInfo(item).productId" />
+            <CraftInfo :craftId="getTaskInfo(item).processId" />
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="预计开始时间" align="center" prop="estimatedStartTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.estimatedStartTime, '{y}-{m}-{d}') }}</span>
@@ -59,22 +59,16 @@
           <span>{{ parseTime(scope.row.estimatedEndTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="批次状态" align="center" prop="batchStatus" />
+      <el-table-column label="批次状态" align="center" prop="batchStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.batch_status" :value="scope.row.batchStatus" />
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-            size="mini"
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -88,25 +82,19 @@
         <!-- <el-form-item label="关联工艺ID" prop="processId">
           <el-input v-model="form.processId" placeholder="请输入关联工艺ID" />
         </el-form-item> -->
-        <el-form-item label="批次总数量" prop="totalQuantity">
+        <!-- <el-form-item label="批次总数量" prop="totalQuantity">
           <el-input v-model="form.totalQuantity" placeholder="请输入批次总数量" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="合并来源" prop="mergeSource">
           <el-input v-model="form.mergeSource" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="预计开始时间" prop="estimatedStartTime">
-          <el-date-picker clearable
+          <el-date-picker clearable v-model="form.estimatedStartTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-            v-model="form.estimatedStartTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择预计开始时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="预计结束时间" prop="estimatedEndTime">
-          <el-date-picker clearable
+          <el-date-picker clearable v-model="form.estimatedEndTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-            v-model="form.estimatedEndTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择预计结束时间">
           </el-date-picker>
         </el-form-item>
@@ -119,14 +107,67 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="批次生成" width="800px" :visible.sync="batchGenerateDialogVisible">
+      <el-table :data="generateBatchList" style="width: 100%;" border>
+        <el-table-column label="批次编号" align="center" prop="batchNo">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.batchNo" />
+          </template>
+        </el-table-column>
+        <el-table-column label="合并来源" align="center" prop="mergeSource">
+          <template slot-scope="scope">
+            <div v-for="item in scope.row.mergeSource.split(',')"
+              style="display: flex; align-items: center; justify-content: center; gap: 10px;" :key="item">
+              <!-- 返回的是taskId, 需要查找到对应的processId和productId -->
+              <ProductInfo :productId="getTaskInfo(item).productId" />
+              <CraftInfo :craftId="getTaskInfo(item).processId" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="批次总数量" align="center" prop="totalQuantity" />
+        <el-table-column label="预计开始时间" align="center" prop="estimatedStartTime">
+          <template slot-scope="scope">
+            <el-date-picker v-model="scope.row.estimatedStartTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="请选择预计开始时间" />
+          </template>
+        </el-table-column>
+        <el-table-column label="预计结束时间" align="center" prop="estimatedEndTime">
+          <template slot-scope="scope">
+            <el-date-picker v-model="scope.row.estimatedEndTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="请选择预计结束时间" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" @click="handleAddBatch(scope.row)">生成批次</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listBatch, getBatch, delBatch, addBatch, updateBatch } from "@/api/wms/batch";
+import { listBatch, getBatch, delBatch, addBatch, updateBatch, generateBatch } from "@/api/wms/batch";
+import { listProcessTask } from "@/api/wms/processTask";
+
+import CraftInfo from '@/components/KLPService/Renderer/CraftInfo.vue';
+import ProductInfo from '@/components/KLPService/Renderer/ProductInfo.vue';
 
 export default {
   name: "Batch",
+  components: {
+    CraftInfo,
+    ProductInfo
+  },
+  dicts: ['batch_status'],
+  props: {
+    planId: {
+      type: [String, Number, undefined],
+      required: true
+    }
+  },
   data() {
     return {
       // 按钮loading
@@ -166,13 +207,36 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      // 所有的工序任务
+      taskList: [],
+      // 批次生成对话框是否显示
+      batchGenerateDialogVisible: false,
+      generateBatchList: []
     };
   },
   created() {
     this.getList();
+    this.getProcessList();
   },
   methods: {
+    async getProcessList() {
+      const { rows } = await listProcessTask({ planId: this.planId });
+      // 整理成二维数组，按照productId
+      const productIdToProcessTaskList = {};
+      rows.forEach(item => {
+        if (!productIdToProcessTaskList[item.productId]) {
+          productIdToProcessTaskList[item.productId] = [];
+        }
+        productIdToProcessTaskList[item.productId].push(item);
+      });
+      this.taskList = Object.values(productIdToProcessTaskList);
+    },
+    getTaskInfo(taskId) {
+      const task = this.taskList.flat(1).find(item => item.taskId == taskId);
+      console.log(task, taskId);
+      return task;
+    },
     /** 查询批次（合并相同工艺的任务）列表 */
     getList() {
       this.loading = true;
@@ -212,6 +276,27 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    async handleInitBatch() {
+      generateBatch(this.taskList).then(res => {
+        console.log(res)
+        this.batchGenerateDialogVisible = true;
+        this.generateBatchList = res.data.map(item => {
+          let totalQuantity = 0;
+          for (const taskId of item.taskIds) {
+            const task = this.taskList.flat(1).find(item => item.taskId == taskId);
+            totalQuantity += task.taskQuantity;
+          }
+          return {
+            ...item,
+            planId: this.planId,
+            processId: item.processId,
+            mergeSource: item.taskIds.join(','),
+            batchNo: item.groupId,
+            totalQuantity
+          }
+        });
+      })
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
@@ -220,7 +305,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.batchId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -266,6 +351,14 @@ export default {
         }
       });
     },
+    handleAddBatch(row) {
+      addBatch(row).then(response => {
+        this.$modal.msgSuccess("新增成功");
+        this.getList();
+      }).finally(() => {
+        this.buttonLoading = false;
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const batchIds = row.batchId || this.ids;